Updated memory layout - radio memory slots structure updated.

uvk5_CEC_05_HF_DO4KLA.py

@@ -61,64 +61,34 @@ DEBUG_SHOW_MEMORY_ACTIONS = False
 MEM_FORMAT = """
 #seekto 0x0000;
 struct {
-// FREQ_Config_t start
+    // 0x00
     u32 freq;
-  // DCS_CodeType_t
-    u8 freq_CodeType;
-    u8 freq_Code;
-    u8 freq_Padding[2];
-  // end
-// end
-// FREQ_Config_t start
     u32 offset;
-  // DCS_CodeType_t start
-    u8 offset_CodeType;
-    u8 offset_Code;
-    u8 offset_Padding[2];
-  // end
-// end
 
-    u8 pRX;
+    // 0x08
-    u8 pTX;
+    u8 rx_freq_Code;
+    u8 tx_offset_Code;
+    struct {
+        u8 rx_CodeType:4,
+           tx_CodeType:4;
+    } tx_rx_CodeType;
+    struct {
+        u8 TX_OFFSET_FREQUENCY_DIRECTION:4,
+           Modulation:4;
+    } mod_tx_off;
+    struct {
+        u8 FrequencyReverse:1,
+           CHANNEL_BANDWIDTH:1,
+           OUTPUT_POWER:2,
+           BUSY_CHANNEL_LOCK:4;
+    } bcl_op_cb;
+    struct{
+        u8 unknown1:1,
+        DTMF_PTT_ID_TX_MODE:7;
+    } DTMF_PTT_ID_TX_MODE;
+    u8 STEP_SETTING;
+    u8 SCRAMBLING_TYPE;
 
-    u32 TX_OFFSET_FREQUENCY;
-    u16 StepFrequency;
-
-	u8 SquelchOpenRSSIThresh;
-	u8 SquelchOpenNoiseThresh;
-	u8 SquelchCloseGlitchThresh;
-	u8 SquelchCloseRSSIThresh;
-	u8 SquelchCloseNoiseThresh;
-	u8 SquelchOpenGlitchThresh;
-
-    // STEP_Setting_t
-	u16 STEP_SETTING;
-
-    u8 OUTPUT_POWER;
-	u8 TXP_CalculatedSetting;
-	u8 FrequencyReverse;
-
-	u8 SCRAMBLING_TYPE;
-	u8 CHANNEL_BANDWIDTH;
-
-	u8 SCANLIST1_PARTICIPATION;
-	u8 SCANLIST2_PARTICIPATION;
-
-	u8 Band;
-
-	u8 DTMF_DECODING_ENABLE;
-
-    // PTT_ID_t
-	u8 DTMF_PTT_ID_TX_MODE;
-
-	u8 BUSY_CHANNEL_LOCK;
-
-    // ModulationMode_t
-	u8 Modulation;
-
-	u8 Compander;    
-
-    char name[16];
 } channel[207];
 
 #seekto 0x0D60;
@@ -251,6 +221,11 @@ struct {
        bl_txrx:2;
 } settings_0f40;
 
+#seekto 0x0F50;
+struct{
+    char name[16];
+} channel_name[207];
+
 // CEC_EEPROM_START1
 #seekto 0x1D50;
 u8 CEC_LiveSeekMode;
@@ -308,11 +283,6 @@ SCRAMBLER_LIST = ["Off", "2600Hz", "2700Hz", "2800Hz", "2900Hz", "3000Hz", "3100
 # channel display mode
 CHANNELDISP_LIST = ["Frequency", "Channel No", "Channel Name", "Name_S Freq_L"]
 
-# Beacon // TODO Gibt es nicht in der Firmware
-BEACON_LIST = ["Off","5 Sec","10 Sec","30 Sec","5 min","10 min","20 min"]
-
-
-# battery save
 BATSAVE_LIST = ["Off", "50%", "67%", "75%", "80%"]
 
 # compander // nur 0 1 2 als Werte Möglich, siehe bk4819.c Zeile 868
@@ -321,23 +291,25 @@ COMPANDER_LIST = ["Off", "TX", "RX"]
 # mic gain
 MICGAIN_LIST = ["+1.1dB","+4.0dB","+8.0dB","+12.0dB","+15.1dB"]
 
-
 # Talk Time
-TALKTIME_LIST = ["Off","30s","1min","3min","5min"]
+TALKTIME_LIST = ["30s","1min","2min","3min","4min","5min","6min","7min","8min","9min","15min"]
 
 # Backlight auto mode
-BACKLIGHT_LIST = ["Off", "5s", "10s", "20s", "1min", "3min"]
+BACKLIGHT_MIN_LIST = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+BACKLIGHT_MAX_LIST = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
                   
 BACKLIGHT_TX = ["Off", "TX", "RX", "TX/RX"]
 
 # Crossband receiving/transmitting
 CROSSBAND_LIST = ["Off", "VFO A", "VFO B"]
 DUALWATCH_LIST = ["Off", "VFO A", "VFO B"]
+# battery save
 BATTERY_SAFE_LIST = ["Off", "1:4", "1:3", "1:2", "1:1"]
 
 # steps
 STEPS = [0.01, 0.05, 0.10, 0.25, 0.50, 1.00, 1.25, 2.50, 5.00, 6.25, 8.33, 9.00, 10.00, 12.50, 15.00, 20.00, 25.00, 30.00, 50.00, 100.00, 25.00, 125.00, 200.00, 250.00, 500.00]
 
+# TODO *TCS???
 # ctcss/dcs codes
 TMODES = ["", "Tone", "DTCS", "DTCS"]
 TONE_NONE = 0
@@ -370,7 +342,8 @@ DTCS_CODES = [
     731, 732, 734, 743, 754
 ]
 
-FLOCK_LIST = ["Off", "FCC", "CE", "GB", "430", "438"]
+# TODO required?
+#FLOCK_LIST = ["Off", "FCC", "CE", "GB", "430", "438"]
 
 SCANRESUME_LIST = ["TIME: Resume after 5 seconds",
                    "CARRIER: Resume after signal disappears",