chore(radio): Reduce size of the data structures in FLASH storage (#3979)

* Reduce size of the YamlNode structure in FLASH storage.
Fix compiler warning.

* Further reduction of FLASH used by YamlNode structures.

* Reduce size of sensor definition arrays and audio tone volumes array.
This commit is contained in:
philmoz
2023-09-24 14:18:11 +10:00
committed by GitHub
parent bb7deefc4f
commit c502dbeaee
14 changed files with 520 additions and 503 deletions
+25 -23
View File
@@ -101,34 +101,36 @@ void frskyDProcessPacket(uint8_t module, const uint8_t *packet, uint8_t len)
struct FrSkyDSensor {
const uint8_t id;
const char * name;
const TelemetryUnit unit;
const uint8_t prec;
const char * name;
};
#define FS(id,name,unit,prec) {id,unit,prec,name}
const FrSkyDSensor frskyDSensors[] = {
{ D_RSSI_ID, STR_SENSOR_RSSI, UNIT_RAW, 0 },
{ D_A1_ID, STR_SENSOR_A1, UNIT_VOLTS, 1 },
{ D_A2_ID, STR_SENSOR_A2, UNIT_VOLTS, 1 },
{ RPM_ID, STR_SENSOR_RPM, UNIT_RPMS, 0 },
{ FUEL_ID, STR_SENSOR_FUEL, UNIT_PERCENT, 0 },
{ TEMP1_ID, STR_SENSOR_TEMP1, UNIT_CELSIUS, 0 },
{ TEMP2_ID, STR_SENSOR_TEMP2, UNIT_CELSIUS, 0 },
{ CURRENT_ID, STR_SENSOR_CURR, UNIT_AMPS, 1 },
{ ACCEL_X_ID, STR_SENSOR_ACCX, UNIT_G, 3 },
{ ACCEL_Y_ID, STR_SENSOR_ACCY, UNIT_G, 3 },
{ ACCEL_Z_ID, STR_SENSOR_ACCZ, UNIT_G, 3 },
{ VARIO_ID, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 2 },
{ VFAS_ID, STR_SENSOR_VFAS, UNIT_VOLTS, 2 },
{ BARO_ALT_AP_ID, STR_SENSOR_ALT, UNIT_METERS, 1 }, // we map hi precision vario into PREC1!
{ VOLTS_AP_ID, STR_SENSOR_VFAS, UNIT_VOLTS, 2 },
{ GPS_SPEED_BP_ID, STR_SENSOR_GSPD, UNIT_KTS, 0 },
{ GPS_COURS_BP_ID, STR_SENSOR_HDG, UNIT_DEGREE, 0 },
{ VOLTS_ID, STR_SENSOR_CELLS, UNIT_CELLS, 2 },
{ GPS_ALT_BP_ID, STR_SENSOR_GPSALT, UNIT_METERS, 0 },
{ GPS_HOUR_MIN_ID, STR_SENSOR_GPSDATETIME, UNIT_DATETIME, 0 },
{ GPS_LAT_AP_ID, STR_SENSOR_GPS, UNIT_GPS, 0 },
{ 0, NULL, UNIT_RAW, 0 } // sentinel
FS( D_RSSI_ID, STR_SENSOR_RSSI, UNIT_RAW, 0 ),
FS( D_A1_ID, STR_SENSOR_A1, UNIT_VOLTS, 1 ),
FS( D_A2_ID, STR_SENSOR_A2, UNIT_VOLTS, 1 ),
FS( RPM_ID, STR_SENSOR_RPM, UNIT_RPMS, 0 ),
FS( FUEL_ID, STR_SENSOR_FUEL, UNIT_PERCENT, 0 ),
FS( TEMP1_ID, STR_SENSOR_TEMP1, UNIT_CELSIUS, 0 ),
FS( TEMP2_ID, STR_SENSOR_TEMP2, UNIT_CELSIUS, 0 ),
FS( CURRENT_ID, STR_SENSOR_CURR, UNIT_AMPS, 1 ),
FS( ACCEL_X_ID, STR_SENSOR_ACCX, UNIT_G, 3 ),
FS( ACCEL_Y_ID, STR_SENSOR_ACCY, UNIT_G, 3 ),
FS( ACCEL_Z_ID, STR_SENSOR_ACCZ, UNIT_G, 3 ),
FS( VARIO_ID, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 2 ),
FS( VFAS_ID, STR_SENSOR_VFAS, UNIT_VOLTS, 2 ),
FS( BARO_ALT_AP_ID, STR_SENSOR_ALT, UNIT_METERS, 1 ), // we map hi precision vario into PREC1!
FS( VOLTS_AP_ID, STR_SENSOR_VFAS, UNIT_VOLTS, 2 ),
FS( GPS_SPEED_BP_ID, STR_SENSOR_GSPD, UNIT_KTS, 0 ),
FS( GPS_COURS_BP_ID, STR_SENSOR_HDG, UNIT_DEGREE, 0 ),
FS( VOLTS_ID, STR_SENSOR_CELLS, UNIT_CELLS, 2 ),
FS( GPS_ALT_BP_ID, STR_SENSOR_GPSALT, UNIT_METERS, 0 ),
FS( GPS_HOUR_MIN_ID, STR_SENSOR_GPSDATETIME, UNIT_DATETIME, 0 ),
FS( GPS_LAT_AP_ID, STR_SENSOR_GPS, UNIT_GPS, 0 ),
FS( 0, NULL, UNIT_RAW, 0 ) // sentinel
};
const FrSkyDSensor * getFrSkyDSensor(uint8_t id)