Strip RAM needs for voice (#554)

* Read labels only in voiceconfig menu

* fix branch

* cleanup

* More cleanup

* Address comments part 1

* Simplify voice.ini parsing

* Cleanup

* Remove unused variable

* Add comments for clarification

* Cleanup and small bugfix for voicemenu

* Fix linter errors

* Fix linter errors

Author: TheRealMoeder

src/config/tx.c

@@ -350,7 +350,7 @@ void CONFIG_LoadTx()
     CONFIG_IniParse("tx.ini", ini_handler, (void *)&Transmitter);
     crc32 = Crc(&Transmitter, sizeof(Transmitter));
 #if HAS_EXTENDED_AUDIO
-    CONFIG_VoiceParse();
+    CONFIG_VoiceParse(MAX_VOICEMAP_ENTRIES);
 #endif
     return;
 }

src/config/voice.c

@@ -18,7 +18,9 @@
 #include "common.h"
 #include "model.h"
 #include "../music.h"
+#include "extended_audio.h"
 #include "tx.h"
+#include "voice.h"
 
 #define MATCH_SECTION(s) (strcasecmp(section, s) == 0)
 #define MATCH_KEY(s)     (strcasecmp(name,    s) == 0)
@@ -28,55 +30,55 @@
 const char SECTION_VOICE_GLOBAL[] = "global";
 const char SECTION_VOICE_CUSTOM[] = "custom";
 
-static const char* getfield(char* value, int num) {
-    const char* tok;
-    for (tok = strtok(value, ","); tok && *tok; tok = strtok(NULL, ",\n")) {
-        if (!--num)
-            return tok;
-    }
-    return "";
-}
-
 static int ini_handler(void* user, const char* section, const char* name, const char* value)
 {
-    (void) user;
-    char tmp[100];
-    strlcpy(tmp, value, 100);
-    int duration = atoi(getfield(tmp,2));
-#if HAS_MUSIC_CONFIG
-    char label[MAX_VOICE_LABEL];
-    strlcpy(label,getfield(tmp, 1), MAX_VOICE_LABEL);
-#endif
+    // ini_handler returns a requested mp3 label passed at *user to tempstring
+    u16 req_id = *((long*)user);
+    u16 id = atoi(name);
+    const char* ptr = value;
+    u8 k = 0;
+    u16 duration = 0;
+
+    while (*ptr && *ptr != ',') {
+        ptr++;
+        k++;
+    }
+    if (*ptr == ',') {
+        duration = atoi(ptr + 1);
+        }
 
-    if (MATCH_SECTION(SECTION_VOICE_GLOBAL)) {
-        for (int i = 0; i < CUSTOM_ALARM_ID; i++) {
-            snprintf(tempstring, 4, "%d", i);
-            if (MATCH_KEY(tempstring)) {
-                voice_map[i].duration = duration;
-                voice_map[i].id = i;
 #if HAS_MUSIC_CONFIG
-                strcpy(voice_map[i].label, label);
+    if ( k && (req_id != MAX_VOICEMAP_ENTRIES) && (req_id == id) ) {
+        strlcpy(tempstring, value, k+1);
+        tempstring[MAX_VOICE_LABEL] = '\0';  // limit label length
+        return 1;
+    }
 #endif
-                return 1;
+    if ( req_id == MAX_VOICEMAP_ENTRIES ) {
+        if (MATCH_SECTION(SECTION_VOICE_GLOBAL)) {
+            for (int i = 0; i < CUSTOM_ALARM_ID; i++) {
+                snprintf(tempstring, 4, "%d", i);
+                if (MATCH_KEY(tempstring)) {
+                    voice_map[i].duration = duration;
+                    voice_map[i].id = i;
+                    return 1;
+                }
             }
         }
+        if (MATCH_SECTION(SECTION_VOICE_CUSTOM)) {
+            voice_map[voice_map_entries].duration = duration;
+            voice_map[voice_map_entries].id = id;
+            voice_map_entries++;
+            return 1;
+        }
+        printf("Unknown entry in voice.ini: %s\n", value);
+        return 0;
     }
-    if (MATCH_SECTION(SECTION_VOICE_CUSTOM)) {
-        voice_map[voice_map_entries].duration = duration;
-        voice_map[voice_map_entries].id = atoi(name);
-#if HAS_MUSIC_CONFIG
-        strcpy(voice_map[voice_map_entries].label, label);
-#endif
-        voice_map_entries++;
-        return 1;
-    }
-    printf("Unknown entry in voice.ini: %s\n", value);
-    return 0;
+    return 1;  // voice label ignored
 }
 
-void CONFIG_VoiceParse()
+const char* CONFIG_VoiceParse(unsigned id)
 {
-    voice_map_entries = CUSTOM_ALARM_ID;
     #ifdef _DEVO12_TARGET_H_
     static char filename[] = "media/voice.ini\0\0\0"; // placeholder for longer folder name
     static u8 checked;
@@ -92,9 +94,19 @@ void CONFIG_VoiceParse()
     #else
     char filename[] = "media/voice.ini";
     #endif
-    if (CONFIG_IniParse(filename, ini_handler, NULL)) {
-        printf("Failed to parse voice.ini\n");
-        Transmitter.audio_player = AUDIO_NONE; // disable external voice output
+    if (id == MAX_VOICEMAP_ENTRIES) {  // initial parse of voice.ini
+        voice_map_entries = CUSTOM_ALARM_ID;  // Reserve space in map for global alerts
+        if (CONFIG_IniParse(filename, ini_handler, &id)) {
+            printf("Failed to parse voice.ini\n");
+            Transmitter.audio_player = AUDIO_NONE;  // disable external voice output
+            tempstring[0] = '\0';
+        }
+    }
+    if ( (id < MAX_VOICEMAP_ENTRIES) && (id >= CUSTOM_ALARM_ID) ) {
+        if (CONFIG_IniParse(filename, ini_handler, &id)) {
+            // ini handler will return tempstring with label of id
+        }
     }
+    return tempstring;
 }
 #endif

src/config/voice.h

@@ -1,2 +1 @@
-
-void CONFIG_VoiceParse();
+const char* CONFIG_VoiceParse();

src/extended_audio.c

@@ -27,13 +27,14 @@
 #if HAS_EXTENDED_AUDIO
 u16 voice_map_entries;
 struct VoiceMap voice_map[MAX_VOICEMAP_ENTRIES];
-
 u16 audio_queue[AUDIO_QUEUE_LENGTH];
 u8 next_audio;
 u8 num_audio;
 u32 audio_queue_time;
 
+#ifndef EMULATOR
 static u8 player_buffer[] = {0x7E, 0xFF, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEF};
+#endif
 
 // Initialize UART for extended-audio
 void AUDIO_Init() {
@@ -103,12 +104,7 @@ int AUDIO_Play(u16 music) {
         printf("Voice: beep only\n");
         return 0;
     }
-
-#if HAS_MUSIC_CONFIG
-    printf("Voice: Playing mp3 #%d (%s)\n", voice_map[music].id, voice_map[music].label);
-#else
     printf("Voice: Playing mp3 #%d\n", voice_map[music].id);
-#endif
 
 #ifdef EMULATOR     // On emulators call mpg123 to play mp3s
     char cmd[70];

src/extended_audio.h

@@ -1,7 +1,7 @@
 #ifndef _EXTENDED_AUDIO_H_
 #define _EXTENDED_AUDIO_H_
 
-#ifdef HAS_EXTENDED_AUDIO
+#if HAS_EXTENDED_AUDIO
 
 #define AUDIO_QUEUE_LENGTH 20 // arbitraty chosen, do we need more?
 

src/music.h

@@ -95,7 +95,7 @@ struct CustomVoice {
     u16 music;
 };
 
-struct  Voice {
+struct Voice {
     struct CustomVoice switches[NUM_SWITCHES];	//Switch array to point to music file number, no pots
     struct CustomVoice telemetry[TELEM_NUM_ALARMS]; //Telemetry Alarm array to point to music file number
     struct CustomVoice timer[NUM_TIMERS]; //Timer Alarm array to point to music file number
@@ -111,9 +111,6 @@ extern u16 voice_map_entries;
 struct VoiceMap {
     u16 id;
     u16 duration;
-#if HAS_MUSIC_CONFIG
-    char label[MAX_VOICE_LABEL];
-#endif
 };
 
 extern struct VoiceMap voice_map[MAX_VOICEMAP_ENTRIES];

src/pages/320x240x16/voiceconfig_page.c

@@ -32,12 +32,10 @@ enum {
 static int row_cb(int absrow, int relrow, int y, void *data)
 {
     (void)data;
-        int row = y;
-        int voice_num = absrow;
         //Row 1
-        GUI_CreateLabelBox(&gui->name[relrow], COL1, row, COL2-COL1, 18, &LABEL_FONT,voiceconfig_str_cb, NULL, (void *)(long)voice_num);
-        GUI_CreateTextSelect(&gui->voiceidx[relrow],  COL2, row, TEXTSELECT_64, voice_test_cb, voiceid_cb, (void *)(long)voice_num);
-        GUI_CreateLabelBox(&gui->voicelbl[relrow], COL3, row, LCD_WIDTH - COL3 - ARROW_WIDTH, 18, &TINY_FONT, voicelbl_cb, NULL, (void *)(long)voice_num);
+        GUI_CreateLabelBox(&gui->name[relrow], COL1, y, COL2-COL1, 18, &LABEL_FONT, voiceconfig_str_cb, NULL, (void *)(long)absrow);
+        GUI_CreateTextSelect(&gui->voiceidx[relrow],  COL2, y, TEXTSELECT_64, voice_test_cb, voiceid_cb, (void *)(long)absrow);
+        GUI_CreateLabelBox(&gui->voicelbl[relrow], COL3, y, LCD_WIDTH - COL3 - ARROW_WIDTH, 18, &TINY_FONT, voicelbl_cb, NULL, (void *)(long)absrow);
     return 1;
 }
 
@@ -52,7 +50,7 @@ void PAGE_VoiceconfigInit(int page)
             _tr("External voice\ncurrently not\navailable"));
         return;
     }
-    
+
     GUI_CreateScrollable(&gui->scrollable, 0, init_y, LCD_WIDTH, LCD_HEIGHT-init_y,
                      VOICEROWSPACER, MODEL_CUSTOM_ALARMS, row_cb, NULL, NULL, NULL);
     PAGE_SetScrollable(&gui->scrollable, &current_selected);

src/pages/common/_voiceconfig_page.c

@@ -123,25 +123,25 @@ static const char *voicelbl_cb(guiObject_t *obj, const void *data)
     switch (voiceconfig_getsrctype(idx)) {
         case VOICE_SRC_SWITCH:
             if (Model.voice.switches[idx - VOICE_SRC_SWITCH].music)
-                return voice_map[Model.voice.switches[idx - VOICE_SRC_SWITCH].music].label;
+                return CONFIG_VoiceParse(voice_map[Model.voice.switches[idx - VOICE_SRC_SWITCH].music].id);
             break;
 #if NUM_AUX_KNOBS
         case VOICE_SRC_AUX:
             if(Model.voice.aux[idx - VOICE_SRC_AUX].music)
-                return voice_map[Model.voice.aux[idx - VOICE_SRC_AUX].music].label;
+                return CONFIG_VoiceParse(voice_map[Model.voice.aux[idx - VOICE_SRC_AUX].music].id);
             break;
 #endif
         case VOICE_SRC_TIMER:
             if (Model.voice.timer[idx - VOICE_SRC_TIMER].music)
-                return voice_map[Model.voice.timer[idx - VOICE_SRC_TIMER].music].label;
+                return CONFIG_VoiceParse(voice_map[Model.voice.timer[idx - VOICE_SRC_TIMER].music].id);
             break;
         case VOICE_SRC_TELEMETRY:
             if (Model.voice.telemetry[idx - VOICE_SRC_TELEMETRY].music)
-                return voice_map[Model.voice.telemetry[idx - VOICE_SRC_TELEMETRY].music].label;
+                return CONFIG_VoiceParse(voice_map[Model.voice.telemetry[idx - VOICE_SRC_TELEMETRY].music].id);
             break;
         case VOICE_SRC_MIXER:
             if (Model.voice.mixer[idx - VOICE_SRC_MIXER].music)
-                return voice_map[Model.voice.mixer[idx - VOICE_SRC_MIXER].music].label;
+                return CONFIG_VoiceParse(voice_map[Model.voice.mixer[idx - VOICE_SRC_MIXER].music].id);
             break;
     }
     return strcpy(tempstring, "");

src/pages/common/voiceconfig_page.h

@@ -1,5 +1,6 @@
 #ifndef _MUSICCONFIG_PAGE_H_
 #define _MUSICCONFIG_PAGE_H_
+#include "config/voice.h"
 
 #if HAS_MUSIC_CONFIG
 struct voiceconfig_page {