Add WAV playback during battery test

Author: SciLor

BoxBattery.cpp

@@ -143,7 +143,7 @@ void BoxBattery::startBatteryTest() {
         file.writeString("Comments");
         file.writeString("\r\n");
         file.writeString("0;;;;;;");
-        sprintf(output, "vFactor=%u, vChargerFactor=%u;", _batteryVoltageFactor, _batteryVoltageChargerFactor);
+        sprintf(output, "vFactor=%u, vChargerFactor=%u;v2-wav", _batteryVoltageFactor, _batteryVoltageChargerFactor);
         file.writeString(output);
         file.writeString("\r\n");
         file.close();

BoxDAC.cpp

@@ -200,6 +200,75 @@ void BoxDAC::loop(uint16_t timeoutMs) {
     } else {
         generateZeroAudio(timeoutMs);
     }
+    batteryTestLoop();
+}
+
+void BoxDAC::batteryTestLoop() {
+    if (Box.boxBattery.batteryTestActive()) {
+        if (current_volume != VOL_TEST)
+            setVolume(VOL_TEST);
+        /*
+        uint8_t midiId = (_batteryTestBeepState % 60) + 36; //36-96
+        uint16_t lengthMs = (midiId % 20)*10; //+ 250; 
+        beepMidi(midiId, lengthMs, true);
+
+        if (_batteryTestBeepState<255) {
+            _batteryTestBeepState++;
+        } else {
+            _batteryTestBeepState = 0;
+        }*/
+        
+        if (!audioPlaying) {
+            if (!hasStopped()/*audioSource && audioSource->isOpen()*/) {
+                Log.info("BatteryTest continue pause...");
+                play(); //continue
+            } else {
+                //next
+                DirFs dir;
+                uint8_t selectedFileId = 0;
+                uint8_t fileCount = 0;
+                if (dir.openDir("/revvox/audio")) {
+                    while (dir.nextFile()) {
+                        if (dir.isDir())
+                            continue;
+                        fileCount++;
+                    }
+                    dir.rewind();
+                    if (fileCount <= _batteryTestFileId)
+                        _batteryTestFileId = 0;
+
+                    while (dir.nextFile()) {
+                        if (dir.isDir())
+                            continue;
+
+                        if (_batteryTestFileId == selectedFileId) {
+                            Log.info("BatteryTest next song id %i...", _batteryTestFileId);
+                            char fullpath[strlen("/revvox/audio/")+strlen((const char*)dir.fileName())+1];
+                            sprintf(fullpath,"%s%s","/revvox/audio/", (const char*)dir.fileName());
+                            if (!playFile(fullpath)) {
+                                Log.error("BatteryTest file %s invalid...", fullpath);
+                                Box.boxLEDs.setActiveAnimationByIteration(BoxLEDs::ANIMATION_TYPE::BLINK, BoxLEDs::CRGB::Red, 4);
+                                Box.boxBattery.stopBatteryTest();
+                            }
+                            break;
+                        }
+                        selectedFileId++;
+                    }
+                    _batteryTestFileId++;
+                    dir.closeDir();
+                    if (fileCount == 0) {
+                        Log.error("BatteryTest dir /revvox/audio/ empty...");
+                        Box.boxLEDs.setActiveAnimationByIteration(BoxLEDs::ANIMATION_TYPE::BLINK, BoxLEDs::CRGB::Red, 4);
+                        Box.boxBattery.stopBatteryTest();
+                    }
+                } else {
+                    Log.error("BatteryTest dir /revvox/audio/ not found...");
+                    Box.boxLEDs.setActiveAnimationByIteration(BoxLEDs::ANIMATION_TYPE::BLINK, BoxLEDs::CRGB::Red, 3);
+                    Box.boxBattery.stopBatteryTest();
+                }
+            }
+        }
+    }
 }
 
 void BoxDAC::play() {

BoxDAC.h

@@ -40,6 +40,9 @@ class BoxDAC : public EnhancedThread {
         void samSay(const char *text, enum ESP8266SAM::SAMVoice voice = ESP8266SAM::SAMVoice::VOICE_SAM, uint8_t speed = 0, uint8_t pitch = 0, uint8_t throat = 0, uint8_t mouth = 0, bool sing = false, bool phoentic = false);
 
         void dmaPingPingComplete();
+
+        void batteryTestLoop();
+
         BoxAudioBufferTriple audioBuffer;
         unsigned long dmaIRQcount = 0;
         unsigned long lastDmaIRQcount = 0xFFFF;
@@ -79,6 +82,7 @@ class BoxDAC : public EnhancedThread {
         const static uint8_t VOL_MIN = 0xB0+0x7F; //0xB0=-40.0dB /min allowed value 0x81=-63.5dB
         const static uint8_t VOL_MAX = 0x0A+0x7F; //0x0A=+04.0dB /max allowed value 0x30=+24.0dB
         const static uint8_t VOL_STEP = 0x06; //3dB
+        const static uint8_t VOL_TEST = VOL_MIN + 6*VOL_STEP;
         uint8_t current_volume;
 
         //const static uint8_t VOL_BEEP_MIN = 0x2A; //0x2A=-40dB /min allowed value 0x3F=-61dB
@@ -115,6 +119,8 @@ class BoxDAC : public EnhancedThread {
         bool hasStopped();
 
     private:
+        uint8_t _batteryTestFileId;
+
         enum class PAGE {
             SERIAL_IO = 0x00,
             DAC_OUT_VOL = 0x01,

README.md

@@ -12,7 +12,7 @@ The custom bootloader is fully functional. The hackiebox custom firmware itself
 - Hardware drivers (WiFi, AMP/DAC, RFID reader, accelleration sensor, battery/charger, SD, LEDs)
 - Webinterface with basic CLI and file upload/download
 - JSON configuration file 
-- Battery stamina test with csv log
+- Battery stamina test with WAV-playback with csv log
 - Tonie file header decoder
 - WAV player (with cli + by wav file in /rCONTENT/<UIDREV>/)
 ### Todo
@@ -57,7 +57,7 @@ Open hackiebox_cfw.ino with energia and build the cfw. Remember the path where t
 ### Preface
 It is recommended to have a second copy of the cfw to be able to load the working image and update a broken cfw image over your backup cfw.
 ### Copy to sd
-First of all you need to create "/revvox/web" on your sd card (subdir revvox should be already there if you have successfully installed the sd bootloader) and copy over the content of the /web/ directory of this repository. In addition you have to copy your cfw image to your selected slot(s) on the sd card. (ex. "/revvox/boot/pre-img1.bin")
+First of all you need to create "/revvox/web" on your sd card (subdir revvox should be already there if you have successfully installed the sd bootloader) and copy over the content of the /web/ directory of this repository. The same applies to the "/revvox/audio" directory for WAV-playback during the battery test. In addition you have to copy your cfw image to your selected slot(s) on the sd card. (ex. "/revvox/boot/pre-img1.bin")
 ### First boot
 Reinsert the sd card and run the cfw once. Then shutdown the box again (put the box onto the front where the speaker/tonie logo is and press both ears for 10s). Then remove the sd card again and add your wifi credentials to the created "/revvox/hackiebox.config.json" config file. 
 ## Firmware updates

audio/both-of-us-14037.wav

@@ -0,0 +1 @@
+https://pixabay.com/de/music/schlagt-both-of-us-14037/

audio/cinematic-fairy-tale-story-main-8697.wav

@@ -0,0 +1 @@
+https://pixabay.com/de/music/uberschrift-cinematic-fairy-tale-story-main-8697/

audio/electronic-rock-king-around-here-15045.wav

@@ -0,0 +1 @@
+https://pixabay.com/de/music/schlagt-electronic-rock-king-around-here-15045/

audio/into-the-night-20928.wav

@@ -0,0 +1 @@
+https://pixabay.com/de/music/schlagt-into-the-night-20928/

audio/melody-of-nature-main-6672.wav

@@ -0,0 +1 @@
+https://pixabay.com/de/music/schone-stucke-melody-of-nature-main-6672/

audio/nightlife-michael-kobrin-95bpm-3783.wav

@@ -0,0 +1 @@
+https://pixabay.com/de/music/akustische-gruppe-nightlife-michael-kobrin-95bpm-3783/

audio/source/both-of-us-14037.txt

@@ -0,0 +1 @@
+https://pixabay.com/de/music/solo-gitarre-the-cradle-of-your-soul-15700/

audio/source/cinematic-fairy-tale-story-main-8697.txt

@@ -0,0 +1 @@
+https://pixabay.com/de/music/schlagt-trailer-sport-stylish-16073/

audio/source/electronic-rock-king-around-here-15045.txt

@@ -0,0 +1 @@
+https://pixabay.com/de/music/schlagt-yesterday-extended-version-14197/