Skip to content

Commit d3e7450

Browse files
committed
[JSON] parse two more of aircraft types
1 parent 844251d commit d3e7450

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

software/firmware/source/SoftRF/src/platform/STM32.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ extern char *dtostrf_workaround(double, signed char, unsigned char, char *);
4747
#define snprintf_P snprintf
4848
#define EEPROM_commit() {}
4949

50-
//#define yield() ({ })
5150
inline void yield() { };
5251

5352
#define AN3155_BR 115200

software/firmware/source/SoftRF/src/protocol/data/JSON.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,8 @@ void parseSettings(JsonObject& root)
745745
eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_TOWPLANE;
746746
} else if (!strcmp(aircraft_type_s,"POWERED")) {
747747
eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_POWERED;
748+
} else if (!strcmp(aircraft_type_s,"JET")) {
749+
eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_JET;
748750
} else if (!strcmp(aircraft_type_s,"HELICOPTER")) {
749751
eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_HELICOPTER;
750752
} else if (!strcmp(aircraft_type_s,"UAV")) {
@@ -753,6 +755,8 @@ void parseSettings(JsonObject& root)
753755
eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_HANGGLIDER;
754756
} else if (!strcmp(aircraft_type_s,"PARAGLIDER")) {
755757
eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_PARAGLIDER;
758+
} else if (!strcmp(aircraft_type_s,"PARACHUTE")) {
759+
eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_PARACHUTE;
756760
} else if (!strcmp(aircraft_type_s,"BALLOON")) {
757761
eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_BALLOON;
758762
} else if (!strcmp(aircraft_type_s,"STATIC")) {

0 commit comments

Comments
 (0)