Diff: Display/Menu.cpp

Revision:

2:8e1b4210df6b

Parent:

1:b96176a4ccb8

--- a/Display/Menu.cpp	Fri Mar 09 13:28:34 2018 +0000
+++ b/Display/Menu.cpp	Wed Jul 18 13:34:10 2018 +0000
@@ -830,17 +830,38 @@
                 }
                 else if( graphObjectTouched == BTN3_BORDER )
                 {
-                    Eeprom.EepromData.DemoSettings.Frequency = DEMO_CENTRAL_FREQ_PRESET1;
+                    if( DeviceConnected == SX1268 )
+                    {
+                        Eeprom.EepromData.DemoSettings.Frequency = DEMO_CENTRAL_FREQ_PRESET4;
+                    }
+                    else
+                    {
+                        Eeprom.EepromData.DemoSettings.Frequency = DEMO_CENTRAL_FREQ_PRESET6;
+                    }
                     MenuSetPage( PAGE_RADIO_PARAM );
                 }
                 else if( graphObjectTouched == BTN4_BORDER )
                 {
-                    Eeprom.EepromData.DemoSettings.Frequency = DEMO_CENTRAL_FREQ_PRESET2;
+                    if( DeviceConnected == SX1268 )
+                    {
+                        Eeprom.EepromData.DemoSettings.Frequency = DEMO_CENTRAL_FREQ_PRESET3;
+                    }
+                    else
+                    {
+                        Eeprom.EepromData.DemoSettings.Frequency = DEMO_CENTRAL_FREQ_PRESET7;
+                    }
                     MenuSetPage( PAGE_RADIO_PARAM );
                 }
                 else if( graphObjectTouched == BTN5_BORDER )
                 {
-                    Eeprom.EepromData.DemoSettings.Frequency = DEMO_CENTRAL_FREQ_PRESET3;
+                    if( DeviceConnected == SX1268 )
+                    {
+                        Eeprom.EepromData.DemoSettings.Frequency = DEMO_CENTRAL_FREQ_PRESET9;
+                    }
+                    else
+                    {
+                        Eeprom.EepromData.DemoSettings.Frequency = DEMO_CENTRAL_FREQ_PRESET8;
+                    }
                     MenuSetPage( PAGE_RADIO_PARAM );
                 }
                 else if( graphObjectTouched == BTN6_BORDER )
@@ -1281,26 +1302,38 @@
         case START_PAGE:
             if( DeviceConnected == SX1261 )
             {
-                if( MatchingFreq == 0 )
+                if( MatchingFreq == MATCHING_FREQ_915 )
                 {
                     DrawText( TITLE_TEXT, ( uint8_t* )"  SX1261 915MHz Demo Kit", NULL, NULL );
                 }
-                else
+                else if( MatchingFreq == MATCHING_FREQ_868 )
                 {
                     DrawText( TITLE_TEXT, ( uint8_t* )"  SX1261 868MHz Demo Kit", NULL, NULL );
                 }
             }
-            else
+            else if( DeviceConnected == SX1262 )
             {
-                if( MatchingFreq == 0 )
+                if( MatchingFreq == MATCHING_FREQ_915 )
                 {
                     DrawText( TITLE_TEXT, ( uint8_t* )"  SX1262 915MHz Demo Kit", NULL, NULL );
                 }
-                else
+                else if( MatchingFreq == MATCHING_FREQ_868 )
                 {
                     DrawText( TITLE_TEXT, ( uint8_t* )"  SX1262 868MHz Demo Kit", NULL, NULL );
                 }
             }
+            else if( DeviceConnected == SX1268 )
+            {
+                if( MatchingFreq == MATCHING_FREQ_780 )
+                {
+                    DrawText( TITLE_TEXT, ( uint8_t* )"  SX1268 780MHz Demo Kit", NULL, NULL );
+                }
+                else if( MatchingFreq == MATCHING_FREQ_490 )
+                {
+                    DrawText( TITLE_TEXT, ( uint8_t* )"  SX1268 490MHz Demo Kit", NULL, NULL );
+                }
+            }
+
             DisplayDriverDrawLogo( SemtechLogo, 20, 37 );
             DrawActiveButton( BTN2_BORDER, ( uint8_t* )"DEMO Ping Pong", NULL );
             DrawActiveButton( BTN3_BORDER, ( uint8_t* )"DEMO PER", NULL );
@@ -1869,19 +1902,40 @@
 
 char* GetRadioFreqBasePS1( void )
 {
-    sprintf( StringText, "%lu Hz", DEMO_CENTRAL_FREQ_PRESET1 );
+    if( DeviceConnected != SX1268 )
+    {
+        sprintf( StringText, "%lu Hz", DEMO_CENTRAL_FREQ_PRESET6 );
+    }
+    else
+    {
+        sprintf( StringText, "%lu Hz", DEMO_CENTRAL_FREQ_PRESET4 );
+    }
     return StringText;
 }
 
 char* GetRadioFreqBasePS2( void )
 {
-    sprintf( StringText, "%lu Hz", DEMO_CENTRAL_FREQ_PRESET2 );
+    if( DeviceConnected != SX1268 )
+    {
+        sprintf( StringText, "%lu Hz", DEMO_CENTRAL_FREQ_PRESET7 );
+    }
+    else
+    {
+        sprintf( StringText, "%lu Hz", DEMO_CENTRAL_FREQ_PRESET3 );
+    }
     return StringText;
 }
 
 char* GetRadioFreqBasePS3( void )
 {
-    sprintf( StringText, "%lu Hz", DEMO_CENTRAL_FREQ_PRESET3 );
+    if( DeviceConnected != SX1268 )
+    {
+        sprintf( StringText, "%lu Hz", DEMO_CENTRAL_FREQ_PRESET8 );
+    }
+    else
+    {
+        sprintf( StringText, "%lu Hz", DEMO_CENTRAL_FREQ_PRESET9 );
+    }
     return StringText;
 }