From 370f4ae94e1913f8bc6ac0edf104e9b7c9711169 Mon Sep 17 00:00:00 2001 From: AidarKC Date: Sat, 17 Oct 2026 22:34:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D1=81=D0=BA=D0=B5=D1=82=D1=87=20=D1=80=D1=83=D1=87?= =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BC=D0=BE=D0=BD=D0=B8=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B0=20=D0=B8=20=D0=B6=D1=83=D1=80=D0=BD=D0=B0=D0=BB=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manual_monitor_lvgl_v2/bundle.sh | 191 ------ .../download_breath_log.py | 28 + .../manual_monitor_lvgl_v2.ino | 636 +++++++++++++++++- 3 files changed, 637 insertions(+), 218 deletions(-) delete mode 100644 breath_button_monitor/manual_monitor_lvgl_v2/bundle.sh create mode 100644 breath_button_monitor/manual_monitor_lvgl_v2/download_breath_log.py diff --git a/breath_button_monitor/manual_monitor_lvgl_v2/bundle.sh b/breath_button_monitor/manual_monitor_lvgl_v2/bundle.sh deleted file mode 100644 index 0672d75..0000000 --- a/breath_button_monitor/manual_monitor_lvgl_v2/bundle.sh +++ /dev/null @@ -1,191 +0,0 @@ -#!/usr/bin/env bash -set -Eeuo pipefail - -# Build a source bundle ZIP while excluding credentials, private keys, -# local state, generated artifacts and other likely secrets. -# -# Usage: -# ./bundle.sh -# ./bundle.sh path/to/output.zip -# -# Run from anywhere inside the project; the script resolves its own directory. - -ROOT="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" -cd "$ROOT" - -DEFAULT_OUT=0 -if [[ $# -gt 0 ]]; then - OUT="$1" -else - DEFAULT_OUT=1 - OUT="SHiNE-bundle-$(date +%Y.%m.%d-%H.%M.%S).zip" -fi -case "$OUT" in - /*) ;; - *) OUT="$ROOT/$OUT" ;; -esac - -if ! command -v zip >/dev/null 2>&1; then - echo "ERROR: 'zip' is required." >&2 - exit 1 -fi - -TMP="$(mktemp -d)" -LIST="$TMP/files.txt" -SAFE_LIST="$TMP/safe-files.txt" -trap 'rm -rf "$TMP"' EXIT - -# Paths / filenames that must never be bundled. -is_denied_path() { - local p="/$1" - - case "$p" in - */.git/*|*/.git|\ - */.gradle/*|*/.gradle|\ - */.gradle-home/*|*/.gradle-home|\ - */.idea/*|*/.idea|\ - */.vscode/*|*/.vscode|\ - */node_modules/*|*/node_modules|\ - */target/*|*/target|\ - */build/*|*/build|\ - */out/*|*/out|\ - */bin/*|*/bin|\ - */logs/*|*/logs|\ - */data/*|*/data|\ - */test-ledger/*|*/test-ledger|\ - */.anchor/*|*/.anchor|\ - */.yarn/*|*/.yarn|\ - */.vendor/*|*/.vendor|\ - */.agents/*|*/.agents|\ - */.codex/*|*/.codex|\ - */.claude/*|*/.claude|\ - */deploy/backup/archive/*|\ - */scripts/*/runs/*|\ - */scripts/*/keypairs/*|\ - */keys/*|\ - */.git-local-backup/*) - return 0 - ;; - esac - - local base="${p##*/}" - local lower - lower="$(printf '%s' "$base" | tr '[:upper:]' '[:lower:]')" - - case "$lower" in - .env|.env.*|\ - .debug-token|\ - .npmrc|.pypirc|.netrc|\ - credentials|credentials.*|\ - secrets|secrets.*|\ - secret|secret.*|\ - id_rsa|id_dsa|id_ecdsa|id_ed25519|\ - *.pem|*.key|*.p12|*.pfx|*.jks|*.keystore|\ - *keypair*.json|\ - service-account*.json|\ - firebase-adminsdk*.json|\ - google-services.json|\ - validator.log) - return 0 - ;; - esac - - case "$lower" in - *.class|*.jar|*.war|*.ear|*.o|*.a|*.so|*.dll|*.dylib|\ - *.elf|*.map|*.uf2|*.bin|*.merged.bin|\ - *.log|*.bak|*.bak.png|*.tmp|*.swp|*.swo|\ - .ds_store) - return 0 - ;; - esac - - return 1 -} - -# Collect files. Prefer Git because it naturally avoids most ignored local files. -if command -v git >/dev/null 2>&1 && git -C "$ROOT" rev-parse --is-inside-work-tree >/dev/null 2>&1; then - git -C "$ROOT" ls-files -co --exclude-standard -z > "$TMP/files.z" -else - find "$ROOT" -type f -print0 > "$TMP/files.z" -fi - -# Convert to project-relative paths and enforce hard deny rules. -: > "$LIST" -while IFS= read -r -d '' f; do - if [[ "$f" = /* ]]; then - rel="${f#"$ROOT"/}" - else - rel="$f" - fi - - [[ "$rel" == "$OUT" ]] && continue - [[ -z "$rel" ]] && continue - - if is_denied_path "$rel"; then - continue - fi - - printf '%s\n' "$rel" >> "$LIST" -done < "$TMP/files.z" - -sort -u "$LIST" -o "$LIST" - -# Always include Gradle wrapper bootstrap, even though generic JARs are denied. -if [[ -f "$ROOT/SHiNE-server/gradle/wrapper/gradle-wrapper.jar" ]]; then - if ! grep -Fxq 'SHiNE-server/gradle/wrapper/gradle-wrapper.jar' "$LIST"; then - printf '%s\n' 'SHiNE-server/gradle/wrapper/gradle-wrapper.jar' >> "$LIST" - sort -u "$LIST" -o "$LIST" - fi -fi - -# Content scan: fail closed on common credential/private-key patterns. -# We scan only text-ish files; grep -I skips binary data. -SECRET_RE='-----BEGIN ([A-Z0-9 ]+ )?PRIVATE KEY-----|AKIA[0-9A-Z]{16}|ASIA[0-9A-Z]{16}|gh[pousr]_[A-Za-z0-9_]{20,}|github_pat_[A-Za-z0-9_]{20,}|sk-[A-Za-z0-9_-]{20,}|xox[baprs]-[A-Za-z0-9-]{10,}|AIza[0-9A-Za-z_-]{30,}|(^|[^A-Za-z0-9])(password|passwd|pwd|secret|api[_-]?key|access[_-]?token|auth[_-]?token|private[_-]?key)[[:space:]]*[:=][[:space:]]*["'\'']?[^${[:space:]]{][^[:space:]]{7,}' - -: > "$SAFE_LIST" -found_secret=0 - -while IFS= read -r rel; do - [[ -f "$ROOT/$rel" ]] || continue - - # Files that contain examples/templates can legitimately mention secret keys - # with placeholders. They are scanned too, but placeholder-looking values - # are less likely to match the regex above. - if LC_ALL=C grep -IEnq "$SECRET_RE" "$ROOT/$rel" 2>/dev/null; then - echo "BLOCKED: possible secret in $rel" >&2 - LC_ALL=C grep -IEn "$SECRET_RE" "$ROOT/$rel" 2>/dev/null \ - | sed -E 's/(:[[:space:]]*).*/\1[REDACTED]/' \ - | head -n 3 >&2 || true - found_secret=1 - continue - fi - - printf '%s\n' "$rel" >> "$SAFE_LIST" -done < "$LIST" - -if (( found_secret != 0 )); then - echo >&2 - echo "Bundle NOT created because possible secrets were detected." >&2 - echo "Move secrets to ignored/local files or adjust the scanner only after review." >&2 - exit 2 -fi - -if [[ ! -s "$SAFE_LIST" ]]; then - echo "ERROR: no files left to bundle." >&2 - exit 3 -fi - -if (( DEFAULT_OUT == 1 )); then - rm -f -- "$ROOT"/SHiNE-bundle-*.zip -else - rm -f -- "$OUT" -fi - -( - cd "$ROOT" - zip -q -9 "$OUT" -@ < "$SAFE_LIST" -) - -echo "Created: $OUT" -echo "Files: $(wc -l < "$SAFE_LIST" | tr -d ' ')" -echo "Size: $(du -h "$OUT" | awk '{print $1}')" diff --git a/breath_button_monitor/manual_monitor_lvgl_v2/download_breath_log.py b/breath_button_monitor/manual_monitor_lvgl_v2/download_breath_log.py new file mode 100644 index 0000000..9ac0928 --- /dev/null +++ b/breath_button_monitor/manual_monitor_lvgl_v2/download_breath_log.py @@ -0,0 +1,28 @@ +#!/usr/bin/env python3 +"""Download append-only events.bin over ESP32 USB serial. pip install pyserial""" +import argparse, serial, time +p=argparse.ArgumentParser() +p.add_argument('port',help='e.g. /dev/ttyACM0') +p.add_argument('-o','--output',default='events.bin') +p.add_argument('--baud',type=int,default=115200) +a=p.parse_args() +with serial.Serial(a.port,a.baud,timeout=10) as dev: + time.sleep(4) + dev.reset_input_buffer() + dev.write(b'LOG DOWNLOAD\n') + header='' + for _ in range(20): + header=dev.readline().decode(errors='replace').strip() + if header.startswith('LOG BEGIN '): break + if header.startswith('LOG ERROR '): raise SystemExit(header) + else: raise SystemExit('Device did not respond: '+repr(header)) + expected=int(header.split()[-1]); result=bytearray() + while True: + line=dev.readline().strip().decode(errors='replace') + if line=='LOG END': break + if not line: raise SystemExit('Timeout during transfer') + try: result.extend(bytes.fromhex(line)) + except ValueError: raise SystemExit('Invalid transfer line: '+repr(line)) + if len(result)!=expected: raise SystemExit(f'Incomplete transfer: {len(result)} of {expected}') + with open(a.output,'wb') as file: file.write(result) + print(f'Saved {len(result)} bytes into {a.output}') diff --git a/breath_button_monitor/manual_monitor_lvgl_v2/manual_monitor_lvgl_v2.ino b/breath_button_monitor/manual_monitor_lvgl_v2/manual_monitor_lvgl_v2.ino index 692c489..aebc674 100644 --- a/breath_button_monitor/manual_monitor_lvgl_v2/manual_monitor_lvgl_v2.ino +++ b/breath_button_monitor/manual_monitor_lvgl_v2/manual_monitor_lvgl_v2.ino @@ -1,6 +1,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -12,7 +17,7 @@ void setup(); void loop(); -// Manual Monitor LVGL V3.2: keep display awake when leaving settings with KEY1. +// Manual Monitor LVGL V2.1: swapped physical buttons, inverted orientation phases, edge-controlled AMOLED. #define PIN_LCD_CS 12 #define PIN_LCD_SCLK 38 #define PIN_LCD_D0 4 @@ -52,7 +57,17 @@ Preferences gPrefs; struct Button { int pin; bool raw = false; bool stable = false; uint32_t changed = 0; uint32_t pressed = 0; }; static Button gInhale{PIN_INHALE}, gExhale{PIN_EXHALE}; -enum class Screen : uint8_t { Home, Monitor, Settings }; +static bool gRotation=false,gImuOk=false,gRotationArmed=false; +static bool gWifiEnabled=false; +static int8_t gOrientation=-1,gOrientationCandidate=-1; +static uint32_t gOrientationChanged=0,gOrientationSample=0; +// QMI8658 screen-axis mapping: change sign if the TOP edge maps to negative Y. +static constexpr int8_t IMU_TOP_EDGE_Y_SIGN = 1; +// 0: face up/down; 1: edge up; 2: screen top edge up; 3: another edge up. +static int8_t gScreenEdgeOrientation=-1,gScreenEdgeCandidate=-1; +static uint32_t gScreenEdgeChanged=0; +static bool gExhaleLongDone=false; +enum class Screen : uint8_t { Home, Monitor, Settings, Wifi, WifiPassword, Time, ManualTime }; static Screen gScreen = Screen::Home; static bool gPowerReady = false, gAudioReady = false, gTouchDown = false; static uint32_t gLastPowerLong = 0; @@ -68,8 +83,141 @@ static lv_disp_draw_buf_t gDrawBuf; static lv_color_t *gBuf1 = nullptr, *gBuf2 = static lv_obj_t *gRoot=nullptr, *gState=nullptr, *gPhaseTime=nullptr, *gCycleValue=nullptr; static lv_obj_t *gAverageValue=nullptr, *gElapsedValue=nullptr, *gLimitValue=nullptr; static lv_obj_t *gHistory[5]={}, *gPausedBanner=nullptr; -static lv_obj_t *gBatteryText=nullptr, *gBatteryFill=nullptr, *gBolt=nullptr; +static lv_obj_t *gBatteryText=nullptr, *gBatteryFill=nullptr, *gBolt=nullptr, *gWifiText=nullptr,*gClockText=nullptr,*gRotationMark=nullptr; +static lv_obj_t *gTimeCurrent=nullptr,*gTimeStatus=nullptr,*gAutoCheck=nullptr,*gTzDropdown=nullptr; +static lv_obj_t *gManualPreview=nullptr; +static int gTzDraft=60, gManualField=0; +static int gManualParts[5]={2026,1,1,12,0}; +static String gManualDigits=""; +static lv_obj_t *gWifiList=nullptr, *gPasswordField=nullptr, *gPasswordKeyboard=nullptr; +static bool gKbSymbols=false,gKbShift=false,gKbPage=false,gKbShowPassword=false; +static String gKbValue=""; +static void wifiPasswordScreen(); +static String gSavedSsid[8], gSavedPass[8], gScannedSsid[20], gSelectedSsid; +static int32_t gScannedRssi[20]; +static uint8_t gScannedCount=0; +static bool gWifiScanActive=false, gWifiConnecting=false, gWifiManual=false; +static void wifiEnable(bool enabled); +static int8_t gAttemptedSaved=-1; +static uint8_t gAttemptMask=0; +static uint32_t gWifiStarted=0, gWifiNextScan=0, gWifiLastStatus=0; +static String gWifiNotice="", gPendingPassword=""; +static void wifiScreen(lv_event_t * = nullptr); +static void wifiPasswordScreen(); +static void wifiTick(); +static void wifiScan(bool manual); +static void wifiConnect(const String &ssid,const String &password,bool manual); +static void wifiLoad(); +static void timeScreen(lv_event_t * = nullptr); +static void manualTimeScreen(); +static void timeUiTick(); +static bool gAutoSync=true,gTimeValid=false,gNtpPending=false,gFileReady=false; +static int16_t gTimezoneMinutes=60; +static uint32_t gNtpStart=0,gLastNtp=0,gEventSeq=0; +static uint64_t gCycleUtcMs=0; +static bool appendEvent(uint8_t type,uint64_t timestamp=UINT64_MAX,uint16_t inh=0,uint16_t exh=0,uint16_t avg=0,uint16_t deficit=0,int16_t val=0); +static uint32_t gInhaleDuration=0; +static bool gInhaleExceeded=false,gExhaleExceeded=false; + +// RTC PCF85063A/T (I2C 0x51). Keep RTC and stored event timestamps in UTC. +static uint8_t bcd(uint8_t v){return (v/10)*16+(v%10);} +static uint8_t unbcd(uint8_t v){return (v>>4)*10+(v&15);} +static bool rtcRead(time_t &epoch){ + Wire.beginTransmission(0x51);Wire.write(0x04); + if(Wire.endTransmission(false)!=0 || Wire.requestFrom((uint8_t)0x51,(uint8_t)7)!=7)return false; + uint8_t d[7];for(int i=0;i<7;i++)d[i]=Wire.read(); + if(d[0]&0x80)return false; // oscillator stopped: unreliable calendar + tm t={};t.tm_sec=unbcd(d[0]&0x7f);t.tm_min=unbcd(d[1]&0x7f);t.tm_hour=unbcd(d[2]&0x3f); + t.tm_mday=unbcd(d[3]&0x3f);t.tm_mon=unbcd(d[5]&0x1f)-1;t.tm_year=unbcd(d[6])+100; + if(t.tm_year<124||t.tm_year>199||t.tm_mon<0||t.tm_mon>11||t.tm_mday<1||t.tm_mday>31||t.tm_hour>23||t.tm_min>59||t.tm_sec>59)return false; + // Convert Gregorian UTC date to Unix seconds without non-portable timegm(). + int y=t.tm_year+1900,m=t.tm_mon+1,day=t.tm_mday; + y -= m<=2; + const int era=(y>=0?y:y-399)/400; + const unsigned yoe=(unsigned)(y-era*400); + const unsigned mp=(unsigned)(m+(m>2?-3:9)); + const unsigned doy=(153*mp+2)/5+(unsigned)day-1; + const unsigned doe=yoe*365+yoe/4-yoe/100+doy; + int64_t days=(int64_t)era*146097+(int64_t)doe-719468; + epoch=(time_t)(days*86400+t.tm_hour*3600+t.tm_min*60+t.tm_sec); + return epoch>1700000000; +} +static bool rtcWrite(time_t epoch){ + tm t={};gmtime_r(&epoch,&t); + if(t.tm_year<100||t.tm_year>199)return false; + Wire.beginTransmission(0x51);Wire.write(0x04); + uint8_t d[7]={bcd(t.tm_sec),bcd(t.tm_min),bcd(t.tm_hour),bcd(t.tm_mday),bcd(t.tm_wday),bcd(t.tm_mon+1),bcd(t.tm_year-100)}; + Wire.write(d,7);return Wire.endTransmission()==0; +} +static uint64_t unixMs(){if(!gTimeValid)return 0;timeval tv={};gettimeofday(&tv,nullptr);return (uint64_t)tv.tv_sec*1000ULL+tv.tv_usec/1000;} +static void initClock(){time_t v;if(rtcRead(v)){timeval tv={};tv.tv_sec=v;settimeofday(&tv,nullptr);gTimeValid=true;}} +static void requestNtp(){if(WiFi.status()!=WL_CONNECTED)return;gNtpPending=true;gNtpStart=millis(); + // configTime starts SNTP asynchronously; system timezone remains UTC. + configTime(0,0,"pool.ntp.org","time.google.com"); +} +static void ntpTick(){ + if(!gNtpPending)return; + if(millis()-gNtpStart>18000){gNtpPending=false;return;} + time_t e=time(nullptr); + if(e>1750000000 && sntp_get_sync_status()==SNTP_SYNC_STATUS_COMPLETED){ + rtcWrite(e);gTimeValid=true;gNtpPending=false;gLastNtp=millis();appendEvent(9); + } +} +// FFat append-only record. Fixed 32 bytes, versioned + CRC32; zero UTC flags untrusted clock. +// All numerical fields little-endian on ESP32. CRC is over first 28 bytes. +// type:1 cycle,2 boot,3 shutdown,4 pause,5 resume,6 limit,7 inhaleLong,8 exhaleLong,9 sync,10 rotation. +struct __attribute__((packed)) EventRecord { + uint8_t version,type,flags,reserved; + uint32_t seq; + uint64_t utcMs; + uint16_t inhale10,exhale10,avg10,shortfall10; + int16_t value; + uint16_t spare; + uint32_t crc; +}; +static_assert(sizeof(EventRecord)==32,"Event size should be 32 bytes"); +static uint32_t crc32(const uint8_t *data,size_t size){uint32_t c=~0u;while(size--){c^=*data++;for(int j=0;j<8;j++)c=(c>>1)^((c&1)?0xedb88320u:0u);}return ~c;} +static bool appendEvent(uint8_t type,uint64_t timestamp,uint16_t inh,uint16_t exh,uint16_t avg,uint16_t deficit,int16_t val){ + if(!gFileReady)return false; + EventRecord e={};e.version=1;e.type=type;e.flags=gTimeValid?1:0;e.seq=++gEventSeq; + e.utcMs=(timestamp==UINT64_MAX)?unixMs():timestamp; + if(e.utcMs==0)e.flags=0; + e.inhale10=inh;e.exhale10=exh;e.avg10=avg;e.shortfall10=deficit;e.value=val; + e.crc=crc32((const uint8_t*)&e,28); + File f=FFat.open("/events.bin","a");if(!f)return false; + bool ok=f.write((const uint8_t*)&e,sizeof(e))==sizeof(e);f.flush();f.close();return ok; +} +static void initEvents(){ + gFileReady=FFat.begin(false); + if(!gFileReady){ + Serial.println("FFat mount failed; formatting filesystem"); + gFileReady=FFat.begin(true); + } + if(!gFileReady){Serial.println("FFat unavailable; recording disabled");return;} + File f=FFat.open("/events.bin","r");if(f){EventRecord e;while(f.available()>=(int)sizeof(e)){ + if(f.read((uint8_t*)&e,sizeof(e))!=sizeof(e))break; + if(e.version==1 && e.crc==crc32((const uint8_t*)&e,28))gEventSeq=max(gEventSeq,e.seq); + }f.close();} +} +// QMI8658: I2C 0x6A/0x6B; accelerometer +/-2g, 125Hz ODR (register defaults tested by WHO_AM_I). +static uint8_t gImuAddr=0; +static bool imuRead(uint8_t reg,uint8_t *data,uint8_t count){ + Wire.beginTransmission(gImuAddr);Wire.write(reg); + if(Wire.endTransmission(false)!=0||Wire.requestFrom(gImuAddr,count)!=count)return false; + for(int i=0;ix2-a->x1+1, h = a->y2-a->y1+1; @@ -107,8 +255,8 @@ static lv_obj_t *label(lv_obj_t *p,const char *s,const lv_font_t *f,uint32_t c) static lv_obj_t *panel(int x,int y,int w,int h,uint32_t bg=0x142331) { lv_obj_t *o=lv_obj_create(gRoot); lv_obj_set_pos(o,x,y); lv_obj_set_size(o,w,h); card(o,bg); return o; } static void fmt(char *out,size_t n,uint32_t ms) { snprintf(out,n,"%lu.%01lu s",(unsigned long)(ms/1000),(unsigned long)((ms%1000)/100)); } static uint32_t average() { uint64_t total=0; for(uint8_t i=0;i(4,gPrefs.getUChar("limit",2)); gTick=min(10,gPrefs.getUChar("tick",3)); gAlert=min(10,gPrefs.getUChar("alert",10)); gScreenTimeout=min(3,gPrefs.getUChar("screen",1)); } -static void saveSettings() { gPrefs.putUChar("limit",gLimit); gPrefs.putUChar("tick",gTick); gPrefs.putUChar("alert",gAlert); gPrefs.putUChar("screen",gScreenTimeout); } +static void loadSettings() { gPrefs.begin("manual-lvgl",false); gLimit=min(4,gPrefs.getUChar("limit",2)); gTick=min(10,gPrefs.getUChar("tick",3)); gAlert=min(10,gPrefs.getUChar("alert",10)); gScreenTimeout=min(3,gPrefs.getUChar("screen",1));gRotation=gPrefs.getBool("rotation",false);gAutoSync=gPrefs.getBool("autosync",true);gTimezoneMinutes=gPrefs.getShort("timezone",60);gWifiEnabled=gPrefs.getBool("wifi_on",false); } +static void saveSettings() { gPrefs.putUChar("limit",gLimit); gPrefs.putUChar("tick",gTick); gPrefs.putUChar("alert",gAlert); gPrefs.putUChar("screen",gScreenTimeout);gPrefs.putBool("rotation",gRotation);gPrefs.putBool("autosync",gAutoSync);gPrefs.putShort("timezone",gTimezoneMinutes);gPrefs.putBool("wifi_on",gWifiEnabled); } static void initPower() { gPowerReady=gPower.begin(Wire,AXP2101_SLAVE_ADDRESS,PIN_I2C_SDA,PIN_I2C_SCL); if(!gPowerReady)return; gPower.disableIRQ(XPOWERS_AXP2101_ALL_IRQ); gPower.setChargeTargetVoltage(3); gPower.setPowerKeyPressOffTime(XPOWERS_POWEROFF_10S); // AXP2101 IRQ hold threshold: 0=1s, 1=1.5s, 2=2s, 3=2.5s (reg 0x27, bits 5:4). Wire.beginTransmission(AXP2101_SLAVE_ADDRESS); Wire.write(0x27); @@ -122,12 +270,34 @@ static void initAudio() { pinMode(PIN_PA,OUTPUT); digitalWrite(PIN_PA,HIGH); gI2 static void beep(uint16_t hz,uint16_t count,int16_t amp) { if(!gAudioReady||amp<=0)return; static int16_t buf[1600*2]; count=min(count,1600); for(uint16_t i=0;i0?max(2,min(26,p*26/100)):0); if(gBolt)lv_obj_set_style_opa(gBolt,(gPowerReady&&gPower.isCharging())?LV_OPA_COVER:LV_OPA_TRANSP,0); } -static void topBar(const char *title) { label(gRoot,title,&lv_font_montserrat_24,0xFFFFFF); lv_obj_align(lv_obj_get_child(gRoot,0),LV_ALIGN_TOP_LEFT,26,49); gBatteryText=label(gRoot,"--",&lv_font_montserrat_16,0xC9D3DE); lv_obj_set_pos(gBatteryText,297,51); if(gPowerReady){static const lv_point_t bolt[]={{6,0},{1,9},{5,9},{2,18},{10,7},{6,7}};gBolt=lv_line_create(gRoot);lv_line_set_points(gBolt,bolt,6);lv_obj_set_pos(gBolt,337,46);lv_obj_set_style_line_width(gBolt,2,0);lv_obj_set_style_line_color(gBolt,color(0xFFD34D),0);lv_obj_set_style_line_rounded(gBolt,true,0);} lv_obj_t *b=lv_obj_create(gRoot);lv_obj_set_pos(b,349,53);lv_obj_set_size(b,32,16);lv_obj_set_style_bg_opa(b,LV_OPA_TRANSP,0);lv_obj_set_style_border_color(b,color(0xC9D3DE),0);lv_obj_set_style_border_width(b,2,0);lv_obj_set_style_radius(b,4,0);lv_obj_clear_flag(b,LV_OBJ_FLAG_SCROLLABLE); lv_obj_t *cap=lv_obj_create(gRoot);lv_obj_set_pos(cap,381,57);lv_obj_set_size(cap,4,8);lv_obj_set_style_bg_color(cap,color(0xC9D3DE),0);lv_obj_set_style_border_width(cap,0,0);lv_obj_set_style_radius(cap,2,0); gBatteryFill=lv_obj_create(gRoot);lv_obj_set_pos(gBatteryFill,352,56);lv_obj_set_size(gBatteryFill,2,10);lv_obj_set_style_bg_color(gBatteryFill,color(0x38B26D),0);lv_obj_set_style_border_width(gBatteryFill,0,0);lv_obj_set_style_radius(gBatteryFill,2,0); batteryUi(); } -static void clearUi() { lv_obj_clean(lv_scr_act()); gRoot=lv_scr_act(); lv_obj_set_style_bg_color(gRoot,color(0x08111B),0);lv_obj_set_style_bg_opa(gRoot,LV_OPA_COVER,0);lv_obj_set_style_pad_all(gRoot,0,0); gBatteryText=gBatteryFill=gBolt=nullptr; } +static void topBar(const char *title) { + // On the monitor: Wi-Fi on the left, battery on the right. Other pages: page title. + if(gScreen==Screen::Monitor){ + gRotationMark=label(gRoot,"",&lv_font_montserrat_16,0x38B26D);lv_obj_set_pos(gRotationMark,14,51); + gWifiText=label(gRoot,"Wi-Fi: --",&lv_font_montserrat_16,0x9EB4C2); + lv_obj_set_pos(gWifiText,39,51); + lv_obj_set_width(gWifiText,188); + gClockText=label(gRoot,"--:--",&lv_font_montserrat_16,0xFFFFFF);lv_obj_set_pos(gClockText,234,51); + lv_label_set_long_mode(gWifiText,LV_LABEL_LONG_DOT); + }else{ + lv_obj_t *heading=label(gRoot,title,&lv_font_montserrat_20,0xFFFFFF); + lv_obj_set_pos(heading,24,48); + } + gBatteryText=label(gRoot,"--",&lv_font_montserrat_16,0xC9D3DE);lv_obj_set_pos(gBatteryText,297,51); + if(gPowerReady){static const lv_point_t bolt[]={{6,0},{1,9},{5,9},{2,18},{10,7},{6,7}};gBolt=lv_line_create(gRoot);lv_line_set_points(gBolt,bolt,6);lv_obj_set_pos(gBolt,337,46);lv_obj_set_style_line_width(gBolt,2,0);lv_obj_set_style_line_color(gBolt,color(0xFFD34D),0);lv_obj_set_style_line_rounded(gBolt,true,0);} + lv_obj_t *b=lv_obj_create(gRoot);lv_obj_set_pos(b,349,53);lv_obj_set_size(b,32,16);lv_obj_set_style_bg_opa(b,LV_OPA_TRANSP,0);lv_obj_set_style_border_color(b,color(0xC9D3DE),0);lv_obj_set_style_border_width(b,2,0);lv_obj_set_style_radius(b,4,0);lv_obj_clear_flag(b,LV_OBJ_FLAG_SCROLLABLE); + lv_obj_t *cap=lv_obj_create(gRoot);lv_obj_set_pos(cap,381,57);lv_obj_set_size(cap,4,8);lv_obj_set_style_bg_color(cap,color(0xC9D3DE),0);lv_obj_set_style_border_width(cap,0,0);lv_obj_set_style_radius(cap,2,0); + gBatteryFill=lv_obj_create(gRoot);lv_obj_set_pos(gBatteryFill,352,56);lv_obj_set_size(gBatteryFill,2,10);lv_obj_set_style_bg_color(gBatteryFill,color(0x38B26D),0);lv_obj_set_style_border_width(gBatteryFill,0,0);lv_obj_set_style_radius(gBatteryFill,2,0);batteryUi(); +} +static void clearUi() { lv_obj_clean(lv_scr_act()); gRoot=lv_scr_act(); lv_obj_set_style_bg_color(gRoot,color(0x08111B),0);lv_obj_set_style_bg_opa(gRoot,LV_OPA_COVER,0);lv_obj_set_style_pad_all(gRoot,0,0); gBatteryText=gBatteryFill=gBolt=gWifiText=gWifiList=gPasswordField=gPasswordKeyboard=nullptr;gClockText=gRotationMark=gTimeCurrent=gTimeStatus=gAutoCheck=gTzDropdown=gManualPreview=nullptr; } static void legend() { - lv_obj_t *l=label(gRoot,"INHALE",&lv_font_montserrat_14,0x38B26D);lv_obj_set_pos(l,24,12); + lv_obj_t *l=label(gRoot,"INHALE",&lv_font_montserrat_14,0x38B26D);lv_obj_set_pos(l,90,12); l=label(gRoot,"SETTINGS",&lv_font_montserrat_14,0xC9D3DE);lv_obj_align(l,LV_ALIGN_TOP_MID,0,12); - l=label(gRoot,"EXHALE",&lv_font_montserrat_14,0x4FB3FF);lv_obj_align(l,LV_ALIGN_TOP_RIGHT,-24,12); + l=label(gRoot,"EXHALE",&lv_font_montserrat_14,0x4FB3FF);lv_obj_set_pos(l,338,12); + static const lv_point_t rule[]={{0,0},{432,0}}; + lv_obj_t *line=lv_line_create(gRoot);lv_line_set_points(line,rule,2); + lv_obj_set_pos(line,24,37);lv_obj_set_style_line_width(line,1,0); + lv_obj_set_style_line_color(line,color(0x365264),0); } static lv_obj_t *metric(int x,int y,const char *caption,uint32_t valueColor) { lv_obj_t *p=panel(x,y,204,100);lv_obj_t *l=label(p,caption,&lv_font_montserrat_14,0x9EB4C2); @@ -136,7 +306,7 @@ static lv_obj_t *metric(int x,int y,const char *caption,uint32_t valueColor) { return l; } static void enterMonitor(lv_event_t *) { - gScreen=Screen::Monitor;gLastActivity=millis();clearUi();legend();topBar("MANUAL MONITOR"); + gScreen=Screen::Monitor;gLastActivity=millis();clearUi();legend();topBar(""); lv_obj_t *hero=panel(24,92,432,73,0x102A36); gState=label(hero,"WAITING",&lv_font_montserrat_28,0x4FB3FF); gPhaseTime=label(hero,"",&lv_font_montserrat_28,0xFFFFFF); @@ -150,15 +320,22 @@ static void enterMonitor(lv_event_t *) { lv_obj_set_pos(gHistory[i],78+i*68,3);} } static void home(lv_event_t *); static void settings(lv_event_t *); -static lv_obj_t *button(lv_obj_t *p,const char *text,int x,int y,int w,int h,uint32_t bg,lv_event_cb_t cb) { lv_obj_t *b=lv_btn_create(p);lv_obj_set_pos(b,x,y);lv_obj_set_size(b,w,h);card(b,bg);lv_obj_add_event_cb(b,cb,LV_EVENT_CLICKED,nullptr);lv_obj_t *l=label(b,text,&lv_font_montserrat_20,0xFFFFFF);lv_obj_center(l);return b; } +static lv_obj_t *button(lv_obj_t *p,const char *text,int x,int y,int w,int h,uint32_t bg,lv_event_cb_t cb,void *userData=nullptr) { lv_obj_t *b=lv_btn_create(p);lv_obj_set_pos(b,x,y);lv_obj_set_size(b,w,h);card(b,bg);lv_obj_add_event_cb(b,cb,LV_EVENT_CLICKED,userData);lv_obj_t *l=label(b,text,&lv_font_montserrat_20,0xFFFFFF);lv_obj_center(l);return b; } static void home(lv_event_t *) {enterMonitor(nullptr);} -static void settingChanged(lv_event_t *e){uint8_t *v=(uint8_t *)lv_event_get_user_data(e);*v=lv_slider_get_value(lv_event_get_target(e));saveSettings();} +static void settingChanged(lv_event_t *e){ + uint8_t *v=(uint8_t *)lv_event_get_user_data(e); + uint8_t old=*v;*v=lv_slider_get_value(lv_event_get_target(e)); + if(old!=*v)saveSettings(); +} +static void settingReleased(lv_event_t *e){ + if(lv_event_get_user_data(e)==&gLimit)appendEvent(6,UINT64_MAX,0,0,0,0,LIMITS[gLimit]*10); +} static void refresh(); static void settings(lv_event_t *) { gScreen=Screen::Settings;clearUi();legend();topBar("SETTINGS"); if(gPaused){gPausedBanner=label(gRoot,"PAUSED",&lv_font_montserrat_20,0xFFD34D); lv_obj_align(gPausedBanner,LV_ALIGN_TOP_MID,0,32);} - lv_obj_t *list=lv_obj_create(gRoot);lv_obj_set_pos(list,20,91);lv_obj_set_size(list,440,334); + lv_obj_t *list=lv_obj_create(gRoot);lv_obj_set_pos(list,20,91);lv_obj_set_size(list,440,280); card(list,0x10202D);lv_obj_set_style_pad_all(list,10,0);lv_obj_set_flex_flow(list,LV_FLEX_FLOW_COLUMN); lv_obj_set_style_pad_row(list,9,0); struct Item{const char *name;uint8_t *v;uint8_t max;}; @@ -168,9 +345,15 @@ static void settings(lv_event_t *) { lv_obj_t *sl=lv_slider_create(row);lv_obj_set_pos(sl,12,36);lv_obj_set_size(sl,376,16); lv_slider_set_range(sl,0,it.max);lv_slider_set_value(sl,*it.v,LV_ANIM_OFF); lv_obj_add_event_cb(sl,settingChanged,LV_EVENT_VALUE_CHANGED,it.v); + if(it.v==&gLimit)lv_obj_add_event_cb(sl,settingReleased,LV_EVENT_RELEASED,it.v); } - button(gRoot,"BACK",150,435,180,36,0x214D69,[](lv_event_t *){ - if(gPaused){gPaused=false;gBreath=BreathState::Waiting;}enterMonitor(nullptr); + button(gRoot,"Wi-Fi",24,383,132,42,0x214D69,[](lv_event_t *){wifiScreen(nullptr);}); + button(gRoot,"TIME",173,383,132,42,0x214D69,[](lv_event_t *){timeScreen(nullptr);}); + lv_obj_t *rot=lv_checkbox_create(gRoot);lv_checkbox_set_text(rot,"ROTATION CONTROL");lv_obj_set_pos(rot,32,437); + if(gRotation)lv_obj_add_state(rot,LV_STATE_CHECKED); + lv_obj_add_event_cb(rot,[](lv_event_t *e){gRotation=lv_obj_has_state(lv_event_get_target(e),LV_STATE_CHECKED);gRotationArmed=false;gOrientation=-1;gScreenEdgeOrientation=-1;gScreenEdgeCandidate=-1;saveSettings();appendEvent(10,UINT64_MAX,0,0,0,0,gRotation);},LV_EVENT_VALUE_CHANGED,nullptr); + button(gRoot,"BACK",322,383,132,42,0x214D69,[](lv_event_t *){ + if(gPaused){gPaused=false;gBreath=BreathState::Waiting;gRotationArmed=false;gOrientation=-1;gScreenEdgeOrientation=-1;gScreenEdgeCandidate=-1;appendEvent(5);}enterMonitor(nullptr); }); } // PMU power key can blank the AMOLED independently of our timeout flag. @@ -183,12 +366,13 @@ static void wakeDisplayFromKey1() { } static void keyShort(){ wakeDisplayFromKey1(); - if(gScreen==Screen::Settings){if(gPaused){gPaused=false;gBreath=BreathState::Waiting;}enterMonitor(nullptr);} + if(gScreen==Screen::WifiPassword||gScreen==Screen::Wifi||gScreen==Screen::Time||gScreen==Screen::ManualTime){settings(nullptr);} + else if(gScreen==Screen::Settings){if(gPaused){gPaused=false;gBreath=BreathState::Waiting;gRotationArmed=false;gOrientation=-1;gScreenEdgeOrientation=-1;gScreenEdgeCandidate=-1;appendEvent(5);}enterMonitor(nullptr);} else settings(nullptr); } static void keyLong(){ wakeDisplayFromKey1(); - if(!gPaused){gPaused=true;gBreath=BreathState::Waiting;gCycleStarted=0;gPhaseStarted=0;} + if(!gPaused){gPaused=true;gBreath=BreathState::Waiting;gCycleStarted=0;gPhaseStarted=0;gRotationArmed=false;gOrientation=-1;gScreenEdgeOrientation=-1;gScreenEdgeCandidate=-1;appendEvent(4);} settings(nullptr); } // Key1 is PMU PWRON (AXP2101), not a GPIO. Handle short/long PMU IRQs. @@ -201,11 +385,16 @@ static void pollPowerKey(){ if(longPress){gLastPowerLong=millis();keyLong();} else if(millis()-gLastPowerLong>750)keyShort();} } -static void addCycle(uint32_t ms){ +static void addCycle(uint32_t ms,uint32_t inhaleMs){ if(!ms)return; gCompletedMs+=ms;gCycles[gCycleNext]=ms;gCycleNext=(gCycleNext+1)%5; if(gCycleCount<5)gCycleCount++; - uint32_t a=average();if(a && a(65535,(inhaleMs+50)/100),exh10=min(65535,(ms-inhaleMs+50)/100); + uint16_t avg10=min(65535,(a+50)/100); + uint16_t missing=min(65535,ms(5,gShortStreak+1); for(uint8_t i=0;i=2000){ + gExhaleLongDone=true;gRotation=true;gRotationArmed=false;gOrientation=-1;gScreenEdgeOrientation=-1;gScreenEdgeCandidate=-1;saveSettings();appendEvent(10,UINT64_MAX,0,0,0,0,gRotation); + }return;} + b.stable=b.raw;if(b.stable){b.pressed=now;if(!inhale)gExhaleLongDone=false;gLastActivity=now; + if(gRotation){gRotation=false;gRotationArmed=false;gOrientation=-1;gScreenEdgeOrientation=-1;gScreenEdgeCandidate=-1;gOrientationCandidate=-1;saveSettings();appendEvent(10,UINT64_MAX,0,0,0,0,0);} if(!gScreenOn){gScreenOn=true;gfx->setBrightness(220);} phase(inhale); } @@ -235,6 +428,13 @@ static void poll(Button &b,bool inhale){ static void refresh(){ if(gScreen!=Screen::Monitor)return; uint32_t now=millis();char t[24]; + if(gRotationMark)lv_label_set_text(gRotationMark,gRotation?"✓":""); + if(gClockText){time_t e=time(nullptr);char clockbuf[12]="--:--";if(gTimeValid&&e>1700000000){e+=(int32_t)gTimezoneMinutes*60;tm tmv={};gmtime_r(&e,&tmv);snprintf(clockbuf,sizeof(clockbuf),"%02d:%02d",tmv.tm_hour,tmv.tm_min);}lv_label_set_text(gClockText,clockbuf);} + if(gWifiText){ + String wi = !gWifiEnabled?String("Wi-Fi: off"):(WiFi.status()==WL_CONNECTED ? String("Wi-Fi: ")+WiFi.SSID() : (gWifiConnecting?"Wi-Fi: connecting":"Wi-Fi: none")); + lv_label_set_text(gWifiText,wi.c_str()); + lv_obj_set_style_text_color(gWifiText,color(WiFi.status()==WL_CONNECTED?0x38B26D:0x9EB4C2),0); + } const char *state=gBreath==BreathState::Waiting?"WAITING":gBreath==BreathState::Inhale?"INHALE":"EXHALE"; lv_label_set_text(gState,state); lv_obj_set_style_text_color(gState,color(gBreath==BreathState::Inhale?0x38B26D:0x4FB3FF),0); @@ -275,10 +475,392 @@ static void refresh(){ static void reminders(){ if(gPaused||gBreath==BreathState::Waiting||gScreen!=Screen::Monitor)return; uint32_t now=millis(),age=now-gPhaseStarted; + if(age>=LOUD_START_MS){ + if(gBreath==BreathState::Inhale&&!gInhaleExceeded){gInhaleExceeded=true;appendEvent(7);} + if(gBreath==BreathState::Exhale&&!gExhaleExceeded){gExhaleExceeded=true;appendEvent(8);} + } if(agesetBrightness(0);if(gPowerReady)gPower.shutdown();esp_deep_sleep_start();} + else{appendEvent(3);gfx->setBrightness(0);if(gPowerReady)gPower.shutdown();esp_deep_sleep_start();} } -void setup(){Serial.begin(115200);Wire.begin(PIN_I2C_SDA,PIN_I2C_SCL);initPower();pinMode(PIN_INHALE,INPUT_PULLUP);pinMode(PIN_EXHALE,INPUT_PULLUP);initAudio();gfx->begin();gBus->writeC8D8(0x36,0xA0);gfx->setBrightness(220);gTouch.setPins(PIN_TP_INT,-1);gTouch.begin(Wire,0x5A,PIN_I2C_SDA,PIN_I2C_SCL);gTouch.setMaxCoordinates(DISP_W,DISP_H);gTouch.setSwapXY(true);gTouch.setMirrorXY(true,false);loadSettings();lv_init();gBuf1=(lv_color_t *)heap_caps_malloc(DISP_W*40*sizeof(lv_color_t),MALLOC_CAP_DMA);gBuf2=(lv_color_t *)heap_caps_malloc(DISP_W*40*sizeof(lv_color_t),MALLOC_CAP_DMA);lv_disp_draw_buf_init(&gDrawBuf,gBuf1,gBuf2,DISP_W*40);static lv_disp_drv_t dd;lv_disp_drv_init(&dd);dd.hor_res=DISP_W;dd.ver_res=DISP_H;dd.flush_cb=flush;dd.rounder_cb=rounder;dd.draw_buf=&gDrawBuf;lv_disp_drv_register(&dd);static lv_indev_drv_t id;lv_indev_drv_init(&id);id.type=LV_INDEV_TYPE_POINTER;id.read_cb=touchRead;lv_indev_drv_register(&id);const esp_timer_create_args_t ta={.callback=&tick,.name="lvgl_tick"};esp_timer_handle_t timer;esp_timer_create(&ta,&timer);esp_timer_start_periodic(timer,LVGL_TICK_MS*1000);gLastActivity=millis();enterMonitor(nullptr);} -void loop(){uint32_t now=millis();poll(gInhale,true);poll(gExhale,false);pollPowerKey();reminders();if(now-gLastUi>=UI_MS){gLastUi=now;refresh();}if(now-gLastBatt>=BATT_MS){gLastBatt=now;batteryUi();}uint32_t timeout=SCREEN_TIMEOUTS[gScreenTimeout];if(gScreenOn&&gScreen!=Screen::Settings&&(int32_t)(now-gKey1WakeUntil)>=0&&timeout&&now-gLastActivity>=timeout){gScreenOn=false;gfx->setBrightness(0);}lv_timer_handler();if((int32_t)(millis()-gKey1WakeUntil)<0){gScreenOn=true;gfx->setBrightness(220);}delay(5);} + +// Wi-Fi credentials use the same key layout as shine_homeserver_main.ino, +// but an isolated Preferences namespace to avoid modifying the other application. +static Preferences gWifiPrefs; +static void wifiLoad(){ + gWifiPrefs.begin("manual-wifi",false); + for(int i=0;i<8;i++){ + String k=String("wifi_ssid_")+i, p=String("wifi_pass_")+i; + gSavedSsid[i]=gWifiPrefs.getString(k.c_str(),""); + gSavedPass[i]=gWifiPrefs.getString(p.c_str(),""); + } + gWifiEnabled = gWifiPrefs.getBool("enabled",false); + WiFi.mode(gWifiEnabled?WIFI_STA:WIFI_OFF); + WiFi.setAutoReconnect(false); // All known networks are selected by our own state machine. + WiFi.persistent(false); +} +static void wifiEnable(bool enabled){ + gWifiEnabled=enabled;gWifiPrefs.putBool("enabled",enabled);gPrefs.putBool("wifi_on",enabled); + gWifiScanActive=false;gWifiConnecting=false;gWifiManual=false; + if(!enabled){WiFi.scanDelete();WiFi.disconnect(true,false);WiFi.mode(WIFI_OFF);gWifiNotice="Wi-Fi disabled";} + else{WiFi.mode(WIFI_STA);WiFi.setAutoReconnect(false);gAttemptMask=0;gWifiNextScan=millis()+250;gWifiNotice="Wi-Fi enabled";} +} +static int wifiKnown(const String &ssid){for(int i=0;i<8;i++)if(gSavedSsid[i]==ssid)return i;return -1;} +static void wifiRemember(const String &ssid,const String &pass){ + int i=wifiKnown(ssid); + if(i<0){for(i=0;i<8 && gSavedSsid[i].length();i++);if(i>=8){ + for(int j=0;j<7;j++){gSavedSsid[j]=gSavedSsid[j+1];gSavedPass[j]=gSavedPass[j+1];}i=7; + }} + gSavedSsid[i]=ssid;gSavedPass[i]=pass; + String k=String("wifi_ssid_")+i,p=String("wifi_pass_")+i; + gWifiPrefs.putString(k.c_str(),ssid);gWifiPrefs.putString(p.c_str(),pass); +} +static void wifiConnect(const String &ssid,const String &password,bool manual){ + if(!gWifiEnabled)return; + if(ssid.isEmpty())return; + gWifiManual=manual;gWifiConnecting=true;gWifiStarted=millis(); + gWifiNotice=String("Connecting: ")+ssid; + WiFi.mode(WIFI_STA); + WiFi.begin(ssid.c_str(),password.c_str()); // asynchronous: WiFi.status() polled in loop() +} +static void wifiScan(bool manual){ + if(!gWifiEnabled)return; + if(gWifiScanActive||gWifiConnecting)return; + gWifiManual=manual;gWifiNotice="Scanning..."; + gScannedCount=0; + int result=WiFi.scanNetworks(true,false); // asynchronous scanning + gWifiScanActive=(result==WIFI_SCAN_RUNNING || result==-1); + if(!gWifiScanActive)gWifiNextScan=millis()+15000; +} +static void wifiTryAvailable(){ + int best=-1, bestRssi=-9999; + for(int j=0;jbestRssi){bestRssi=gScannedRssi[j];best=index;} + } + if(best>=0){gAttemptedSaved=best;gAttemptMask|=(1u<12000){ + gWifiConnecting=false;WiFi.disconnect(false,false);gWifiNotice="Connection failed"; + if(!gWifiManual)wifiTryAvailable(); + if(gScreen==Screen::Wifi||gScreen==Screen::WifiPassword)wifiScreen(nullptr); + } + return; + } + if(gWifiScanActive){ + int result=WiFi.scanComplete(); + if(result==WIFI_SCAN_RUNNING || result==-1)return; + gWifiScanActive=false; + if(result>0){ + for(int i=0;i=0){gAttemptMask=0;wifiScan(false);} +} +static void wifiSelect(lv_event_t *e){ + uint32_t i=(uintptr_t)lv_event_get_user_data(e);if(i>=gScannedCount)return; + gSelectedSsid=gScannedSsid[i];int old=wifiKnown(gSelectedSsid); + if(old>=0){gPendingPassword=gSavedPass[old];wifiConnect(gSelectedSsid,gSavedPass[old],true);wifiScreen(nullptr);} + else {gKbValue="";gKbPage=false;gKbSymbols=false;gKbShift=false;gKbShowPassword=false;wifiPasswordScreen();} +} +static void wifiStartScan(lv_event_t *){ + if(gWifiConnecting||gWifiScanActive)return; + wifiScan(true);wifiScreen(nullptr); +} +static void wifiForget(lv_event_t *){ + for(int i=0;i<8;i++){ + gSavedSsid[i]="";gSavedPass[i]=""; + String a=String("wifi_ssid_")+i,b=String("wifi_pass_")+i; + gWifiPrefs.remove(a.c_str());gWifiPrefs.remove(b.c_str()); + } + WiFi.disconnect(false,false);gWifiConnecting=false;gWifiNextScan=millis()+1500; + gWifiNotice="Saved networks cleared";wifiScreen(nullptr); +} +static void wifiScreen(lv_event_t *){ + gScreen=Screen::Wifi;clearUi();legend();topBar("Wi-Fi"); + String connected=WiFi.status()==WL_CONNECTED?String("Connected: ")+WiFi.SSID(): + (gWifiConnecting?gWifiNotice:String("Not connected")); + lv_obj_t *status=label(gRoot,connected.c_str(),&lv_font_montserrat_16,0xC9D3DE); + lv_obj_set_pos(status,24,88);lv_obj_set_width(status,432);lv_label_set_long_mode(status,LV_LABEL_LONG_DOT); + lv_obj_t *check=lv_checkbox_create(gRoot);lv_checkbox_set_text(check,"Wi-Fi enabled");lv_obj_set_pos(check,24,120); + if(gWifiEnabled)lv_obj_add_state(check,LV_STATE_CHECKED); + lv_obj_add_event_cb(check,[](lv_event_t *e){wifiEnable(lv_obj_has_state(lv_event_get_target(e),LV_STATE_CHECKED));wifiScreen(nullptr);},LV_EVENT_VALUE_CHANGED,nullptr); + button(gRoot,"SCAN",24,167,200,43,0x214D69,wifiStartScan); + button(gRoot,"FORGET ALL",238,167,218,43,0x553442,wifiForget); + gWifiList=lv_obj_create(gRoot);lv_obj_set_pos(gWifiList,24,222);lv_obj_set_size(gWifiList,432,191);card(gWifiList); + lv_obj_set_style_pad_all(gWifiList,8,0); + lv_obj_set_flex_flow(gWifiList,LV_FLEX_FLOW_COLUMN); + lv_obj_set_style_pad_row(gWifiList,7,0); + lv_obj_add_flag(gWifiList,LV_OBJ_FLAG_SCROLLABLE); + if(!gScannedCount){label(gWifiList,!gWifiEnabled?"Enable Wi-Fi first":(gWifiScanActive?"Scanning networks...":"Tap SCAN to find networks"),&lv_font_montserrat_16,0xC9D3DE);} + for(int i=0;i=0)n+=" [saved]"; + lv_obj_t *item=lv_btn_create(gWifiList);lv_obj_set_size(item,390,43);card(item,0x203E50); + lv_obj_add_event_cb(item,wifiSelect,LV_EVENT_CLICKED,(void *)(uintptr_t)i); + lv_obj_t *name=label(item,n.c_str(),&lv_font_montserrat_16,0xFFFFFF); + lv_obj_set_width(name,365);lv_label_set_long_mode(name,LV_LABEL_LONG_DOT);lv_obj_center(name); + } + button(gRoot,"BACK",140,431,200,39,0x214D69,[](lv_event_t *){settings(nullptr);}); + batteryUi(); +} +static void wifiPasswordEvent(lv_event_t *e){ + lv_event_code_t code=lv_event_get_code(e); + if(code==LV_EVENT_CANCEL){wifiScreen(nullptr);return;} + if(code!=LV_EVENT_READY)return; + String password=lv_textarea_get_text(gPasswordField); + // Copy before cleaning the screen (LVGL destroys the textarea). + String ssid=gSelectedSsid; + wifiConnect(ssid,password,true); + // Password only becomes persistent after a successful connection. + // Retain temporarily in RAM during connection. + gPendingPassword=password; + gWifiNotice="Connecting..."; + wifiScreen(nullptr); +} +// Compact SHiNE keyboard: alpha/symbol pages, shift, delete, show password, save/cancel. +// Password stays in RAM until Wi-Fi confirms a successful connection. +static void kbRefreshField(){ + if(!gPasswordField)return; + lv_textarea_set_text(gPasswordField,gKbValue.c_str()); + lv_textarea_set_cursor_pos(gPasswordField,LV_TEXTAREA_CURSOR_LAST); +} +static void kbClicked(lv_event_t *e){ + const char *key=(const char*)lv_event_get_user_data(e); + if(!key)return; + if(!strcmp(key,"")){ + String ssid=gSelectedSsid, pass=gKbValue; + wifiConnect(ssid,pass,true); + gPendingPassword=pass; + gWifiNotice="Connecting..."; + wifiScreen(nullptr);return; + } + if(!strcmp(key,"")){wifiScreen(nullptr);return;} + if(!strcmp(key,"")){gKbSymbols=!gKbSymbols;gKbPage=false;wifiPasswordScreen();return;} + if(!strcmp(key,"")){gKbPage=!gKbPage;wifiPasswordScreen();return;} + if(!strcmp(key,"")){gKbShift=!gKbShift;wifiPasswordScreen();return;} + if(!strcmp(key,"")){gKbShowPassword=!gKbShowPassword;lv_textarea_set_password_mode(gPasswordField,!gKbShowPassword);return;} + if(!strcmp(key,"")){if(gKbValue.length())gKbValue.remove(gKbValue.length()-1);kbRefreshField();return;} + if(!strcmp(key,"")){gKbValue="";kbRefreshField();return;} + if(gKbValue.length()>=63)return; + String ch=(!strcmp(key,""))?" ":String(key); + if(!gKbSymbols&&gKbShift)ch.toUpperCase(); + gKbValue+=ch;kbRefreshField(); +} +static void kbButton(const char *title,const char *token,int x,int y,int w,int h,uint32_t bg,uint8_t fontsize=16){ + lv_obj_t *b=lv_btn_create(gRoot);lv_obj_set_pos(b,x,y);lv_obj_set_size(b,w,h); + lv_obj_set_style_radius(b,7,0);lv_obj_set_style_bg_color(b,color(bg),0); + lv_obj_set_style_pad_all(b,0,0); + lv_obj_add_event_cb(b,kbClicked,LV_EVENT_CLICKED,(void*)token); + const lv_font_t *font=fontsize==14?&lv_font_montserrat_14:&lv_font_montserrat_16; + lv_obj_t *txt=label(b,title,font,0xFFFFFF);lv_obj_center(txt); +} +static void wifiPasswordScreen(){ + gScreen=Screen::WifiPassword;clearUi();legend();topBar("Wi-Fi password"); + lv_obj_t *name=label(gRoot,gSelectedSsid.c_str(),&lv_font_montserrat_20,0xFFFFFF); + lv_obj_set_pos(name,18,73);lv_obj_set_width(name,444);lv_label_set_long_mode(name,LV_LABEL_LONG_DOT); + gPasswordField=lv_textarea_create(gRoot); + lv_obj_set_pos(gPasswordField,18,109);lv_obj_set_size(gPasswordField,444,51); + lv_textarea_set_one_line(gPasswordField,true); + lv_textarea_set_password_mode(gPasswordField,!gKbShowPassword); + lv_textarea_set_max_length(gPasswordField,63); + lv_obj_set_style_text_font(gPasswordField,&lv_font_montserrat_20,0); + kbRefreshField(); + // Same split-page layout as shine_homeserver_main.ino, rescaled for 480x480. + static const char *alphaA[3][5]={{"q","w","e","r","t"},{"a","s","d","f","g"},{"z","x","c","v","b"}}; + static const char *alphaB[3][5]={{"y","u","i","o","p"},{"h","j","k","l","."},{"n","m","-","_","@"}}; + static const char *symA[3][5]={{"1","2","3","4","5"},{"/",":","_","@","."},{"!","?","#","+","="}}; + static const char *symB[3][5]={{"6","7","8","9","0"},{"$","%","&","*","-"},{"(",")","[","]","~"}}; + const char *(*rows)[5]=gKbSymbols?(gKbPage?symB:symA):(gKbPage?alphaB:alphaA); + for(int row=0;row<3;row++)for(int col=0;col<5;col++){ + const char *token=rows[row][col];String cap=token; + if(!gKbSymbols&&gKbShift)cap.toUpperCase(); + kbButton(cap.c_str(),token,18+col*91,169+row*58,84,51,0x2A6F97); + } + kbButton(gKbSymbols?"ABC":"123","",18,347,79,47,0x5C6F82); + kbButton(gKbShift?"SHIFT*":"SHIFT","",109,347,79,47,0x7A5C9B,14); + kbButton(gKbPage?"< 1/2":"2/2 >","",200,347,80,47,0x365873); + kbButton("SPACE","",292,347,79,47,0x365873,14); + kbButton("DEL","",383,347,79,47,0x7D3A3A); + kbButton(gKbShowPassword?"HIDE":"SHOW","",18,406,79,54,0x53606B,14); + kbButton("CLEAR","",109,406,79,54,0x7D3A3A,14); + kbButton("CANCEL","",200,406,118,54,0x5A6570,14); + kbButton("CONNECT","",330,406,132,54,0x2A9D8F,14); +} + +static void timeScreen(lv_event_t *){ + gScreen=Screen::Time;clearUi();legend();topBar("TIME SETTINGS"); + gTimeCurrent=label(gRoot,"--.--.---- --:--:--",&lv_font_montserrat_24,0xFFFFFF); + lv_obj_align(gTimeCurrent,LV_ALIGN_TOP_MID,0,80); + gTimeStatus=label(gRoot,"Clock not synchronized",&lv_font_montserrat_14,0x9EB4C2); + lv_obj_align(gTimeStatus,LV_ALIGN_TOP_MID,0,123); + gAutoCheck=lv_checkbox_create(gRoot);lv_checkbox_set_text(gAutoCheck,"Auto sync on Wi-Fi connect"); + lv_obj_set_pos(gAutoCheck,26,160);if(gAutoSync)lv_obj_add_state(gAutoCheck,LV_STATE_CHECKED); + lv_obj_add_event_cb(gAutoCheck,[](lv_event_t *e){gAutoSync=lv_obj_has_state(lv_event_get_target(e),LV_STATE_CHECKED);saveSettings();},LV_EVENT_VALUE_CHANGED,nullptr); + lv_obj_t *tzTitle=label(gRoot,"Time zone (fixed UTC offset)",&lv_font_montserrat_16,0xC9D3DE);lv_obj_set_pos(tzTitle,26,205); + // Fixed selection avoids LVGL dropdown invalidation on screen changes. + gTzDraft=gTimezoneMinutes; + lv_obj_t *tz=label(gRoot,"",&lv_font_montserrat_20,0xFFFFFF);lv_obj_set_pos(tz,175,246);gTzDropdown=tz; + auto tzUpdate=[](){char txt[20];int m=abs(gTzDraft);snprintf(txt,sizeof(txt),"UTC%c%02d:%02d",gTzDraft<0?'-':'+',m/60,m%60);if(gTzDropdown)lv_label_set_text(gTzDropdown,txt);}; + tzUpdate(); + button(gRoot,"-",25,235,60,49,0x214D69,[](lv_event_t *){gTzDraft=max(-720,gTzDraft-15);char b[20];int m=abs(gTzDraft);snprintf(b,sizeof(b),"UTC%c%02d:%02d",gTzDraft<0?'-':'+',m/60,m%60);lv_label_set_text(gTzDropdown,b);}); + button(gRoot,"+",95,235,60,49,0x214D69,[](lv_event_t *){gTzDraft=min(840,gTzDraft+15);char b[20];int m=abs(gTzDraft);snprintf(b,sizeof(b),"UTC%c%02d:%02d",gTzDraft<0?'-':'+',m/60,m%60);lv_label_set_text(gTzDropdown,b);}); + button(gRoot,"SET",330,235,122,49,0x214D69,[](lv_event_t *){gTimezoneMinutes=gTzDraft;saveSettings();timeUiTick();}); + button(gRoot,"SYNC NOW",23,316,210,54,0x214D69,[](lv_event_t *){requestNtp();}); + button(gRoot,"SET MANUALLY",245,316,209,54,0x214D69,[](lv_event_t *){ + time_t e=time(nullptr);if(!gTimeValid||e<1700000000)e=1760000000; + e+=(int32_t)gTimezoneMinutes*60;tm t={};gmtime_r(&e,&t); + gManualParts[0]=t.tm_year+1900;gManualParts[1]=t.tm_mon+1;gManualParts[2]=t.tm_mday;gManualParts[3]=t.tm_hour;gManualParts[4]=t.tm_min; + gManualField=0;gManualDigits="";manualTimeScreen(); + }); + button(gRoot,"BACK",140,399,200,52,0x214D69,[](lv_event_t *){settings(nullptr);}); +} +static bool manualValid(){ + int y=gManualParts[0],m=gManualParts[1],d=gManualParts[2],h=gManualParts[3],n=gManualParts[4]; + if(y<2024||y>2099||m<1||m>12||h<0||h>23||n<0||n>59)return false; + int nd[]={31,28,31,30,31,30,31,31,30,31,30,31}; + if((y%4==0&&y%100!=0)||y%400==0)nd[1]=29; + return d>=1&&d<=nd[m-1]; +} +static int64_t utcFromParts(int y,int m,int d,int h,int minute){ + y-=m<=2;int era=(y>=0?y:y-399)/400;unsigned yoe=y-era*400; + unsigned mp=m+(m>2?-3:9);unsigned doy=(153*mp+2)/5+d-1; + unsigned doe=yoe*365+yoe/4-yoe/100+doy; + return ((int64_t)era*146097+doe-719468)*86400+h*3600+minute*60; +} +static void manualRefresh(){ + if(!gManualPreview)return;char b[96]; + static const char *fieldNames[]={"YEAR","MONTH","DAY","HOUR","MINUTE"}; + snprintf(b,sizeof(b),"%04d.%02d.%02d %02d:%02d:00\nEditing: %s %s",gManualParts[0],gManualParts[1],gManualParts[2],gManualParts[3],gManualParts[4], + fieldNames[gManualField],gManualDigits.c_str()); + lv_label_set_text(gManualPreview,b); +} +static void manualKey(lv_event_t *e){ + const char *key=(const char*)lv_event_get_user_data(e);if(!key)return; + if(strcmp(key,"CANCEL")==0){timeScreen(nullptr);return;} + if(strcmp(key,"BACK")==0){if(!gManualDigits.isEmpty())gManualDigits.remove(gManualDigits.length()-1);manualRefresh();return;} + if(strcmp(key,"OK")==0){ + if(!gManualDigits.isEmpty())gManualParts[gManualField]=gManualDigits.toInt(); + gManualDigits=""; + if(gManualField<4){gManualField++;manualRefresh();return;} + if(!manualValid()){lv_label_set_text(gManualPreview,"Invalid date or time!\nEdit fields again.");gManualField=0;return;} + time_t utc=(time_t)(utcFromParts(gManualParts[0],gManualParts[1],gManualParts[2],gManualParts[3],gManualParts[4])-(int64_t)gTimezoneMinutes*60); + timeval tv={};tv.tv_sec=utc;tv.tv_usec=0;settimeofday(&tv,nullptr);rtcWrite(utc);gTimeValid=true;gNtpPending=false; + appendEvent(9);timeScreen(nullptr);return; + } + if(gManualDigits.length()<4){gManualDigits+=key;manualRefresh();} +} +static void manualTimeScreen(){ + gScreen=Screen::ManualTime;clearUi();legend();topBar("SET DATE AND TIME"); + gManualPreview=label(gRoot,"",&lv_font_montserrat_20,0xFFFFFF);lv_obj_set_pos(gManualPreview,44,86);manualRefresh(); + const char *keys[]={"1","2","3","4","5","6","7","8","9","BACK","0","OK"}; + for(int i=0;i<12;i++){ + int col=i%3,row=i/3; + button(gRoot,keys[i],30+col*147,173+row*61,126,53,0x214D69,manualKey,(void*)keys[i]); + } + button(gRoot,"CANCEL",133,424,214,45,0x553442,manualKey,(void*)"CANCEL"); +} +static void timeUiTick(){ + if(gScreen!=Screen::Time||!gTimeCurrent)return; + time_t now=time(nullptr);char buf[48]; + if(gTimeValid&&now>1700000000){now+=(int32_t)gTimezoneMinutes*60;tm t={};gmtime_r(&now,&t);snprintf(buf,sizeof(buf),"%02d.%02d.%04d %02d:%02d:%02d",t.tm_mday,t.tm_mon+1,t.tm_year+1900,t.tm_hour,t.tm_min,t.tm_sec);} + else snprintf(buf,sizeof(buf),"--.--.---- --:--:--"); + lv_label_set_text(gTimeCurrent,buf); + lv_label_set_text(gTimeStatus,gNtpPending?"Synchronizing...":(gTimeValid?"Clock available (RTC / NTP)":"Clock not synchronized")); +} +static void applyRotationScreenPolicy(){ + if(!gRotation || !gImuOk || gPaused || gScreen!=Screen::Monitor)return; + // Keep on for the top edge; keep off for the other three edges. + // For flat orientations retain the ordinary configured screen timeout. + if(gScreenEdgeOrientation==2){ + if(!gScreenOn){gfx->setBrightness(220);gScreenOn=true;} + }else if(gScreenEdgeOrientation==3){ + if(gScreenOn){gfx->setBrightness(0);gScreenOn=false;} + } +} +static void pollOrientation(){ + if(!gRotation||!gImuOk||gPaused||gScreen!=Screen::Monitor)return; + uint32_t now=millis();if(now-gOrientationSample<70)return;gOrientationSample=now; + uint8_t data[6];if(!imuRead(0x35,data,6))return; + int16_t x=(int16_t)(data[0]|data[1]<<8),y=(int16_t)(data[2]|data[3]<<8),z=(int16_t)(data[4]|data[5]<<8); + float horiz=sqrtf((float)x*x+(float)y*y),az=fabsf((float)z); + if(horiz<100&&az<100)return; + // 0 = face up/down (EXHALE); 1 = any edge up (INHALE). + int8_t detected=(az>horiz*1.428f)?0:((azax*1.35f)edge=((int32_t)y*IMU_TOP_EDGE_Y_SIGN>0)?2:3; + else if(ax>ay*1.35f)edge=3; + } + if(edge!=gScreenEdgeCandidate){gScreenEdgeCandidate=edge;gScreenEdgeChanged=now;} + else if(now-gScreenEdgeChanged>=250 && edge!=gScreenEdgeOrientation){ + gScreenEdgeOrientation=edge; + applyRotationScreenPolicy(); + } + if(detected<0)return; + if(detected!=gOrientationCandidate){gOrientationCandidate=detected;gOrientationChanged=now;return;} + if(now-gOrientationChanged<250 || detected==gOrientation)return; + gOrientation=detected; + if(!gRotationArmed){ + gRotationArmed=true; + // Start a new measurement only when the device first reaches an inhale edge. + if(detected==1&&gBreath==BreathState::Waiting)phase(true); + return; + } + if(detected==0)phase(false);else phase(true); +} +// USB CDC serial protocol: LOG INFO / LOG DOWNLOAD; records stay on device. +static String gUsbCommand=""; +static void usbCommands(){ + while(Serial.available()){ + char ch=(char)Serial.read(); + if(ch=='\r')continue; + if(ch!='\n'){ + if(gUsbCommand.length()<64)gUsbCommand+=ch; + continue; + } + gUsbCommand.trim(); + if(gUsbCommand=="LOG INFO"){ + if(!gFileReady){Serial.println("LOG ERROR FS");} + else{File f=FFat.open("/events.bin","r");size_t sz=f?f.size():0;if(f)f.close(); + Serial.printf("LOG INFO %u %u\n",(unsigned)sz,(unsigned)gEventSeq);} + }else if(gUsbCommand=="LOG DOWNLOAD"){ + if(!gFileReady){Serial.println("LOG ERROR FS");} + else{File f=FFat.open("/events.bin","r");size_t sz=f?f.size():0; + Serial.printf("LOG BEGIN %u\n",(unsigned)sz); + if(f){const char hex[]="0123456789ABCDEF";char line[129];size_t n=0; + while(f.available()){int x=f.read();if(x<0)break;line[2*n]=hex[((uint8_t)x)>>4];line[2*n+1]=hex[((uint8_t)x)&15];n++; + if(n==64){line[128]=0;Serial.println(line);n=0;delay(1);}} + if(n){line[2*n]=0;Serial.println(line);}f.close();} + Serial.println("LOG END");} + }else if(gUsbCommand.length()){Serial.println("LOG ERROR COMMAND");} + gUsbCommand=""; + } +} +void setup(){Serial.begin(115200);Wire.begin(PIN_I2C_SDA,PIN_I2C_SCL);initPower();pinMode(PIN_INHALE,INPUT_PULLUP);pinMode(PIN_EXHALE,INPUT_PULLUP);initAudio();gfx->begin();gBus->writeC8D8(0x36,0xA0);gfx->setBrightness(220);gTouch.setPins(PIN_TP_INT,-1);gTouch.begin(Wire,0x5A,PIN_I2C_SDA,PIN_I2C_SCL);gTouch.setMaxCoordinates(DISP_W,DISP_H);gTouch.setSwapXY(true);gTouch.setMirrorXY(true,false);loadSettings();initClock();initImu();initEvents();appendEvent(2);wifiLoad();lv_init();gBuf1=(lv_color_t *)heap_caps_malloc(DISP_W*40*sizeof(lv_color_t),MALLOC_CAP_DMA);gBuf2=(lv_color_t *)heap_caps_malloc(DISP_W*40*sizeof(lv_color_t),MALLOC_CAP_DMA);lv_disp_draw_buf_init(&gDrawBuf,gBuf1,gBuf2,DISP_W*40);static lv_disp_drv_t dd;lv_disp_drv_init(&dd);dd.hor_res=DISP_W;dd.ver_res=DISP_H;dd.flush_cb=flush;dd.rounder_cb=rounder;dd.draw_buf=&gDrawBuf;lv_disp_drv_register(&dd);static lv_indev_drv_t id;lv_indev_drv_init(&id);id.type=LV_INDEV_TYPE_POINTER;id.read_cb=touchRead;lv_indev_drv_register(&id);const esp_timer_create_args_t ta={.callback=&tick,.name="lvgl_tick"};esp_timer_handle_t timer;esp_timer_create(&ta,&timer);esp_timer_start_periodic(timer,LVGL_TICK_MS*1000);gLastActivity=millis();enterMonitor(nullptr);gWifiNextScan=millis()+1500;} +void loop(){uint32_t now=millis();poll(gInhale,true);poll(gExhale,false);pollPowerKey();pollOrientation();usbCommands();wifiTick();ntpTick();reminders();if(now-gLastUi>=UI_MS){gLastUi=now;refresh();timeUiTick();}if(now-gLastBatt>=BATT_MS){gLastBatt=now;batteryUi();}uint32_t timeout=SCREEN_TIMEOUTS[gScreenTimeout];if(gScreenOn&&!(gRotation && gImuOk && gScreenEdgeOrientation==2)&&gScreen!=Screen::Settings&&gScreen!=Screen::Wifi&&gScreen!=Screen::WifiPassword&&gScreen!=Screen::Time&&gScreen!=Screen::ManualTime&&(int32_t)(now-gKey1WakeUntil)>=0&&timeout&&now-gLastActivity>=timeout){gScreenOn=false;gfx->setBrightness(0);}lv_timer_handler();applyRotationScreenPolicy();if((int32_t)(millis()-gKey1WakeUntil)<0){gScreenOn=true;gfx->setBrightness(220);}delay(5);}