FeenixMakers/corridor_control
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split ota code out

Browse Source
This commit is contained in:
Torsten Ruger 2021-06-22 15:51:58 +03:00
parent 60cec2fde8
commit f74b5fed6b
4 changed files with 69 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fan_control/include/ota.hpp Normal file
View File

@ -0,0 +1,8 @@
#include <Arduino.h>
#include <ESP8266WiFi.h>
#include <ESP8266mDNS.h>
#include <WiFiUdp.h>
#include <ArduinoOTA.h>
void ota_setup(const char* name);

3
fan_control/platformio.ini
View File

@ -10,7 +10,8 @@
[env:sonoff_basic] [env:sonoff_basic]
platform = espressif8266 platform = espressif8266
board = sonoff_basic ;board = sonoff_basic
board = d1_mini_lite
framework = arduino framework = arduino
lib_deps = lib_deps =

57
fan_control/src/main.cpp
View File

@ -1,9 +1,6 @@
#include <Arduino.h> #include <Arduino.h>
#include <ESP8266WiFi.h> #include "ota.hpp"
#include <ESP8266mDNS.h>
#include <WiFiUdp.h>
#include <ArduinoOTA.h>
// DHT Temperature & Humidity Sensor // DHT Temperature & Humidity Sensor
// Unified Sensor Library Example // Unified Sensor Library Example
@ -32,56 +29,7 @@ const char* ssid = "fan_XXX";
void setup() { void setup() {
Serial.begin(115200); Serial.begin(115200);
Serial.println("Booting"); ota_setup(ssid);
boolean result = WiFi.softAP(ssid);
while (result == false) {
Serial.println("Connection Failed! Rebooting...");
delay(5000);
ESP.restart();
}
// Port defaults to 3232
// ArduinoOTA.setPort(8266);
// Hostname defaults to esp3232-[MAC]
ArduinoOTA.setHostname("myesp32.local");
// No authentication by default
// ArduinoOTA.setPassword("admin");
// Password can be set with it's md5 value as well
// MD5(admin) = 21232f297a57a5a743894a0e4a801fc3
// ArduinoOTA.setPasswordHash("21232f297a57a5a743894a0e4a801fc3");
ArduinoOTA.onStart([]() {
String type;
if (ArduinoOTA.getCommand() == U_FLASH)
type = "sketch";
else // U_SPIFFS
type = "filesystem";
// NOTE: if updating SPIFFS this would be the place to unmount SPIFFS using SPIFFS.end()
Serial.println("Start updating " + type);
});
ArduinoOTA.onEnd([]() {
Serial.println("\nEnd");
});
ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
Serial.printf("Progress: %u%%\r", (progress / (total / 100)));
});
ArduinoOTA.onError([](ota_error_t error) {
Serial.printf("Error[%u]: ", error);
if (error == OTA_AUTH_ERROR) Serial.println("Auth Failed");
else if (error == OTA_BEGIN_ERROR) Serial.println("Begin Failed");
else if (error == OTA_CONNECT_ERROR) Serial.println("Connect Failed");
else if (error == OTA_RECEIVE_ERROR) Serial.println("Receive Failed");
else if (error == OTA_END_ERROR) Serial.println("End Failed");
});
ArduinoOTA.begin();
Serial.println("Ready");
Serial.print("IP address: ");
Serial.println(WiFi.localIP());
// Initialize device. // Initialize device.
dht.begin(); dht.begin();
@ -114,6 +62,7 @@ void setup() {
void loop() { void loop() {
ArduinoOTA.handle(); ArduinoOTA.handle();
Serial.println(WiFi.softAPIP());
// Delay between measurements. // Delay between measurements.
delay(delayMS); delay(delayMS);

56
fan_control/src/ota.cpp Normal file
View File

@ -0,0 +1,56 @@
#include "ota.hpp"
void ota_setup(const char* ssid) {
Serial.begin(115200);
Serial.println("Booting");
boolean result = WiFi.softAP(ssid);
while (result == false) {
Serial.println("Connection Failed! Rebooting...");
delay(5000);
ESP.restart();
}
Serial.println(WiFi.softAPIP());
// Port defaults to 3232
// ArduinoOTA.setPort(8266);
// Hostname defaults to esp3232-[MAC]
ArduinoOTA.setHostname("myesp32.local");
// No authentication by default
// ArduinoOTA.setPassword("admin");
// Password can be set with it's md5 value as well
// MD5(admin) = 21232f297a57a5a743894a0e4a801fc3
// ArduinoOTA.setPasswordHash("21232f297a57a5a743894a0e4a801fc3");
ArduinoOTA.onStart([]() {
String type;
if (ArduinoOTA.getCommand() == U_FLASH)
type = "sketch";
else // U_SPIFFS
type = "filesystem";
// NOTE: if updating SPIFFS this would be the place to unmount SPIFFS using SPIFFS.end()
Serial.println("Start updating " + type);
});
ArduinoOTA.onEnd([]() {
Serial.println("\nEnd");
});
ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
Serial.printf("Progress: %u%%\r", (progress / (total / 100)));
});
ArduinoOTA.onError([](ota_error_t error) {
Serial.printf("Error[%u]: ", error);
if (error == OTA_AUTH_ERROR) Serial.println("Auth Failed");
else if (error == OTA_BEGIN_ERROR) Serial.println("Begin Failed");
else if (error == OTA_CONNECT_ERROR) Serial.println("Connect Failed");
else if (error == OTA_RECEIVE_ERROR) Serial.println("Receive Failed");
else if (error == OTA_END_ERROR) Serial.println("End Failed");
});
ArduinoOTA.begin();
Serial.println("Ready");
Serial.print("IP address: ");
Serial.println(WiFi.localIP());
}