Sync from Time-Circuits-Display-A10001986

Author: github-actions[bot]

AddOns.md

@@ -1,4 +1,3 @@
-
 # DIY additions for the Time Circuits Display
 
 - [Rotary Encoder](#rotary-encoder)
@@ -27,7 +26,7 @@ Up to two rotary encoders can be connected, one for speed, one for volume.
 In order to use an encoder for speed or volume, it needs to be configured as follows:
 
   <table>
-  <tr><td></td><td>Ada4991</td><td>DFRobot</td><td>DuPPA</td></tr>
+  <tr><td></td><td>Ada4991/5880</td><td>DFRobot</td><td>DuPPA</td></tr>
   <tr><td>Speed</td><td>Default</td><td>SW1=0,SW2=0</td><td>A0 closed</td></tr>
   <tr><td>Volume</td><td>A0 closed</td><td>SW1=0,SW2=1</td><td>A0,A1 closed</td></tr>
   </table>
@@ -220,7 +219,7 @@ The TCD has a TT-OUT pin (marked "TT OUT (IO14)" or "IO14") which can be used to
 
 Signaling is done by setting this pin HIGH (2.7-3.3V).
 
-For connecting CircuitSetup/A10001986 props, see the prop's documentation ([Flux capacitor](https://github.com/realA10001986/Flux-Capacitor/tree/main?tab=readme-ov-file#connecting-a-tcd-by-wire), [SID](https://github.com/realA10001986/SID/tree/main?tab=readme-ov-file#connecting-a-tcd-by-wire), [Dash Gauges](https://github.com/realA10001986/Dash-Gauges/blob/main/hardware/README.md#connecting-a-tcd-to-the-dash-gauges-by-wire), [VSR](https://github.com/realA10001986/VSR#connecting-a-tcd-by-wire)).
+For connecting CircuitSetup/A10001986 props, see the prop's documentation ([Flux capacitor](https://github.com/CircuitSetup/Flux-Capacitor#connecting-a-tcd-by-wire), [SID](https://github.com/CircuitSetup/SID#connecting-a-tcd-by-wire), [Dash Gauges](https://github.com/CircuitSetup/Dash-Gauges/blob/main/hardware/README.md#connecting-a-tcd-to-the-dash-gauges-by-wire), [VSR](https://github.com/realA10001986/VSR#connecting-a-tcd-by-wire)).
 
 In order to connect props that can sense HIGH/LOW levels (and don't use the TT OUT pin for power supply), you need two wires for connecting the TCD: TT-OUT and GND, which need to be connected to the prop:
 
@@ -383,4 +382,4 @@ As you can see, there is no stall: The props receive proper info on when the tem
 Conclusion: If you are not planning on using GPS/Rotary Encoder/Futaba remote speed with your TCD, you can use the normal TIMETRAVEL command. In the other case, you need to teach your MQTT-aware device how to interpret the enhanced TIMETRAVEL_xxxx_yyyy command. Both xxxx and yyyy are always four digits. xxxx is the time until temporal displacement starts, yyyy is an approximation of the duration of the temporal displacement; however, don't use this value to time the reentry, instead wait for the REENTRY command to initiate your re-entry sequence.
 
 ---
-_Text & images: (C) Thomas Winischhofer ("A10001986"). See LICENSE._ Source: https://tcd.out-a-ti.me
+_Text & images: (C) Thomas Winischhofer ("A10001986"). See LICENSE._ Source: https://github.com/CircuitSetup/Time-Circuits-Display

CheatSheet.pdf

@@ -0,0 +1,111 @@
+/*
+ * AudioFileSourceLoop
+ * Read SD/SPIFFS/LittleFS file to be used by AudioGenerator
+ * Reads file in a loop (for looped playback)
+ * 
+ * Thomas Winischhofer (A10001986), 2023
+ *
+ * Based on AudioFileSourceSD by Earle F. Philhower, III
+ *
+ */
+
+#include "tc_global.h"
+#include "AudioFileSourceLoop.h"
+
+AudioFileSourceLoop::AudioFileSourceLoop()
+{
+}
+
+AudioFileSourceLoop::~AudioFileSourceLoop()
+{
+    if(f) f.close();
+}
+
+uint32_t AudioFileSourceLoop::read(void *data, uint32_t len)
+{
+    uint32_t glen = f.read(reinterpret_cast<uint8_t*>(data), len);
+    if(!doPlayLoop || glen == len) return glen;
+    seek(startPos, SEEK_SET);
+    return glen + f.read(reinterpret_cast<uint8_t*>(data) + glen, len - glen);
+}
+
+bool AudioFileSourceLoop::seek(int32_t pos, int dir)
+{
+    if(!f) return false;
+    if(dir == SEEK_SET)      return f.seek(pos);
+    else if(dir == SEEK_CUR) return f.seek(f.position() + pos);
+    else if(dir == SEEK_END) return f.seek(f.size() + pos);
+    return false;
+}
+
+bool AudioFileSourceLoop::close()
+{
+    f.close();
+    return true;
+}
+
+bool AudioFileSourceLoop::isOpen()
+{
+    return f ? true : false;
+}
+
+uint32_t AudioFileSourceLoop::getSize()
+{
+    if(!f) return 0;
+    return f.size();
+}
+
+uint32_t AudioFileSourceLoop::getPos()
+{
+    if(!f) return 0;
+    return f.position();
+}
+
+void AudioFileSourceLoop::setStartPos(int32_t newStartPos)
+{
+    startPos = newStartPos;
+}
+
+void AudioFileSourceLoop::setPlayLoop(bool playLoop)
+{
+    doPlayLoop = playLoop;
+}
+
+
+// SD -----------------------------------------------
+
+AudioFileSourceSDLoop::AudioFileSourceSDLoop()
+{
+}
+
+AudioFileSourceSDLoop::AudioFileSourceSDLoop(const char *filename)
+{
+    open(filename);
+}
+
+bool AudioFileSourceSDLoop::open(const char *filename)
+{
+    f = SD.open(filename, FILE_READ);
+    return f;
+}
+
+// FlashFS -------------------------------------------
+
+AudioFileSourceFSLoop::AudioFileSourceFSLoop()
+{
+}
+
+AudioFileSourceFSLoop::AudioFileSourceFSLoop(const char *filename)
+{
+    open(filename);
+}
+
+bool AudioFileSourceFSLoop::open(const char *filename)
+{
+    #ifdef USE_SPIFFS   // ------------------------------
+    f = SPIFFS.open(filename, FILE_READ);
+    #else   // ------------------------------------------
+    f = LittleFS.open(filename, FILE_READ);
+    #endif // -------------------------------------------
+    return f;
+}

README.md

@@ -0,0 +1,63 @@
+/*
+ * AudioFileSourceLoop
+ * Read SD/SPIFFS/LittleFS file to be used by AudioGenerator
+ * Reads file in a loop (for looped playback)
+ * 
+ * Thomas Winischhofer (A10001986), 2023
+ *
+ * Based on AudioFileSourceSD by Earle F. Philhower, III
+ *
+ */
+
+#ifndef _AudioFileSourceLoop_H
+#define _AudioFileSourceLoop_H
+
+#include "src/ESP8266Audio/AudioFileSource.h"
+#include <SD.h>
+#ifdef USE_SPIFFS
+#include <SPIFFS.h>
+#else
+#include <LittleFS.h>
+#endif
+
+class AudioFileSourceLoop : public AudioFileSource
+{
+  public:
+    AudioFileSourceLoop();
+    virtual ~AudioFileSourceLoop() override;
+    
+    //virtual bool open(const char *filename) override;
+    virtual uint32_t read(void *data, uint32_t len) override;
+    virtual bool seek(int32_t pos, int dir) override;
+    virtual bool close() override;
+    virtual bool isOpen() override;
+    virtual uint32_t getSize() override;
+    virtual uint32_t getPos() override;
+    void setStartPos(int32_t newStartPos);
+    void setPlayLoop(bool playLoop);
+
+  protected:
+    File f;
+    int32_t startPos = 0;
+    bool doPlayLoop = false;
+};
+
+class AudioFileSourceSDLoop : public AudioFileSourceLoop
+{
+  public:
+    AudioFileSourceSDLoop();
+    AudioFileSourceSDLoop(const char *filename);
+    
+    virtual bool open(const char *filename) override;
+};
+
+class AudioFileSourceFSLoop : public AudioFileSourceLoop
+{
+  public:
+    AudioFileSourceFSLoop();
+    AudioFileSourceFSLoop(const char *filename);
+    
+    virtual bool open(const char *filename) override;
+};
+
+#endif

Software/src/AudioFileSourceLoop.cpp

@@ -76,7 +76,8 @@
 #define CD_AMPM_POS   CD_DAY_POS
 #define CD_COLON_POS  CD_YEAR_POS
 
-extern bool     alarmOnOff;
+extern bool          alarmOnOff;
+extern bool          snoozeRunning();
 #ifdef TC_HAVEGPS
 extern bool     gpsHaveFix();
 extern int      gpsGetDM();
@@ -91,7 +92,9 @@ extern uint16_t    loadClockState(int16_t& yoffs);
 extern bool        saveClockState(uint16_t curYear, int16_t yearoffset);
 extern void        getClockDataP(uint64_t& timeDifference, bool &timeDiffUp);
 extern dateStruct *getClockDataDL(uint8_t did);
+extern void        updateClockDataP();
 extern bool        saveClockDataP(bool force);
+extern void        updateClockDataDL(uint8_t did, uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute);
 extern bool        saveClockDataDL(bool force, uint8_t did, uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute);
 
 #ifndef IS_ACAR_DISPLAY
@@ -112,7 +115,13 @@ static const uint8_t idxtbl[] = {
 };
 #endif
 
+static const char weekdays[7][4] = {
+    "SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"
+};
+
 static const char *nullStr = "";
+static const char tempStr[] = "TEMP";
+static const char humStr[]  = "HUMIDITY";
 
 /*
  * ClockDisplay class
@@ -239,17 +248,19 @@ uint8_t clockDisplay::setBrightnessDirect(uint8_t level)
 // Setup date in buffer --------------------------------------------------------
 
 
-// Set the displayed time with supplied DateTime object
-void clockDisplay::setDateTime(DateTime& dt)
+// Set the displayed time from supplied DateTime object
+// If wd is non-zero, year is overwritten by weekday
+void clockDisplay::setDateTime(DateTime& dt, int wd)
 {
     setYear(dt.year());
     setMonth(dt.month());
     setDay(dt.day());
     setHour(dt.hour());
     setMinute(dt.minute());
+    if(wd) setWeekDay(wd - 1);
 }
 
-// Set YEAR, MONTH, DAY, HOUR, MIN from structure
+// Set the displayed time from dateStruct
 void clockDisplay::setFromStruct(const dateStruct *s)
 {    
     setYear(s->year);
@@ -472,7 +483,12 @@ void clockDisplay::setHour(uint16_t hourNum)
 
 void clockDisplay::setMinute(int minNum)
 {
-    uint16_t seg = ((_did == DISP_PRES) && alarmOnOff) ? 0x8000 : 0;
+    uint16_t seg = 0;
+    
+    if(_did == DISP_PRES) {
+        if(snoozeRunning()) seg = _beat ? 0x8000 : 0x0000;
+        else if(alarmOnOff) seg = 0x8000;
+    }
 
     if(minNum < 0 || minNum > 59) {
         minNum = (minNum > 59) ? 59 : 0;
@@ -493,6 +509,20 @@ void clockDisplay::setYearOffset(int16_t yearOffs)
     }
 }
 
+void clockDisplay::setWeekDay(int wd)
+{
+    uint16_t temp;
+    uint16_t seg = _displayBuffer[CD_YEAR_POS + 1] & 0x8000;
+
+    temp = getLED7AlphaChar(weekdays[wd][0]) << 8;
+    //temp |= (getLED7AlphaChar(weekdays[wd][1]) << 8);
+    _displayBuffer[CD_YEAR_POS] = temp;
+
+    temp = getLED7AlphaChar(weekdays[wd][1]);
+    temp |= (getLED7AlphaChar(weekdays[wd][2]) << 8);
+    temp |= seg;     
+    _displayBuffer[CD_YEAR_POS + 1] = temp;
+}
 
 // Query data ------------------------------------------------------------------
 
@@ -654,7 +684,7 @@ void clockDisplay::showTextDirect(const char *text, uint16_t flags)
         db[CD_YEAR_POS + 1] |= 0x8000;
 
     if(flags & CDT_COLON)
-        db[CD_YEAR_POS] |= 0x8080;
+        db[CD_COLON_POS] |= 0x8080;
 
     directBuf(db, pos);
 
@@ -702,7 +732,7 @@ void clockDisplay::showSettingValDirect(const char* setting, int8_t val, uint16_
 void clockDisplay::showTempDirect(float temp, bool tempUnit, bool animate)
 {
     char buf[32];
-    const char *ttem = animate ? "    " : "TEMP";
+    const char *ttem = animate ? nullStr : tempStr;
     int t2;
     char u = tempUnit ? 'C' : 'F';
 
@@ -711,16 +741,16 @@ void clockDisplay::showTempDirect(float temp, bool tempUnit, bool animate)
 
     if(isnan(temp)) {
         #ifdef IS_ACAR_DISPLAY
-        sprintf(buf, "%s  ----~%c", ttem, u);
+        sprintf(buf, "%4.4s  ----~%c", ttem, u);
         #else
-        sprintf(buf, "%s   ----~%c", ttem, u);
+        sprintf(buf, "%4.4s   ----~%c", ttem, u);
         #endif
     } else {
         t2 = abs((int)(temp * 100.0f) - ((int)temp * 100));
         #ifdef IS_ACAR_DISPLAY
-        sprintf(buf, "%s%4d%02d~%c", ttem, (int)temp, t2, u);
+        sprintf(buf, "%4.4s%4d%02d~%c", ttem, (int)temp, t2, u);
         #else
-        sprintf(buf, "%s %4d%02d~%c", ttem, (int)temp, t2, u);
+        sprintf(buf, "%4.4s %4d%02d~%c", ttem, (int)temp, t2, u);
         #endif
     }
 
@@ -732,22 +762,22 @@ void clockDisplay::showTempDirect(float temp, bool tempUnit, bool animate)
 void clockDisplay::showHumDirect(int hum, bool animate)
 {
     char buf[16];
-    const char *thum = animate ? "        " : "HUMIDITY";
+    const char *thum = animate ? nullStr : humStr;
 
     if(!handleNM())
         return;
 
     if(hum < 0) {
         #ifdef IS_ACAR_DISPLAY
-        sprintf(buf, "%s--\x7f\x80", thum);
+        sprintf(buf, "%8.8s--\x7f\x80", thum);
         #else
-        sprintf(buf, "%s --\x7f\x80", thum);
+        sprintf(buf, "%8.8s --\x7f\x80", thum);
         #endif
     } else {
         #ifdef IS_ACAR_DISPLAY
-        sprintf(buf, "%s%2d\x7f\x80", thum, hum);
+        sprintf(buf, "%8.8s%2d\x7f\x80", thum, hum);
         #else
-        sprintf(buf, "%s %2d\x7f\x80", thum, hum);
+        sprintf(buf, "%8.8s %2d\x7f\x80", thum, hum);
         #endif
     }
 
@@ -855,6 +885,12 @@ bool clockDisplay::load()
 void clockDisplay::savePending()
 {
     _savePending = 1;
+
+    if(_did == DISP_PRES) {
+        return updateClockDataP();
+    }
+    
+    updateClockDataDL(_did, _year, _month, _day, _hour, _minute);
 }
 
 // Returns true if FS was accessed
@@ -901,7 +937,7 @@ uint8_t clockDisplay::getLED7NumChar(uint8_t value)
 // Returns bit pattern for provided character for display on 7 segment display
 uint8_t clockDisplay::getLED7AlphaChar(uint8_t value)
 {
-    if(value < 32 || value >= 127 + 2)
+    if(value < 32 || value >= 127 + 4)
         return 0;
 
     if(value == '6' && _corr6)
@@ -914,7 +950,7 @@ uint8_t clockDisplay::getLED7AlphaChar(uint8_t value)
 #ifndef IS_ACAR_DISPLAY
 uint16_t clockDisplay::getLEDAlphaChar(uint8_t value)
 {
-    if(value < 32 || value >= 127)
+    if(value < 32 || value >= 127 + 4)
         return 0;
 
     // For text, use common "6" pattern to conform with 7-seg-part