feat(h7): bump max telemetry sensors to 99 (#6649)
Co-authored-by: elecpower <elecpower@users.noreply.github.com>
This commit is contained in:
@@ -42,7 +42,7 @@
|
||||
#define CPN_MAX_SWITCHES_FUNCTION 8
|
||||
#define CPN_MAX_SWITCHES_STD 20
|
||||
#define CPN_MAX_SWITCHES (CPN_MAX_SWITCHES_STD + CPN_MAX_SWITCHES_FLEX + CPN_MAX_SWITCHES_FUNCTION)
|
||||
#define CPN_MAX_SENSORS 60
|
||||
#define CPN_MAX_SENSORS 99
|
||||
#define CPN_MAX_SCRIPTS 9
|
||||
#define CPN_MAX_SCRIPT_INPUTS 10
|
||||
#define CPN_MAX_SPACEMOUSE 6
|
||||
|
||||
@@ -293,7 +293,9 @@ int OpenTxFirmware::getCapability(::Capability capability)
|
||||
case PwrButtonPress:
|
||||
return IS_HORUS_OR_TARANIS(board) && (board!=Board::BOARD_TARANIS_X9D) && (board!=Board::BOARD_TARANIS_X9DP);
|
||||
case Sensors:
|
||||
if (IS_FAMILY_HORUS_OR_T16(board) || IS_TARANIS_X9(board))
|
||||
if (IS_STM32H7(board))
|
||||
return 99;
|
||||
else if (IS_FAMILY_HORUS_OR_T16(board) || IS_TARANIS_X9(board))
|
||||
return 60;
|
||||
else
|
||||
return 40;
|
||||
|
||||
@@ -53,7 +53,11 @@
|
||||
#define MIN_TRAINER_CHANNELS 4
|
||||
#define DEF_TRAINER_CHANNELS 8
|
||||
#define MAX_TRAINER_CHANNELS 16
|
||||
#if defined(STM32H7)
|
||||
#define MAX_TELEMETRY_SENSORS 99
|
||||
#else
|
||||
#define MAX_TELEMETRY_SENSORS 60
|
||||
#endif
|
||||
#define MAX_CUSTOM_SCREENS 10
|
||||
#elif defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E)
|
||||
#define MAX_MODELS 60
|
||||
|
||||
@@ -119,15 +119,15 @@ static inline void check_struct()
|
||||
CHKSIZE(ModelData, 27693);
|
||||
#endif
|
||||
#elif defined(PCBST16)
|
||||
CHKSIZE(ModelData, 27911);
|
||||
CHKSIZE(ModelData, 28457);
|
||||
#elif defined(PCBPA01)
|
||||
CHKSIZE(ModelData, 27672);
|
||||
CHKSIZE(ModelData, 28218);
|
||||
#elif defined(RADIO_T15)
|
||||
CHKSIZE(ModelData, 27683);
|
||||
#elif defined(RADIO_T15PRO)
|
||||
CHKSIZE(ModelData, 27911);
|
||||
CHKSIZE(ModelData, 28457);
|
||||
#elif defined(RADIO_TX15)
|
||||
CHKSIZE(ModelData, 27911);
|
||||
CHKSIZE(ModelData, 28457);
|
||||
#elif defined(RADIO_H7RS)
|
||||
// CHKSIZE()
|
||||
#elif defined(PCBHORUS)
|
||||
|
||||
@@ -922,7 +922,7 @@ static const struct YamlNode struct_ModelData[] = {
|
||||
YAML_ARRAY("inputNames", 32, 32, struct_string_32, NULL),
|
||||
YAML_UNSIGNED( "potsWarnEnabled", 16 ),
|
||||
YAML_ARRAY("potsWarnPosition", 8, 16, struct_signed_8, NULL),
|
||||
YAML_ARRAY("telemetrySensors", 112, 60, struct_TelemetrySensor, NULL),
|
||||
YAML_ARRAY("telemetrySensors", 112, 99, struct_TelemetrySensor, NULL),
|
||||
YAML_ARRAY("screenData", 15776, 10, struct_CustomScreenData, NULL),
|
||||
YAML_STRUCT("topbarData", 7328, struct_TopBarPersistentData, NULL),
|
||||
YAML_ARRAY("topbarWidgetWidth", 8, 5, struct_unsigned_8, NULL),
|
||||
|
||||
@@ -922,7 +922,7 @@ static const struct YamlNode struct_ModelData[] = {
|
||||
YAML_ARRAY("inputNames", 32, 32, struct_string_32, NULL),
|
||||
YAML_UNSIGNED( "potsWarnEnabled", 16 ),
|
||||
YAML_ARRAY("potsWarnPosition", 8, 16, struct_signed_8, NULL),
|
||||
YAML_ARRAY("telemetrySensors", 112, 60, struct_TelemetrySensor, NULL),
|
||||
YAML_ARRAY("telemetrySensors", 112, 99, struct_TelemetrySensor, NULL),
|
||||
YAML_ARRAY("screenData", 15776, 10, struct_CustomScreenData, NULL),
|
||||
YAML_STRUCT("topbarData", 8768, struct_TopBarPersistentData, NULL),
|
||||
YAML_ARRAY("topbarWidgetWidth", 8, 6, struct_unsigned_8, NULL),
|
||||
|
||||
@@ -922,7 +922,7 @@ static const struct YamlNode struct_ModelData[] = {
|
||||
YAML_ARRAY("inputNames", 32, 32, struct_string_32, NULL),
|
||||
YAML_UNSIGNED( "potsWarnEnabled", 16 ),
|
||||
YAML_ARRAY("potsWarnPosition", 8, 16, struct_signed_8, NULL),
|
||||
YAML_ARRAY("telemetrySensors", 112, 60, struct_TelemetrySensor, NULL),
|
||||
YAML_ARRAY("telemetrySensors", 112, 99, struct_TelemetrySensor, NULL),
|
||||
YAML_ARRAY("screenData", 15776, 10, struct_CustomScreenData, NULL),
|
||||
YAML_STRUCT("topbarData", 8768, struct_TopBarPersistentData, NULL),
|
||||
YAML_ARRAY("topbarWidgetWidth", 8, 6, struct_unsigned_8, NULL),
|
||||
|
||||
@@ -922,7 +922,7 @@ static const struct YamlNode struct_ModelData[] = {
|
||||
YAML_ARRAY("inputNames", 32, 32, struct_string_32, NULL),
|
||||
YAML_UNSIGNED( "potsWarnEnabled", 16 ),
|
||||
YAML_ARRAY("potsWarnPosition", 8, 16, struct_signed_8, NULL),
|
||||
YAML_ARRAY("telemetrySensors", 112, 60, struct_TelemetrySensor, NULL),
|
||||
YAML_ARRAY("telemetrySensors", 112, 99, struct_TelemetrySensor, NULL),
|
||||
YAML_ARRAY("screenData", 15776, 10, struct_CustomScreenData, NULL),
|
||||
YAML_STRUCT("topbarData", 8768, struct_TopBarPersistentData, NULL),
|
||||
YAML_ARRAY("topbarWidgetWidth", 8, 6, struct_unsigned_8, NULL),
|
||||
|
||||
Reference in New Issue
Block a user