From 562d71d1313914da68566ad41f9260b7b6002016 Mon Sep 17 00:00:00 2001 From: Caffreyfans Date: Thu, 9 Apr 2020 19:28:28 +0800 Subject: [PATCH] supprt ota update --- src/IRbabyMsgHandler.cpp | 9 ++++++++- src/IRbabyOTA.cpp | 4 ++-- src/IRbabyOTA.h | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/IRbabyMsgHandler.cpp b/src/IRbabyMsgHandler.cpp index d427c8c..8759b25 100644 --- a/src/IRbabyMsgHandler.cpp +++ b/src/IRbabyMsgHandler.cpp @@ -4,8 +4,9 @@ #include "IRbabyMQTT.h" #include "IRbabyUDP.h" #include "ESP8266WiFi.h" -#include "../lib/Irext/include/ir_ac_control.h" #include "IRbabyIR.h" +#include "../lib/Irext/include/ir_ac_control.h" +#include "IRbabyOTA.h" StaticJsonDocument<1024> send_msg_doc; StaticJsonDocument<1024> recv_msg_doc; @@ -160,6 +161,12 @@ bool msgHandle(StaticJsonDocument<1024> *recv_msg_doc, MsgType msg_type) sendStatus(file_name, status); } } + + if (obj["cmd"] == "update") { + JsonObject params = obj["params"]; + String url = params["url"]; + otaUpdate(url); + } } break; diff --git a/src/IRbabyOTA.cpp b/src/IRbabyOTA.cpp index c736d07..1d7fcaf 100644 --- a/src/IRbabyOTA.cpp +++ b/src/IRbabyOTA.cpp @@ -27,7 +27,7 @@ void versionCheck() { } -void otaUpdate() +void otaUpdate(String url) { WiFiClient client; @@ -38,7 +38,7 @@ void otaUpdate() ESPhttpUpdate.onProgress(update_progress); ESPhttpUpdate.onError(update_error); - t_httpUpdate_return ret = ESPhttpUpdate.update(client, "http://caffreyfans.top/IRbaby/latest/firmware.bin"); + t_httpUpdate_return ret = ESPhttpUpdate.update(client, url); switch (ret) { diff --git a/src/IRbabyOTA.h b/src/IRbabyOTA.h index 8b16ce5..6cf5805 100644 --- a/src/IRbabyOTA.h +++ b/src/IRbabyOTA.h @@ -3,6 +3,6 @@ #include "IRbabySerial.h" -void otaUpdate(); +void otaUpdate(String url); #endif \ No newline at end of file