@@ -214,20 +214,26 @@ void convertAirSpeedToSettings(Settings *newSettings, uint16_t airSpeed)
214214// Given settings, attempt to ID our airSpeed
215215uint16_t convertSettingsToAirSpeed (Settings *newSettings)
216216{
217- uint16_t airSpeed = 0 ;
218-
219- if ( (newSettings->radioBandwidth == 62.5 ) && (newSettings->radioSpreadFactor == 11 ) && (newSettings->radioCodingRate == 8 ) ) airSpeed = 40 ;
220- else if ( (newSettings->radioBandwidth == 62.5 ) && (newSettings->radioSpreadFactor == 10 ) && (newSettings->radioCodingRate == 8 ) ) airSpeed = 150 ;
221- else if ( (newSettings->radioBandwidth == 125 ) && (newSettings->radioSpreadFactor == 10 ) && (newSettings->radioCodingRate == 8 ) ) airSpeed = 400 ;
222- else if ( (newSettings->radioBandwidth == 125 ) && (newSettings->radioSpreadFactor == 9 ) && (newSettings->radioCodingRate == 8 ) ) airSpeed = 1200 ;
223- else if ( (newSettings->radioBandwidth == 500 ) && (newSettings->radioSpreadFactor == 10 ) && (newSettings->radioCodingRate == 8 ) ) airSpeed = 2400 ;
224- else if ( (newSettings->radioBandwidth == 500 ) && (newSettings->radioSpreadFactor == 9 ) && (newSettings->radioCodingRate == 8 ) ) airSpeed = 4800 ;
225- else if ( (newSettings->radioBandwidth == 500 ) && (newSettings->radioSpreadFactor == 8 ) && (newSettings->radioCodingRate == 7 ) ) airSpeed = 9600 ;
226- else if ( (newSettings->radioBandwidth == 500 ) && (newSettings->radioSpreadFactor == 7 ) && (newSettings->radioCodingRate == 7 ) ) airSpeed = 19200 ;
227- else if ( (newSettings->radioBandwidth == 500 ) && (newSettings->radioSpreadFactor == 6 ) && (newSettings->radioCodingRate == 6 ) ) airSpeed = 28800 ;
228- else if ( (newSettings->radioBandwidth == 500 ) && (newSettings->radioSpreadFactor == 6 ) && (newSettings->radioCodingRate == 5 ) ) airSpeed = 38400 ;
229-
230- return (airSpeed);
217+ if ( (newSettings->radioBandwidth == 62.5 ) && (newSettings->radioSpreadFactor == 11 ) && (newSettings->radioCodingRate == 8 ) ) return (40 );
218+ else if ( (newSettings->radioBandwidth == 62.5 ) && (newSettings->radioSpreadFactor == 10 ) && (newSettings->radioCodingRate == 8 ) ) return (150 );
219+ else if ( (newSettings->radioBandwidth == 125 ) && (newSettings->radioSpreadFactor == 10 ) && (newSettings->radioCodingRate == 8 ) ) return (400 );
220+ else if ( (newSettings->radioBandwidth == 125 ) && (newSettings->radioSpreadFactor == 9 ) && (newSettings->radioCodingRate == 8 ) )return (1200 );
221+ else if ( (newSettings->radioBandwidth == 500 ) && (newSettings->radioSpreadFactor == 10 ) && (newSettings->radioCodingRate == 8 ) )return (2400 );
222+ else if ( (newSettings->radioBandwidth == 500 ) && (newSettings->radioSpreadFactor == 9 ) && (newSettings->radioCodingRate == 8 ) )return (4800 );
223+ else if ( (newSettings->radioBandwidth == 500 ) && (newSettings->radioSpreadFactor == 8 ) && (newSettings->radioCodingRate == 7 ) ) return (9600 );
224+ else if ( (newSettings->radioBandwidth == 500 ) && (newSettings->radioSpreadFactor == 7 ) && (newSettings->radioCodingRate == 7 ) ) return (19200 );
225+ else if ( (newSettings->radioBandwidth == 500 ) && (newSettings->radioSpreadFactor == 6 ) && (newSettings->radioCodingRate == 6 ) ) return (28800 );
226+ else if ( (newSettings->radioBandwidth == 500 ) && (newSettings->radioSpreadFactor == 6 ) && (newSettings->radioCodingRate == 5 ) ) return (38400 );
227+
228+ systemPrint (" Unknown airSpeed for Bandwidth: " );
229+ systemPrint (newSettings->radioBandwidth );
230+ systemPrint (" SpreadFactor: " );
231+ systemPrint (newSettings->radioSpreadFactor );
232+ systemPrint (" CodingRate: " );
233+ systemPrint (newSettings->radioCodingRate );
234+ systemPrintln ();
235+
236+ return (0 );
231237}
232238
233239// Set radio frequency
0 commit comments