Merge branch 'developer' into naming

This commit is contained in:
maliakal_d 2021-09-17 10:41:51 +02:00
commit 0e193615b9
9 changed files with 7 additions and 7 deletions

View File

@ -1503,7 +1503,7 @@ int set_module(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
#if !(defined(MYTHEN3D) && defined(EIGERD))
#if !(defined(MYTHEN3D) || defined(EIGERD))
functionNotImplemented();
#else

View File

@ -4,10 +4,10 @@
#define APIRECEIVER 0x210831
#define APIGUI 0x210819
#define APIEIGER 0x210916
#define APICTB 0x210916
#define APIGOTTHARD 0x210916
#define APIGOTTHARD2 0x210916
#define APIJUNGFRAU 0x210916
#define APIMYTHEN3 0x210916
#define APICTB 0x210917
#define APIGOTTHARD 0x210917
#define APIGOTTHARD2 0x210917
#define APIJUNGFRAU 0x210917
#define APIMYTHEN3 0x210917
#define APIMOENCH 0x210916
#define APIEIGER 0x210917