WIP - Added m5stack-fire as compile target

Author: CelliesProjects

platformio.ini

@@ -2,6 +2,8 @@
 description = aquacontrol-v2-esp32-box-lite
 ;https://github.com/espressif/esp-box
 
+default_envs = m5stack-fire ;esp32s3box ;m5stack-fire
+
 [user]
 build_flags =
     -D NTP_POOL=\"nl.pool.ntp.org\"
@@ -15,6 +17,8 @@ build_flags =
     ;ESP_LOG_VERBOSE     5
 
 [env]
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.07/platform-espressif32.zip
+framework = arduino
 build_flags =
     -Wall
     ;-Werror
@@ -24,25 +28,44 @@ build_flags =
     -D NUMBER_OF_CHANNELS=5
 
 lib_deps =
-    ;lovyan03/LovyanGFX@^1.1.16
     celliesprojects/MoonPhase@^1.0.3
     https://github.com/lovyan03/LovyanGFX#develop
 
+upload_speed = 921600
+monitor_speed = 115200
+monitor_filters = esp32_exception_decoder
+
 [env:esp32s3box]
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.07/platform-espressif32.zip
+;https://github.com/espressif/esp-box
 board = esp32s3box
-framework = arduino
-
 board_build.mcu=esp32s3
 board_build.arduino.memory_type = qio_opi
 
-upload_speed = 921600
-monitor_speed = 115200
-monitor_filters = esp32_exception_decoder
-
 build_flags =
-    ${env.build_flags}
+    -D LGFX_ESP32_S3_BOX_LITE 
+    -D LEDPIN_0=38
+    -D LEDPIN_1=39
+    -D LEDPIN_2=40
+    -D LEDPIN_3=41
+    -D LEDPIN_4=42
+    -D SDCARD_SS=10
     ${user.build_flags}
+    ${env.build_flags}
 
-lib_deps =
-    ${env.lib_deps}
+
+
+[env:m5stack-fire]
+board = esp32dev ;m5stack-fire
+board_build.mcu=esp32
+build_flags =
+    -D LGFX_M5STACK
+    -D LEDPIN_0=3
+    -D LEDPIN_1=16
+    -D LEDPIN_2=17
+    -D LEDPIN_3=2
+    -D LEDPIN_4=5
+    -D SDCARD_SS=4
+    ${user.build_flags}
+    ${env.build_flags}
+    -D BOARD_HAS_PSRAM
+    -mfix-esp32-psram-cache-issue

src/dimmerTask.cpp

@@ -23,12 +23,23 @@ static unsigned long long msSinceMidnight()
 
 void dimmerTask(void *parameter)
 {
-    constexpr const uint8_t ledPin[NUMBER_OF_CHANNELS] = {38, 39, 40, 41, 42};
-    constexpr const float fullMoonLevel[NUMBER_OF_CHANNELS] = {0, 0, 0, 0, 0.06};
+    static constexpr const uint8_t ledPin[NUMBER_OF_CHANNELS] =
+        {LEDPIN_0, LEDPIN_1, LEDPIN_2, LEDPIN_3, LEDPIN_4};
+    static constexpr const float fullMoonLevel[NUMBER_OF_CHANNELS] =
+        {0, 0, 0, 0, 0.06};
+    static constexpr const int PWM_BITDEPTH = min(SOC_LEDC_TIMER_BIT_WIDTH, 16);
+    static constexpr const int LEDC_MAX_VALUE = (1 << PWM_BITDEPTH) - 1;
+    static constexpr const int freq = 1220;
+
+#ifdef LGFX_M5STACK
+    static constexpr const int BACKLIGHT_PIN = 32;
+    if (!ledcChangeFrequency(BACKLIGHT_PIN, freq, PWM_BITDEPTH) ||
+        !ledcWrite(BACKLIGHT_PIN, LEDC_MAX_VALUE >> 6))
+        log_w("Could not capture M5Stack backlight");
+#endif
 
-    const int freq = 1200;
     for (int index = 0; index < NUMBER_OF_CHANNELS; index++)
-        if (!ledcAttachChannel(ledPin[index], freq, SOC_LEDC_TIMER_BIT_WIDTH, index + 2))
+        if (!ledcAttachChannel(ledPin[index], freq, PWM_BITDEPTH, index + 2))
         {
             log_e("Error setting ledc pin %i. system halted", index);
             while (1)
@@ -80,7 +91,6 @@ void dimmerTask(void *parameter)
 
                 currentPercentage[index] = newPercentage < currentMoonLevel ? currentMoonLevel : newPercentage;
 
-                constexpr const int LEDC_MAX_VALUE = (1 << SOC_LEDC_TIMER_BIT_WIDTH) - 1;
                 const int dutyCycle = mapf(currentPercentage[index], 0, 100, 0, LEDC_MAX_VALUE);
 
                 if (!ledcWrite(ledPin[index], dutyCycle))
@@ -99,7 +109,7 @@ void dimmerTask(void *parameter)
             lastLcdRefresh = millis();
         }
 
-        constexpr const int MOON_UPDATE_INTERVAL_SECONDS = 1;
+        constexpr const int MOON_UPDATE_INTERVAL_SECONDS = 5;
         static time_t lastMoonUpdate = time(NULL);
         if (time(NULL) - lastMoonUpdate >= MOON_UPDATE_INTERVAL_SECONDS)
         {
@@ -113,16 +123,16 @@ void dimmerTask(void *parameter)
             msg.int1 = moon.angle;
             xQueueSend(lcdQueue, &msg, portMAX_DELAY);
         }
-/*
-        static int lps = 0;
-        lps++;
-        static time_t lastlps = time(NULL);
-        if (time(NULL) != lastlps)
-        {
-            log_i("loops per second: %i", lps);
-            lastlps++;
-            lps = 0;
-        }
-*/        
+        /*
+                static int lps = 0;
+                lps++;
+                static time_t lastlps = time(NULL);
+                if (time(NULL) != lastlps)
+                {
+                    log_i("loops per second: %i", lps);
+                    lastlps++;
+                    lps = 0;
+                }
+        */
     }
 }

src/lcdTask.hpp

@@ -1,7 +1,6 @@
 #ifndef _DISPLAY_TASK_
 #define _DISPLAY_TASK_
 
-#define LGFX_ESP32_S3_BOX_LITE 
 #include <LovyanGFX.hpp>
 #include <LGFX_AUTODETECT.hpp>
 

src/main.cpp

@@ -169,6 +169,10 @@ void setup(void)
 {
     Serial.begin(115200);
 
+#ifdef LGFX_M5STACK
+    pinMode(DAC1, OUTPUT); // prevents high pitched noise on the builtin speaker which is connected to DAC1
+#endif
+
     log_i("aquacontrol v2");
 
     if (!lcdQueue)
@@ -187,7 +191,7 @@ void setup(void)
     SPI.begin(SCK, MISO, MOSI);
     SPI.setHwCs(true);
 
-    if (!SD.begin(SS))
+    if (!SD.begin(SDCARD_SS))
         log_w("could not mount SD");
     else
     {