Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

40 telemetry sensors instead of 32

Browse source
This commit is contained in:
Bertrand Songis 2019-04-01 12:02:35 +02:00
parent 9ac97ed5b8
commit 6df76451af
4 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/dataconstants.h
View file

@ -59,7 +59,7 @@
#define MAX_SCRIPTS 7 #define MAX_SCRIPTS 7
#define MAX_INPUTS 32 #define MAX_INPUTS 32
#define MAX_TRAINER_CHANNELS 16 #define MAX_TRAINER_CHANNELS 16
#define MAX_TELEMETRY_SENSORS 32 #define MAX_TELEMETRY_SENSORS 40
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
#define MAX_MODELS 60 #define MAX_MODELS 60
#define MAX_OUTPUT_CHANNELS 32 // number of real output channels CH1-CH32 #define MAX_OUTPUT_CHANNELS 32 // number of real output channels CH1-CH32
@ -70,7 +70,7 @@
#define MAX_SPECIAL_FUNCTIONS 64 // number of functions assigned to switches #define MAX_SPECIAL_FUNCTIONS 64 // number of functions assigned to switches
#define MAX_INPUTS 32 #define MAX_INPUTS 32
#define MAX_TRAINER_CHANNELS 16 #define MAX_TRAINER_CHANNELS 16
#define MAX_TELEMETRY_SENSORS 32 #define MAX_TELEMETRY_SENSORS 40
#else #else
#warning "Unknown board!" #warning "Unknown board!"
#endif #endif

10
radio/src/datastructs.h
View file

@ -927,22 +927,22 @@ static inline void check_struct()
#if defined(PCBXLITES) #if defined(PCBXLITES)
CHKSIZE(RadioData, 858); CHKSIZE(RadioData, 858);
CHKSIZE(ModelData, 5936); CHKSIZE(ModelData, 6040);
#elif defined(PCBXLITE) #elif defined(PCBXLITE)
CHKSIZE(RadioData, 852); CHKSIZE(RadioData, 852);
CHKSIZE(ModelData, 5936); CHKSIZE(ModelData, 6040);
#elif defined(PCBX7) #elif defined(PCBX7)
CHKSIZE(RadioData, 858); CHKSIZE(RadioData, 858);
CHKSIZE(ModelData, 5936); CHKSIZE(ModelData, 6040);
#elif defined(PCBX9E) #elif defined(PCBX9E)
CHKSIZE(RadioData, 960); CHKSIZE(RadioData, 960);
CHKSIZE(ModelData, 6431); CHKSIZE(ModelData, 6431);
#elif defined(PCBX9D) || defined(PCBX9DP) #elif defined(PCBX9D) || defined(PCBX9DP)
CHKSIZE(RadioData, 880); CHKSIZE(RadioData, 880);
CHKSIZE(ModelData, 6418); CHKSIZE(ModelData, 6522);
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
CHKSIZE(RadioData, 735); CHKSIZE(RadioData, 735);
CHKSIZE(ModelData, 5097); CHKSIZE(ModelData, 5201);
#elif defined(PCBHORUS) #elif defined(PCBHORUS)
CHKSIZE(RadioData, 855); CHKSIZE(RadioData, 855);
CHKSIZE(ModelData, 9761); CHKSIZE(ModelData, 9761);

3
radio/src/storage/conversions/conversions_218_219.cpp
View file

@ -34,8 +34,7 @@ typedef ModelData ModelData_v219;
void convertModelData_218_to_219(ModelData &model) void convertModelData_218_to_219(ModelData &model)
{ {
TRACE("TODO check what we do with model sizes %d %d", sizeof(ModelData_v218), sizeof(ModelData)); assert(sizeof(ModelData_v218) <= sizeof(ModelData));
// assert(sizeof(ModelData_v218) <= sizeof(ModelData));
ModelData_v218 oldModel; ModelData_v218 oldModel;
memcpy(&oldModel, &model, sizeof(oldModel)); memcpy(&oldModel, &model, sizeof(oldModel));

9
radio/src/storage/conversions/datastructs_218.h
View file

@ -197,6 +197,9 @@ PACK(typedef struct {
int16_t spare:7; int16_t spare:7;
uint8_t fadeIn; uint8_t fadeIn;
uint8_t fadeOut; uint8_t fadeOut;
#if defined(PCBSKY9X)
int16_t rotaryEncoders[1];
#endif
gvar_t gvars[MAX_GVARS_218]; gvar_t gvars[MAX_GVARS_218];
}) FlightModeData_v218; }) FlightModeData_v218;
@ -345,6 +348,12 @@ PACK(typedef struct {
TelemetrySensor telemetrySensors[MAX_TELEMETRY_SENSORS_218]; TelemetrySensor telemetrySensors[MAX_TELEMETRY_SENSORS_218];
TARANIS_PCBX9E_FIELD(uint8_t toplcdTimer) TARANIS_PCBX9E_FIELD(uint8_t toplcdTimer)
#if defined(PCBHORUS)
// TODO conversion for custom screens?
#else
uint8_t view;
#endif
}) ModelData_v218; }) ModelData_v218;
#define EXTRA_GENERAL_FIELDS_GENERAL_218 \ #define EXTRA_GENERAL_FIELDS_GENERAL_218 \