Revision 5:a0f5842fb337, committed 2017-04-03

Comitter:

GregCr

Date:

Mon Apr 03 14:58:51 2017 +0000

Parent:

4:e9daf4ed7b4c

Child:

6:e4c4a6878542

Commit message:

Corrected missing wakeup call when leaving sleep mode; Correction of BW not being updated when going into Settings

Changed in this revision

--- a/Demo/DemoApplication.cpp	Mon Mar 27 17:57:48 2017 +0000
+++ b/Demo/DemoApplication.cpp	Mon Apr 03 14:58:51 2017 +0000
@@ -1433,6 +1433,7 @@
         printf( "StopDemoApplication\n\r" );
         if( Radio.GetOpMode( ) == MODE_SLEEP )
         {
+            Radio.Wakeup( );
             InitializeDemoParameters( Eeprom.EepromData.DemoSettings.ModulationType );
         }
         RX_LED = 0;
@@ -1768,7 +1769,7 @@
         Radio.SetTxParams( Eeprom.EepromData.DemoSettings.TxPower, RADIO_RAMP_20_US );
         memcpy( &( ModulationParams.Params.LoRa.SpreadingFactor ), Eeprom.Buffer + MOD_RNG_SPREADF_EEPROM_ADDR, 1 );
         memcpy( &( ModulationParams.Params.LoRa.Bandwidth ),       Eeprom.Buffer + MOD_RNG_BW_EEPROM_ADDR,      1 );
-        switch( Eeprom.EepromData.ModulationParams.Params.LoRa.Bandwidth )
+        switch( ModulationParams.Params.LoRa.Bandwidth )
         {
             case LORA_BW_0400:
                 Eeprom.EepromData.DemoSettings.RngCalib     = RNG_CALIB_0400[ ( ModulationParams.Params.LoRa.SpreadingFactor >> 4 ) - 5 ];
@@ -1903,7 +1904,7 @@
         }
         if( mean <= 18.5 )
         {
-            // _TCO_ acces à la correction frequence et rssi
+            // _TCO_ acces a la correction frequence et rssi
 //            double RngFei;               // Ranging Frequency Error Indicator
 //            double RngFeiFactor;         // Ranging frequency correction factor
 //            int8_t RssiValue;            // Demo Rssi Value

--- a/Demo/DemoApplication.h	Mon Mar 27 17:57:48 2017 +0000
+++ b/Demo/DemoApplication.h	Mon Apr 03 14:58:51 2017 +0000
@@ -19,7 +19,7 @@
 /*!
  * \brief Used to display firmware version on TFT (Utilities menu)
  */
-#define FIRMWARE_VERSION    ( ( char* )"Firmware Version: 170315A" )
+#define FIRMWARE_VERSION    ( ( char* )"Firmware Version: 170331A" )
 
 /*!
  * \brief Define range of central frequency [Hz]

--- a/Demo/SX1280Lib.lib	Mon Mar 27 17:57:48 2017 +0000
+++ b/Demo/SX1280Lib.lib	Mon Apr 03 14:58:51 2017 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/teams/Semtech/code/SX1280Lib/#cd0d08df0617
+https://developer.mbed.org/teams/Semtech/code/SX1280Lib/#62b6e0f59f0f

--- a/Display/Menu.cpp	Mon Mar 27 17:57:48 2017 +0000
+++ b/Display/Menu.cpp	Mon Apr 03 14:58:51 2017 +0000
@@ -598,6 +598,9 @@
                 else if( graphObjectTouched == BTN9_BORDER )
                 {
                     Eeprom.EepromData.DemoSettings.HoldDemo = true;
+                    // "SETTINGS" button can occure without "START"/"STOP" button
+                    // also "SETTINGS" should stop the demo
+                    StopDemoApplication( );
                     // "CANCEL" or "OK & SAVE" button of PAGE_RADIO_PARAM use
                     // PreviousPage to set next page. Speed up the navigation.
                     PreviousPage = PAGE_RANGING_SLAVE;