Merge pull request #8 from ainyan03/feature/stickcplusse-support

Add StickCPlusSE support and stabilize WiFi setup

Author: lovyan03

.gitignore

@@ -30,3 +30,6 @@
 *.exe
 *.out
 *.app
+
+# PlatformIO build output and downloaded dependencies
+.pio/

README.md

@@ -1,14 +1,107 @@
-# T-Lite-Internal-FW (M5StickC-Plus + MLX90640 Thermal HAT)
+# M5Stick T-Lite Firmware
 
-### SKU:K126
+Firmware for the [M5Stack T-Lite (SKU K126)](https://docs.m5stack.com/en/app/T-Lite),
+a thermal camera built from an M5StickC Plus and an MLX90640 Thermal HAT.
 
 ![T-Lite](https://static-cdn.m5stack.com/resource/docs/products/app/T-Lite/img-1b8ebe07-4556-4641-a487-b6fe6bf8b0c6.jpg)
 
-## Related Link
+## Supported hardware
 
-- [Document & Datasheet](https://docs.m5stack.com/en/app/T-Lite)
+| Main unit | Thermal sensor |
+| --- | --- |
+| M5StickC Plus | MLX90640 Thermal HAT |
+| M5StickC Plus SE | MLX90640 Thermal HAT |
 
-## License
+The same firmware image runs on both main units. T-Lite does not use the internal
+IMU, which is absent from the Plus SE.
+
+## Features
+
+- Thermal image display with multiple layouts and color palettes
+- Temperature range, refresh rate, noise filter, and emissivity settings
+- Wi-Fi setup from a phone using an access point and QR codes
+- Browser control, temperature data, and MJPEG streaming over the local network
+- Access by IP address or mDNS hostname
+- Battery level and charging status in the upper-right status row
+- Runtime heap, task stack, and Wi-Fi diagnostics at `/health`
+
+## Wi-Fi setup
+
+1. On T-Lite, open **Network > WiFi Setting > AP mode**.
+2. Scan the displayed Wi-Fi QR code with a phone. To connect manually, select
+   `T-Lite_xxxx` and enter `12341234` as the password.
+3. After the phone joins the T-Lite network, scan the new QR code or open
+   `http://192.168.4.1/wifi`.
+4. Select a nearby network from the SSID list, enter its password, and save.
+5. Reconnect the phone to the same local network as T-Lite.
+
+If the SSID list is still being populated, wait for the page to refresh or select
+**Refresh networks**. When all phones leave the setup access point, T-Lite shows
+the Wi-Fi connection QR code again.
+
+## Browser access
+
+After Wi-Fi setup, the Network menu provides QR codes for local access.
+
+| Method | Address |
+| --- | --- |
+| IP address | The address assigned by the local router |
+| mDNS | `http://t-lite-xxxx.local/` |
+
+The home page links to browser control, text and JSON temperature data, system
+health, and the MJPEG stream. If the network or phone does not support mDNS, use
+the IP address instead.
+
+The mDNS hostname changed from `T-Lite_xxxx.local` to `t-lite-xxxx.local`. Update
+saved bookmarks created with older firmware.
+
+## Battery indicator
+
+The battery icon shares the upper-right status row with the Wi-Fi and cloud icons.
+
+| Appearance | Meaning |
+| --- | --- |
+| Green | Battery is charging |
+| White | Battery is not charging |
+| Gray | Charging state is unavailable |
+| Dash inside the icon | Battery level is unavailable |
 
-- [MIT](LICENSE)
+The filled portion represents the estimated battery level and updates about once
+per second. A USB connection does not always mean that the battery is actively
+charging.
+
+## Build
+
+This project uses [PlatformIO](https://platformio.org/). The framework is pinned to
+Espressif32 6.12.0, which includes Arduino-ESP32 2.0.17.
+
+Build the release firmware:
+
+```sh
+pio run -e release
+```
+
+Upload it to a connected device:
+
+```sh
+pio run -e release -t upload
+```
+
+For verbose runtime logging, use the `debug` environment:
+
+```sh
+pio run -e debug
+```
+
+The application image is generated at `.pio/build/release/firmware.bin`. It is an
+application-partition image for address `0x10000`; use the PlatformIO upload command
+above when writing a complete device.
+
+## Links
+
+- [T-Lite documentation and datasheet](https://docs.m5stack.com/en/app/T-Lite)
+- [M5StickC Plus SE specifications](https://docs.m5stack.com/en/core/StickC-Plus_SE)
+
+## License
 
+[MIT](LICENSE)

platformio.ini

@@ -11,7 +11,9 @@
 
 [env]
 framework = arduino
-platform = espressif32@4.4.0
+; Arduino-ESP32 2.0.3 (platform 4.4.0) fails WPA2 SoftAP authentication on
+; StickCPlusSE. 2.0.17 has been verified with the same device and password.
+platform = espressif32@6.12.0
 board = m5stick-c
 board_build.partitions = huge_app.csv
 board_build.flash_mode = qio
@@ -27,7 +29,7 @@ lib_deps = bblanchon/ArduinoJson
 build_type = release
 build_flags = -DCORE_DEBUG_LEVEL=0 -O3
 extra_scripts = post:generate_user_custom.py
-custom_firmware_version = 0.0.11
+custom_firmware_version = 0.0.15
 custom_firmware_name = TLite-FW
 custom_firmware_suffix = .bin
 custom_firmware_dir = r:\

src/command_processor.cpp

@@ -65,16 +65,21 @@ static inline void gpio_hi(int_fast8_t pin) { *get_gpio_hi_reg(pin) = 1 << (pin
 static inline void gpio_lo(int_fast8_t pin) { *get_gpio_lo_reg(pin) = 1 << (pin & 31); }
 /* clang-format on */
 
-static int8_t _battery_state = 0;
-static int8_t _battery_level = 0;
+static int8_t _battery_state = m5::Power_Class::charge_unknown;
+static int8_t _battery_level = -1;
 static bool _battery_request = false;
 
+static int8_t readBatteryLevel(void) {
+    const int level = M5.Power.getBatteryLevel();
+    return level < 0 ? -1 : (level > 100 ? 100 : level);
+}
+
 void updateBattery(void) {
     if (M5.Power.getType() == m5::Power_Class::pmic_ip5306) {
         _battery_request = true;
     } else {
         _battery_state = M5.Power.isCharging();
-        _battery_level = M5.Power.getBatteryLevel();
+        _battery_level = readBatteryLevel();
     }
 }
 
@@ -177,7 +182,7 @@ static void IRAM_ATTR mlxTask(void* main_handle) {
         if (_battery_request) {
             _battery_request = false;
             _battery_state   = M5.Power.isCharging();
-            _battery_level   = M5.Power.getBatteryLevel();
+            _battery_level   = readBatteryLevel();
         }
     }
     vTaskDelete(nullptr);

src/common_header.h

@@ -1,11 +1,12 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <M5GFX.h>
+#include <M5Unified.h>
 #include <WiFi.h>
 
 static constexpr const uint8_t firmware_ver_major = 0;
 static constexpr const uint8_t firmware_ver_minor = 0;
-static constexpr const uint8_t firmware_ver_patch = 14;
+static constexpr const uint8_t firmware_ver_patch = 15;
 
 static constexpr uint8_t frame_width  = 32;
 static constexpr uint8_t frame_height = 24;
@@ -831,14 +832,11 @@ struct config_param_t {
 
     enum net_setup_mode_t {
         net_setup_mode_off,
-        net_setup_mode_smartconfig,
         net_setup_mode_accesspoint,
         // net_wifi_mode_keep_connect,
         // net_wifi_mode_uploading,
         net_setup_mode_max,
     };
-    // static constexpr const char* net_setup_mode_text[] = { "Off", "ESP TOUCH
-    // APP", "AP mode", "Keep connection", "OnCloud only" };
 
     enum alarm_mode_t {
         alarm_mode_off,
@@ -1066,7 +1064,6 @@ struct config_param_t {
         {"WiFi Setting", "WiFi设置", "WiFi設定"},
         (const localize_text_t[]){
             {"Off", "关闭AP", "オフ"},
-            {"ESP TOUCH APP", "通过ESP TOUCH APP配置", "ESP TOUCHアプリ"},
             {"AP mode", "连接本机AP热点", "アクセスポイントモード"},
         },
         net_setup_mode_t ::net_setup_mode_off,
@@ -1297,10 +1294,10 @@ struct draw_param_t : public config_param_t {
     uint8_t update_count      = 0;
     uint8_t modify_count      = 0;
     uint32_t draw_count       = 0;
-    int8_t battery_state;
-    int8_t battery_level;
-    uint8_t font_height     = 8;
-    bool oncloud_conf_valid = false;
+    int8_t battery_state      = m5::Power_Class::charge_unknown;
+    int8_t battery_level      = -1;
+    uint8_t font_height       = 8;
+    bool oncloud_conf_valid   = false;
     uint8_t macaddr[8];
 
     enum cloud_status_t {
@@ -1318,10 +1315,11 @@ struct draw_param_t : public config_param_t {
     std::string net_tmp_ssid;  // APモードで設定のために一時的に利用するSSID
     std::string
         net_tmp_pwd;  // APモードで設定のために一時的に利用するパスワード
-    std::string net_ap_url;    // APモードアクセス用URL
-    std::string net_url_mdns;  // mDNS名アクセス用URL
-    std::string net_url_ip;    // mDNS名アクセス用URL
-    std::string net_hostname;  // T-Lite_xxxx.local
+    std::string net_ap_wifi_qr;  // Wi-Fi credentials for joining the setup AP
+    std::string net_ap_url;      // APモードアクセス用URL
+    std::string net_url_mdns;    // mDNS名アクセス用URL
+    std::string net_url_ip;      // mDNS名アクセス用URL
+    std::string net_hostname;    // DNS host label, without .local
     std::string cloud_url;
     IPAddress cloud_ip;