diff --git a/breath_button_monitor/breathmonitor_v3 with server/firmware/firmware.ino b/breath_button_monitor/breathmonitor_v3 with server/firmware/firmware.ino index 1810202..20709d1 100644 --- a/breath_button_monitor/breathmonitor_v3 with server/firmware/firmware.ino +++ b/breath_button_monitor/breathmonitor_v3 with server/firmware/firmware.ino @@ -100,7 +100,7 @@ static bool gKbSymbols=false,gKbShift=false,gKbPage=false,gKbShowPassword=false; static String gKbValue=""; enum class InputTarget : uint8_t { WifiPass, AccountLogin, AccountPass }; static InputTarget gInputTarget=InputTarget::WifiPass; -enum class NetOperation : uint8_t { None, Test, Time, Upload, Pair, ChangeAccount, Firmware }; +enum class NetOperation : uint8_t { None, Test, Time, Upload, Pair, ChangeAccount, FirmwareManifest, Firmware }; static NetOperation gNetOperation=NetOperation::None; static uint32_t gNetStarted=0; static Screen gOperationReturn=Screen::Wifi; @@ -113,6 +113,8 @@ static void firmwareScreen(lv_event_t * = nullptr); static void networkTick(); static String gAccountLogin="", gDeviceToken="", gAccountPassword="", gPendingAccountLogin="", gPendingAccountPassword="", gFirmwareTarget=""; static bool gChangingAccount=false; +static bool gFirmwareManifestLoaded=false; +static String gFirmwareStable="", gFirmwareTest=""; static String gDeviceId=""; static Preferences gAccountPrefs; static volatile bool gWorkerActive=false, gWorkerDone=false, gWorkerSuccess=false; @@ -486,7 +488,7 @@ static void onlineSettings(lv_event_t *) { button(gRoot,"Wi-Fi",248,125,208,50,0x214D69,[](lv_event_t *){if(!gWifiEnabled)wifiEnable(true);wifiScreen(nullptr);}); button(gRoot,"TIME",24,195,208,50,0x214D69,[](lv_event_t *){timeScreen(nullptr);}); button(gRoot,"ACCOUNT",248,195,208,50,0x214D69,[](lv_event_t *){accountScreen(nullptr);}); - button(gRoot,"FIRMWARE",24,265,208,50,0x214D69,[](lv_event_t *){firmwareScreen(nullptr);}); + button(gRoot,"FIRMWARE",24,265,208,50,0x214D69,[](lv_event_t *){gFirmwareManifestLoaded=false;gFirmwareStable="";gFirmwareTest="";firmwareScreen(nullptr);}); button(gRoot,"BACK",248,265,208,50,0x214D69,[](lv_event_t *){settings(nullptr);}); } // PMU power key can blank the AMOLED independently of our timeout flag. @@ -646,7 +648,7 @@ static void networkFinish(const String &message){ if(op==NetOperation::Time){timeScreen(nullptr);} else if(op==NetOperation::Upload||op==NetOperation::Pair||op==NetOperation::ChangeAccount){if(op==NetOperation::ChangeAccount)accountScreen(nullptr);else onlineScreen(nullptr);} else if(gScreen==Screen::Wifi){wifiScreen(nullptr);} - else if(op==NetOperation::Firmware){firmwareScreen(nullptr);} + else if(op==NetOperation::FirmwareManifest||op==NetOperation::Firmware){firmwareScreen(nullptr);} } static void networkStart(NetOperation op){ if(gWorkerActive||gNetOperation!=NetOperation::None)return; @@ -728,7 +730,7 @@ static void wifiTick(){ if(WiFi.status()==WL_CONNECTED){ if(gNetOperation==NetOperation::Test){networkFinish("Wi-Fi test OK");return;} if(gNetOperation==NetOperation::Time){if(!gNtpPending)requestNtp();return;} - if(gNetOperation==NetOperation::Firmware){networkTick();return;} + if(gNetOperation==NetOperation::FirmwareManifest||gNetOperation==NetOperation::Firmware){networkTick();return;} if(gNetOperation==NetOperation::Upload||gNetOperation==NetOperation::Pair||gNetOperation==NetOperation::ChangeAccount){ if(!gTimeValid){if(!gNtpPending)requestNtp();return;} networkTick();return; @@ -996,17 +998,37 @@ static bool doFirmwareUpdate(WiFiClientSecure &secure){ WiFiClient *stream=http.getStreamPtr();uint8_t buffer[1024];size_t written=0;while(http.connected()&&(total<0||written<(size_t)total)){size_t available=stream->available();if(!available){delay(1);continue;}size_t n=stream->readBytes(buffer,min(available,sizeof(buffer)));if(!Update.write(buffer,n)){Update.abort();http.end();workerSet("OTA write failed");return false;}written+=n;} http.end();if(!Update.end()||!Update.isFinished()){workerSet("OTA finalize failed");return false;}workerSet("Firmware updated; restarting");delay(500);ESP.restart();return true; } +static String manifestVersion(const String &json,const char *section){ + String marker=String("\"")+section+"\"";int start=json.indexOf(marker);if(start<0)return "";int version=json.indexOf("\"version\"",start);if(version<0)return "";int first=json.indexOf('"',json.indexOf(':',version)+1);int last=json.indexOf('"',first+1);return first>=0&&last>first?json.substring(first+1,last):String(""); +} +static bool fetchFirmwareManifest(WiFiClientSecure &secure){ + workerSet("Checking available firmware...");HTTPClient http;String url=String(SERVER_URL)+"/firmware/manifest.json"; + if(!http.begin(secure,url)){workerSet("Manifest HTTPS initialization failed");return false;} + http.setTimeout(15000);int status=http.GET();String response=http.getString();http.end(); + if(status!=200){workerSet(String("Manifest request failed: HTTP ")+status);return false;} + String stable=manifestVersion(response,"stable"),test=manifestVersion(response,"test"); + if(stable.isEmpty()){workerSet("Manifest has no stable version");return false;} + gFirmwareStable=stable;gFirmwareTest=test;gFirmwareManifestLoaded=true;workerSet("Available firmware updated");return true; +} static void firmwareConfirmScreen(lv_event_t *){ gScreen=Screen::FirmwareConfirm;clearUi();legend();topBar("FIRMWARE UPDATE");String text="Update device to firmware "+gFirmwareTarget+"?";lv_obj_t *t=label(gRoot,text.c_str(),&lv_font_montserrat_20,0xFFFFFF);lv_obj_set_pos(t,24,130); button(gRoot,"CANCEL",24,300,200,55,0x553442,[](lv_event_t *){firmwareScreen(nullptr);}); button(gRoot,"UPDATE",256,300,200,55,0x2A9D8F,[](lv_event_t *){networkStart(NetOperation::Firmware);firmwareScreen(nullptr);}); } static void firmwareScreen(lv_event_t *){ - gScreen=Screen::Firmware;clearUi();legend();topBar("FIRMWARE");char line[96];snprintf(line,sizeof(line),"Installed: %s\nStable: 1.3\nTest: 1.2",FIRMWARE_VERSION);lv_obj_t *t=label(gRoot,line,&lv_font_montserrat_20,0xFFFFFF);lv_obj_set_pos(t,28,100); - if(gNetOperation==NetOperation::Firmware||gWorkerActive){lv_obj_t *s=label(gRoot,workerMessage().c_str(),&lv_font_montserrat_16,0xFFD34D);lv_obj_set_pos(s,28,220);} - button(gRoot,"UPDATE STABLE",24,285,208,55,0x2A9D8F,[](lv_event_t *){gFirmwareTarget="1.3";firmwareConfirmScreen(nullptr);}); - button(gRoot,"UPDATE TEST",248,285,208,55,0xA56A36,[](lv_event_t *){gFirmwareTarget="1.2";firmwareConfirmScreen(nullptr);}); - button(gRoot,"BACK",140,375,200,52,0x214D69,[](lv_event_t *){onlineSettings(nullptr);}); + gScreen=Screen::Firmware;clearUi();legend();topBar("FIRMWARE");char line[128];snprintf(line,sizeof(line),"Installed: %s",FIRMWARE_VERSION);lv_obj_t *t=label(gRoot,line,&lv_font_montserrat_20,0xFFFFFF);lv_obj_set_pos(t,28,100); + if(!gFirmwareManifestLoaded){ + lv_obj_t *note=label(gRoot,"Available versions are not loaded.",&lv_font_montserrat_16,0x9EB4C2);lv_obj_set_pos(note,28,150); + button(gRoot,"REFRESH AVAILABLE",24,210,432,55,0x2A9D8F,[](lv_event_t *){networkStart(NetOperation::FirmwareManifest);firmwareScreen(nullptr);}); + }else{ + snprintf(line,sizeof(line),"Stable: %s\nTest: %s",gFirmwareStable.c_str(),gFirmwareTest.length()?gFirmwareTest.c_str():"not available"); + lv_obj_t *available=label(gRoot,line,&lv_font_montserrat_20,0xFFFFFF);lv_obj_set_pos(available,28,145); + button(gRoot,"UPDATE STABLE",24,245,208,55,0x2A9D8F,[](lv_event_t *){gFirmwareTarget=gFirmwareStable;firmwareConfirmScreen(nullptr);}); + if(gFirmwareTest.length())button(gRoot,"UPDATE TEST",248,245,208,55,0xA56A36,[](lv_event_t *){gFirmwareTarget=gFirmwareTest;firmwareConfirmScreen(nullptr);}); + button(gRoot,"REFRESH AGAIN",24,320,208,50,0x214D69,[](lv_event_t *){networkStart(NetOperation::FirmwareManifest);firmwareScreen(nullptr);}); + } + if(gWorkerActive){lv_obj_t *s=label(gRoot,workerMessage().c_str(),&lv_font_montserrat_16,0xFFD34D);lv_obj_set_pos(s,28,390);} + button(gRoot,"BACK",248,320,208,50,0x214D69,[](lv_event_t *){onlineSettings(nullptr);}); } static void networkUiTick(){ if(gScreen!=Screen::Online||!gOnlineStatus)return; @@ -1097,13 +1119,13 @@ static void networkWorker(void *){ // ESP-IDF/WiFiClientSecure uses one TLS stream at a time. WiFiClientSecure secure;secure.setCACert(ROOT_CA);secure.setTimeout(30); NetOperation op=gNetOperation; - bool ok=op==NetOperation::Pair?doPair(secure):(op==NetOperation::ChangeAccount?changeAccount(secure):(op==NetOperation::Firmware?doFirmwareUpdate(secure):uploadFiles(secure))); + bool ok=op==NetOperation::Pair?doPair(secure):(op==NetOperation::ChangeAccount?changeAccount(secure):(op==NetOperation::FirmwareManifest?fetchFirmwareManifest(secure):(op==NetOperation::Firmware?doFirmwareUpdate(secure):uploadFiles(secure)))); workerSet(workerMessage(),true,ok);gWorkerActive=false; vTaskDelete(nullptr); } static void networkTick(){ if(gWorkerActive||gWorkerDone)return; - if(gNetOperation!=NetOperation::Upload&&gNetOperation!=NetOperation::Pair&&gNetOperation!=NetOperation::ChangeAccount&&gNetOperation!=NetOperation::Firmware)return; + if(gNetOperation!=NetOperation::Upload&&gNetOperation!=NetOperation::Pair&&gNetOperation!=NetOperation::ChangeAccount&&gNetOperation!=NetOperation::FirmwareManifest&&gNetOperation!=NetOperation::Firmware)return; gWorkerActive=true;workerSet("Starting secure connection..."); BaseType_t started=xTaskCreatePinnedToCore(networkWorker,"breath-sync",16384,nullptr,1,nullptr,0); if(started!=pdPASS){gWorkerActive=false;networkFinish("Cannot start upload task");} diff --git a/breath_button_monitor/breathmonitor_v3 with server/server/src/main/resources/firmware/breathmonitor-v1.3.bin b/breath_button_monitor/breathmonitor_v3 with server/server/src/main/resources/firmware/breathmonitor-v1.3.bin index 32382a9..9a0de0e 100644 Binary files a/breath_button_monitor/breathmonitor_v3 with server/server/src/main/resources/firmware/breathmonitor-v1.3.bin and b/breath_button_monitor/breathmonitor_v3 with server/server/src/main/resources/firmware/breathmonitor-v1.3.bin differ