From a4c718f6b7d349831e1b4e0c12ed9c00da4d24dd Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 18 Dec 2021 15:25:52 +0100 Subject: [PATCH] YAML: remove useless constants --- radio/src/dataconstants.h | 4 ++-- radio/src/myeeprom.h | 4 ++-- radio/src/pulses/modules_constants.h | 10 ++++++---- .../storage/conversions/yaml/yaml_datastructs_nv14.cpp | 9 --------- .../storage/conversions/yaml/yaml_datastructs_t12.cpp | 9 --------- .../storage/conversions/yaml/yaml_datastructs_t8.cpp | 9 --------- .../conversions/yaml/yaml_datastructs_tlite.cpp | 9 --------- .../storage/conversions/yaml/yaml_datastructs_tx12.cpp | 9 --------- .../storage/conversions/yaml/yaml_datastructs_x10.cpp | 9 --------- .../storage/conversions/yaml/yaml_datastructs_x12s.cpp | 9 --------- .../storage/conversions/yaml/yaml_datastructs_x7.cpp | 9 --------- .../storage/conversions/yaml/yaml_datastructs_x9d.cpp | 9 --------- .../storage/conversions/yaml/yaml_datastructs_x9e.cpp | 9 --------- .../conversions/yaml/yaml_datastructs_x9lite.cpp | 9 --------- .../conversions/yaml/yaml_datastructs_x9lites.cpp | 9 --------- .../conversions/yaml/yaml_datastructs_xlite.cpp | 9 --------- .../conversions/yaml/yaml_datastructs_xlites.cpp | 9 --------- .../conversions/yaml/yaml_datastructs_zorro.cpp | 9 --------- radio/src/storage/yaml/yaml_datastructs_nv14.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_t12.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_t8.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_tlite.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_tpro.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_tx12.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_x10.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_x12s.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_x7.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_x9d.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_x9e.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_x9lite.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_x9lites.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_xlite.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_xlites.cpp | 8 -------- radio/src/storage/yaml/yaml_datastructs_zorro.cpp | 8 -------- 34 files changed, 10 insertions(+), 271 deletions(-) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index 5af5187c5..356fc20f8 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -249,8 +249,8 @@ enum UartModes { UART_MODE_TELEMETRY, UART_MODE_SBUS_TRAINER, UART_MODE_LUA, - UART_MODE_COUNT, - UART_MODE_MAX = UART_MODE_COUNT-1 + UART_MODE_COUNT SKIP, + UART_MODE_MAX SKIP = UART_MODE_COUNT-1 }; #if defined(CLI) || defined(DEBUG) diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index a8117e792..aaa74a634 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -212,8 +212,8 @@ enum LogicalSwitchesFunctions { LS_FUNC_ADIFFEGREATER, LS_FUNC_TIMER, LS_FUNC_STICKY, - LS_FUNC_COUNT, - LS_FUNC_MAX = LS_FUNC_COUNT-1 + LS_FUNC_COUNT SKIP, + LS_FUNC_MAX SKIP = LS_FUNC_COUNT-1 }; #define MAX_LS_DURATION 250 /*25s*/ diff --git a/radio/src/pulses/modules_constants.h b/radio/src/pulses/modules_constants.h index 45c5ac1f2..ab6fadba4 100644 --- a/radio/src/pulses/modules_constants.h +++ b/radio/src/pulses/modules_constants.h @@ -22,6 +22,8 @@ #ifndef _MODULES_CONSTANTS_H_ #define _MODULES_CONSTANTS_H_ +#include "storage/yaml/yaml_defs.h" + enum ModuleType { MODULE_TYPE_NONE = 0, MODULE_TYPE_PPM, @@ -39,8 +41,8 @@ enum ModuleType { MODULE_TYPE_SBUS, MODULE_TYPE_XJT_LITE_PXX2, MODULE_TYPE_FLYSKY, //no more protocols possible because of 4 bits value - MODULE_TYPE_COUNT, - MODULE_TYPE_MAX = MODULE_TYPE_COUNT - 1 + MODULE_TYPE_COUNT SKIP, + MODULE_TYPE_MAX SKIP = MODULE_TYPE_COUNT - 1 }; /* FrSky XJT / ISRM */ @@ -242,8 +244,8 @@ enum AntennaModes { ANTENNA_MODE_ASK = -1, ANTENNA_MODE_PER_MODEL = 0, ANTENNA_MODE_EXTERNAL = 1, - ANTENNA_MODE_FIRST = ANTENNA_MODE_INTERNAL, - ANTENNA_MODE_LAST = ANTENNA_MODE_EXTERNAL + ANTENNA_MODE_FIRST SKIP = ANTENNA_MODE_INTERNAL, + ANTENNA_MODE_LAST SKIP = ANTENNA_MODE_EXTERNAL }; enum AfhdsModes { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp index 50cca5960..557bb9ad6 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -75,8 +72,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_ZoneOptionValueEnum[] = { @@ -173,8 +168,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -251,8 +244,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp index 2a3448aa7..e6ae90e4e 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -74,8 +71,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -163,8 +158,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -241,8 +234,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp index 018f5b50c..6fa0070ef 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -74,8 +71,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -163,8 +158,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -241,8 +234,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp index 018f5b50c..6fa0070ef 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -74,8 +71,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -163,8 +158,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -241,8 +234,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp index 63ca5271f..ed52b20f5 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -74,8 +71,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -163,8 +158,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -241,8 +234,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp index 8e16a09d7..0617009af 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -75,8 +72,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_ZoneOptionValueEnum[] = { @@ -184,8 +179,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -272,8 +265,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp index c181173ed..fd88dba4a 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -75,8 +72,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_ZoneOptionValueEnum[] = { @@ -184,8 +179,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -272,8 +265,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp index 018f5b50c..6fa0070ef 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -74,8 +71,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -163,8 +158,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -241,8 +234,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp index 42e992e89..cc7bde834 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -74,8 +71,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -167,8 +162,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -248,8 +241,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp index 2d6c8411c..3b0533b24 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -74,8 +71,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -179,8 +174,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -287,8 +280,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp index f65286775..6c80e26d0 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -74,8 +71,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -159,8 +154,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -228,8 +221,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp index 14e8c9fcf..c07bf178b 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -74,8 +71,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -161,8 +156,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -236,8 +229,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp index 76353a5c1..eb8e383a1 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -74,8 +71,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -161,8 +156,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -233,8 +226,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp index 6a87adcb7..fdbfae806 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -74,8 +71,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -163,8 +158,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -235,8 +228,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_zorro.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_zorro.cpp index e35f106b3..37ab5895d 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_zorro.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_zorro.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -51,7 +49,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, @@ -74,8 +71,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -163,8 +158,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { @@ -241,8 +234,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp index f6326c952..71e0dc879 100644 --- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -95,8 +91,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_ZoneOptionValueEnum[] = { @@ -193,8 +187,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/yaml/yaml_datastructs_t12.cpp index 4d036ccb9..218804cb1 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t12.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -94,8 +90,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -183,8 +177,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/yaml/yaml_datastructs_t8.cpp index f1827c3fb..c364bb3aa 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t8.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t8.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -94,8 +90,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -183,8 +177,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp index f1827c3fb..c364bb3aa 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -94,8 +90,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -183,8 +177,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp index bbc59e22c..6966b1ff8 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -94,8 +90,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -185,8 +179,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp index c114d403e..68e5bdf06 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -94,8 +90,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -183,8 +177,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp index d3b475174..026ea7d1f 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -95,8 +91,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_ZoneOptionValueEnum[] = { @@ -206,8 +200,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp index 4070ce728..0c81b1704 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -95,8 +91,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_ZoneOptionValueEnum[] = { @@ -204,8 +198,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/yaml/yaml_datastructs_x7.cpp index f1827c3fb..c364bb3aa 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x7.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x7.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -94,8 +90,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -183,8 +177,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp index 5a5cb2bcc..43b797e14 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -94,8 +90,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -187,8 +181,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp index ede9d1d47..0488418f1 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -94,8 +90,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -199,8 +193,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp index c3b08ca57..10faef18a 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -94,8 +90,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -179,8 +173,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp index eaf4c8c1f..d1b807e11 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -94,8 +90,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -181,8 +175,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp index 1f58eb5f6..f42fab1a3 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -94,8 +90,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -181,8 +175,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp index 210cc68c2..f7dabf4da 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -94,8 +90,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -183,8 +177,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_zorro.cpp b/radio/src/storage/yaml/yaml_datastructs_zorro.cpp index 0d60f9251..b4d09d03a 100644 --- a/radio/src/storage/yaml/yaml_datastructs_zorro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_zorro.cpp @@ -17,8 +17,6 @@ const struct YamlIdStr enum_AntennaModes[] = { { ANTENNA_MODE_ASK, "MODE_ASK" }, { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, - { ANTENNA_MODE_FIRST, "MODE_FIRST" }, - { ANTENNA_MODE_LAST, "MODE_LAST" }, { 0, NULL } }; const struct YamlIdStr enum_ModuleType[] = { @@ -38,8 +36,6 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_SBUS, "TYPE_SBUS" }, { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, { MODULE_TYPE_FLYSKY, "TYPE_FLYSKY" }, - { MODULE_TYPE_COUNT, "TYPE_COUNT" }, - { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TrainerMultiplex[] = { @@ -94,8 +90,6 @@ const struct YamlIdStr enum_UartModes[] = { { UART_MODE_TELEMETRY, "MODE_TELEMETRY" }, { UART_MODE_SBUS_TRAINER, "MODE_SBUS_TRAINER" }, { UART_MODE_LUA, "MODE_LUA" }, - { UART_MODE_COUNT, "MODE_COUNT" }, - { UART_MODE_MAX, "MODE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_TimerModes[] = { @@ -183,8 +177,6 @@ const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, { LS_FUNC_TIMER, "FUNC_TIMER" }, { LS_FUNC_STICKY, "FUNC_STICKY" }, - { LS_FUNC_COUNT, "FUNC_COUNT" }, - { LS_FUNC_MAX, "FUNC_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwashType[] = {