This commit is contained in:
bsongis
2014-06-16 18:01:42 +02:00
parent 8cd55856e9
commit 9840cc7dfc
+4 -2
View File
@@ -898,8 +898,10 @@ enum AdjustGvarFunctionParam {
#if defined(CPUARM) #if defined(CPUARM)
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#define LEN_CFN_NAME 8 #define LEN_CFN_NAME 8
#define CFN_SPARE_TYPE int32_t
#else #else
#define LEN_CFN_NAME 6 #define LEN_CFN_NAME 6
#define CFN_SPARE_TYPE int16_t
#endif #endif
PACK(typedef struct t_CustomFnData { // Function Switches data PACK(typedef struct t_CustomFnData { // Function Switches data
int8_t swtch; int8_t swtch;
@@ -913,12 +915,12 @@ PACK(typedef struct t_CustomFnData { // Function Switches data
int16_t val; int16_t val;
uint8_t mode; uint8_t mode;
uint8_t param; uint8_t param;
int16_t spare2; CFN_SPARE_TYPE spare2;
}) all; }) all;
PACK(struct { PACK(struct {
int32_t val1; int32_t val1;
int16_t val2; CFN_SPARE_TYPE val2;
}) clear; }) clear;
}); });
uint8_t active; uint8_t active;