[JSON] parse two more of aircraft types

lyusupov · Dec 12, 2024 · d3e7450 · d3e7450
1 parent 844251d
commit d3e7450
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/software/firmware/source/SoftRF/src/platform/STM32.h b/software/firmware/source/SoftRF/src/platform/STM32.h
@@ -47,7 +47,6 @@ extern char *dtostrf_workaround(double, signed char, unsigned char, char *);
 #define snprintf_P              snprintf
 #define EEPROM_commit()         {}
 
-//#define yield()                 ({ })
 inline  void yield()            { };
 
 #define AN3155_BR               115200

diff --git a/software/firmware/source/SoftRF/src/protocol/data/JSON.cpp b/software/firmware/source/SoftRF/src/protocol/data/JSON.cpp
@@ -745,6 +745,8 @@ void parseSettings(JsonObject& root)
       eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_TOWPLANE;
     } else if (!strcmp(aircraft_type_s,"POWERED")) {
       eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_POWERED;
+    } else if (!strcmp(aircraft_type_s,"JET")) {
+      eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_JET;
     } else if (!strcmp(aircraft_type_s,"HELICOPTER")) {
       eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_HELICOPTER;
     } else if (!strcmp(aircraft_type_s,"UAV")) {
@@ -753,6 +755,8 @@ void parseSettings(JsonObject& root)
       eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_HANGGLIDER;
     } else if (!strcmp(aircraft_type_s,"PARAGLIDER")) {
       eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_PARAGLIDER;
+    } else if (!strcmp(aircraft_type_s,"PARACHUTE")) {
+      eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_PARACHUTE;
     } else if (!strcmp(aircraft_type_s,"BALLOON")) {
       eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_BALLOON;
     } else if (!strcmp(aircraft_type_s,"STATIC")) {