Обновление прошивки
parent
e198ba8cae
commit
2e66e4f6c8
208
M5Atom_airqa.ino
208
M5Atom_airqa.ino
|
|
@ -25,11 +25,16 @@
|
|||
|
||||
#include <PubSubClient.h> //Mtqq
|
||||
#include <ArduinoJson.h> //Упакова в JSon - удобная библиотека
|
||||
#include <ESPmDNS.h>
|
||||
|
||||
//Наша кнопочка при нажатии на которую произойдет вызов wifi менеджера и перезагрузка в станцию
|
||||
#define TRIGGER_PIN 39
|
||||
|
||||
unsigned int VersionSW = 14; //65536 Версия прошивки
|
||||
unsigned int VersionSW = 21; //65536 Версия прошивки
|
||||
|
||||
//15 - добавлено то, се, забыл вообще дописать что добавленоSerial
|
||||
//19 - вывод в консоль всех действий, ошибки с обновлнеием - починил, прияногое мигание светодиодом, тест для поиска metrics.
|
||||
//21 - убран мак из вывода в топике
|
||||
|
||||
WiFiManager wm; // обьект менеджера
|
||||
WiFiManagerParameter custom_field;
|
||||
|
|
@ -39,7 +44,7 @@ Ticker RGBWTicker;
|
|||
Adafruit_CCS811 ccs;
|
||||
ClosedCube_HDC1080 hdc1080;
|
||||
String JsonData;
|
||||
StaticJsonDocument<200> doc;
|
||||
StaticJsonDocument<200> doc, other;
|
||||
|
||||
WiFiClient espClient;
|
||||
PubSubClient MqttClient(espClient);
|
||||
|
|
@ -48,8 +53,8 @@ IPAddress IpMqtt;
|
|||
WiFiUDP ntpUDP;
|
||||
NTPClient timeClient(ntpUDP, "0.ua.pool.ntp.org", 7200, 60000); //Собственно сервер времени смещение и частоат запроса, но он вручную
|
||||
|
||||
const PROGMEM char *mqttHostName = "cctv.automation.art"; //Хостнейм брокера
|
||||
unsigned int mqttPort = 8889; //Порт брокера
|
||||
const PROGMEM char *mqttHostName = "192.168.89.210"; //Хостнейм брокера metrics.local //192.168.89.210
|
||||
unsigned int mqttPort = 1883; //Порт брокера 1883
|
||||
const PROGMEM char *topicName = "/aastudio"; // +mac адресс девайса Префикс топика
|
||||
const PROGMEM char *mqttLogin = "login", //Логин пароль - необходимо сменить код при connect()
|
||||
*mqttPass = "password";
|
||||
|
|
@ -70,7 +75,10 @@ float PROGMEM hcoeff[3] = {13.77, 14.07, 15.56}; //Влажность
|
|||
float callibrationT = 0, callibrationH = 0;
|
||||
String macc = ""; //Глобальное хранение мас адреса
|
||||
float TempAv, HumAv, Eco2Av, TvocAv;
|
||||
byte errorID = 0;
|
||||
|
||||
long rssi = 0;
|
||||
//int hall=0;
|
||||
|
||||
//Кусок кода поправить - так делать нельзя
|
||||
#define NUM_AVER 5
|
||||
|
|
@ -97,7 +105,6 @@ bool mqttSendFlag = false;
|
|||
int reqCounter = 0;
|
||||
bool flagblink = true;
|
||||
|
||||
|
||||
//Настройки
|
||||
void setup()
|
||||
{
|
||||
|
|
@ -151,7 +158,7 @@ void setup()
|
|||
bool res;
|
||||
// res = wm.autoConnect(); // auto generated AP name from chipid
|
||||
// res = wm.autoConnect("AutoConnectAP"); // anonymous ap
|
||||
res = wm.autoConnect("AutoConnectAP", "password"); // Подключение к анонимной точке доступа
|
||||
res = wm.autoConnect("AirQaPortal", "12345678"); // Подключение к анонимной точке доступа
|
||||
if (!res)
|
||||
{
|
||||
Serial.println("Failed to connect or hit timeout");
|
||||
|
|
@ -159,7 +166,7 @@ void setup()
|
|||
}
|
||||
else
|
||||
{
|
||||
Serial.println("connected...");
|
||||
Serial.println("Server AirQaPortal start");
|
||||
}
|
||||
|
||||
if (!ccs.begin()) //The device's I2C address is 0x5A
|
||||
|
|
@ -182,21 +189,31 @@ void setup()
|
|||
//Установка сервера и порта
|
||||
void setMqttServer()
|
||||
{
|
||||
Serial.println("Gethostbyname: ");
|
||||
|
||||
Serial.println("======WHERE IS METRICS.LOCAL=====");
|
||||
mdns_init();
|
||||
Serial.print("MDNS SAY: ");
|
||||
IPAddress ipaddr = MDNS.queryHost("metrics"); // .local omitted
|
||||
Serial.println(ipaddr.toString());
|
||||
|
||||
Serial.print("HOSTBYNAME SAY: ");
|
||||
int errtest = WiFi.hostByName("metrics", ipaddr);
|
||||
Serial.println(ipaddr.toString());
|
||||
Serial.println("=======END TEST======");
|
||||
|
||||
int err = WiFi.hostByName(mqttHostName, IpMqtt);
|
||||
if (err == 1)
|
||||
{
|
||||
Serial.print("Ip address by Name: ");
|
||||
Serial.println(IpMqtt);
|
||||
|
||||
delay(50);
|
||||
|
||||
MqttClient.setServer(IpMqtt, mqttPort);
|
||||
MqttClient.setCallback(callback);
|
||||
Serial.println("Set MQTT Server - OK");
|
||||
}
|
||||
else
|
||||
{
|
||||
Serial.print("Error code gethostbyname: ");
|
||||
Serial.print("Error code hostByName(): ");
|
||||
Serial.println(err);
|
||||
}
|
||||
}
|
||||
|
|
@ -218,36 +235,37 @@ void callback(char *topic, byte *payload, unsigned int length)
|
|||
void reqNtpTime()
|
||||
{
|
||||
timeClient.update();
|
||||
setTime(timeClient.getEpochTime());
|
||||
// Serial.println(timeClient.getEpochTime());
|
||||
// Serial.println("<=ntp====now=>");
|
||||
//time_t t = now();
|
||||
// Serial.println(t);
|
||||
uint32_t timeEpoch = timeClient.getEpochTime();
|
||||
setTime(timeEpoch);
|
||||
Serial.print(timeEpoch);
|
||||
Serial.print(" <=ntp== ==device=> ");
|
||||
Serial.println(now());
|
||||
if (timeEpoch < 100000)
|
||||
{
|
||||
errorID = 1;
|
||||
}
|
||||
}
|
||||
|
||||
//Нажатие кнопки для сброса
|
||||
void checkButton()
|
||||
{
|
||||
Serial.println("Button Pressed");
|
||||
// delay(3000);
|
||||
// if (digitalRead(TRIGGER_PIN) == LOW) {
|
||||
Serial.println("Erasing Config, restarting");
|
||||
Serial.println("Button Pressed to RESET");
|
||||
|
||||
wm.resetSettings();
|
||||
ESP.restart();
|
||||
// }
|
||||
// start portal w delay
|
||||
|
||||
Serial.println("Starting config portal");
|
||||
wm.setConfigPortalTimeout(120);
|
||||
|
||||
if (!wm.startConfigPortal("AirQaPortal", "12345678")) //Логин и пароль точки доступа
|
||||
{
|
||||
Serial.println("failed to connect or hit timeout");
|
||||
delay(3000);
|
||||
delay(1000);
|
||||
// ESP.restart();
|
||||
}
|
||||
else
|
||||
{
|
||||
Serial.println("CLIENT connect");
|
||||
Serial.println("Clien connected to AP");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -261,7 +279,6 @@ String getParam(String name)
|
|||
return value;
|
||||
}
|
||||
|
||||
|
||||
void saveParamCallback()
|
||||
{
|
||||
Serial.println("[CALLBACK] saveParamCallback fired");
|
||||
|
|
@ -269,10 +286,10 @@ void saveParamCallback()
|
|||
}
|
||||
|
||||
//Обновление прошивки, происходит проверка и загрузка
|
||||
//Делается Get запрос на хостинг проверяется хеш, если хеш
|
||||
|
||||
void OTAUpdate()
|
||||
{
|
||||
Serial.println("OTAUpdate()");
|
||||
Serial.println("OTAUpdate() START");
|
||||
bool flagOTA = false;
|
||||
String keyOTA;
|
||||
String payload;
|
||||
|
|
@ -283,7 +300,13 @@ void OTAUpdate()
|
|||
{
|
||||
HTTPClient http;
|
||||
String getMacNow = getMacAddress();
|
||||
//const char *clientId = macc.c_str();
|
||||
|
||||
String serverPath = "http://meteosence.s-host.net/airqa/airquality.php?meteopas=e93gme9hAt9nSWaV&mac=" + getMacNow + "&meteodata=gethash";
|
||||
|
||||
Serial.print("URL and GET request: ");
|
||||
Serial.println(serverPath);
|
||||
|
||||
http.begin(serverPath.c_str());
|
||||
int httpResponseCode = http.GET();
|
||||
|
||||
|
|
@ -292,8 +315,12 @@ void OTAUpdate()
|
|||
Serial.print("HTTP Response code: ");
|
||||
Serial.println(httpResponseCode);
|
||||
payload = http.getString();
|
||||
|
||||
Serial.print("Data from HTTP request (OTA Hash): ");
|
||||
Serial.println(payload);
|
||||
|
||||
if (payload != "errno" || payload != "errfi")
|
||||
{
|
||||
keyOTA = OTApreferences.getString("md5HashOTA");
|
||||
|
||||
if (keyOTA.length() <= 0)
|
||||
|
|
@ -301,7 +328,10 @@ void OTAUpdate()
|
|||
OTApreferences.putString("md5HashOTA", "undifined");
|
||||
}
|
||||
|
||||
|
||||
Serial.print("md5HashOTA in device: ");
|
||||
keyOTA = OTApreferences.getString("md5HashOTA");
|
||||
Serial.println(keyOTA);
|
||||
|
||||
if (payload != keyOTA)
|
||||
{
|
||||
|
|
@ -312,15 +342,23 @@ void OTAUpdate()
|
|||
}
|
||||
else
|
||||
{
|
||||
Serial.print("Error code: ");
|
||||
Serial.print("Hosting return error: ");
|
||||
Serial.println(payload);
|
||||
errorID = 3;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Serial.print("Error HTTP Response code: ");
|
||||
Serial.println(httpResponseCode);
|
||||
errorID = 2;
|
||||
}
|
||||
// Free resources
|
||||
http.end();
|
||||
}
|
||||
else
|
||||
{
|
||||
Serial.println("WiFi Disconnected");
|
||||
Serial.println("WHY WiFi is Disconnected??");
|
||||
}
|
||||
|
||||
if (flagOTA == true)
|
||||
|
|
@ -366,11 +404,12 @@ void OTAUpdate()
|
|||
//Функция для индикации Led
|
||||
void ledset(char color, bool blink = false)
|
||||
{
|
||||
M5.dis.setBrightness(100); //Половина яркости
|
||||
switch (color)
|
||||
{
|
||||
case 'g':
|
||||
M5.dis.drawpix(0, 0xf00000); //Зеленый
|
||||
ledset('r', true);
|
||||
|
||||
break;
|
||||
case 'r':
|
||||
M5.dis.drawpix(0, 0x00f000); //Красный
|
||||
|
|
@ -398,14 +437,30 @@ void ledset(char color, bool blink = false)
|
|||
|
||||
void ledBlinkTimer()
|
||||
{
|
||||
|
||||
if (flagblink == true)
|
||||
{
|
||||
M5.dis.setBrightness(0);
|
||||
M5.dis.drawpix(0, 0xf00000);
|
||||
|
||||
for (int b = 0; b <= 180; b++)
|
||||
{
|
||||
M5.dis.setBrightness(b);
|
||||
delay(7);
|
||||
}
|
||||
flagblink = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
M5.dis.clear();
|
||||
|
||||
M5.dis.setBrightness(180);
|
||||
M5.dis.drawpix(0, 0xf00000);
|
||||
for (int b = 180; b >= 0; b--)
|
||||
{
|
||||
M5.dis.setBrightness(b);
|
||||
delay(7);
|
||||
}
|
||||
//M5.dis.clear();
|
||||
flagblink = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -423,7 +478,6 @@ String getMacAddress()
|
|||
//Установка коефициентов калибровки
|
||||
void SetCallibrationCoeff()
|
||||
{
|
||||
|
||||
// Serial.print("Mac: ");
|
||||
// Serial.println(getMacAddress());
|
||||
|
||||
|
|
@ -451,7 +505,6 @@ void SetCallibrationCoeff()
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
//Ниже отдельные функции средних арифметических для каждого параместра с историей
|
||||
float middleArifmT(float newVal)
|
||||
{
|
||||
|
|
@ -536,49 +589,84 @@ void reqSensorData()
|
|||
{
|
||||
eco2 = 0;
|
||||
tvoc = 0;
|
||||
errorID = 4;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
errorID = 5;
|
||||
}
|
||||
|
||||
hdc1080Temp = hdc1080.readTemperature() + callibrationT;
|
||||
hdc1080Hum = hdc1080.readHumidity() + callibrationH;
|
||||
|
||||
// Serial.println("Original: ");
|
||||
if(hdc1080Temp < -40 || hdc1080Temp > 60 ) { errorID = 6; }
|
||||
|
||||
if(hdc1080Hum < 0 || hdc1080Temp > 100 ) { errorID = 7; }
|
||||
// Serial.println("Original data: ");
|
||||
// Serial.println(hdc1080.readTemperature());
|
||||
// Serial.println(hdc1080.readHumidity());
|
||||
|
||||
Serial.println("+calibration: ");
|
||||
Serial.print(hdc1080Temp);
|
||||
Serial.println(" ");
|
||||
Serial.println(hdc1080Hum);
|
||||
// Serial.println("Calibration data: ");
|
||||
// Serial.print(hdc1080Temp);
|
||||
// Serial.println(" ");
|
||||
// Serial.println(hdc1080Hum);
|
||||
|
||||
|
||||
TempAv = middleArifmT(hdc1080Temp);
|
||||
HumAv = middleArifmH(hdc1080Hum);
|
||||
Eco2Av = middleArifmECO(eco2);
|
||||
TvocAv = middleArifmTVOC(tvoc);
|
||||
|
||||
rssi = WiFi.RSSI();
|
||||
// hall=hallRead();
|
||||
|
||||
if (hdc1080Hum > 50 || hdc1080Hum < 39)
|
||||
{
|
||||
ledset('r', true);
|
||||
}
|
||||
|
||||
if (hdc1080Temp > 24 || hdc1080Temp < 19)
|
||||
{
|
||||
ledset('r', true);
|
||||
}
|
||||
|
||||
if (tvoc > 500)
|
||||
{
|
||||
ledset('r', true);
|
||||
}
|
||||
|
||||
if (eco2 > 1000)
|
||||
{
|
||||
ledset('r', true);
|
||||
}
|
||||
}
|
||||
|
||||
//Отправка данных по MQTT
|
||||
void SendMqttReq()
|
||||
{
|
||||
Serial.println("Data in SendMqttReq()");
|
||||
Serial.print(TempAv);
|
||||
Serial.print(" ");
|
||||
Serial.print(HumAv);
|
||||
Serial.print(" ");
|
||||
Serial.print(Eco2Av);
|
||||
Serial.print(" ");
|
||||
Serial.println(TvocAv);
|
||||
//Serial.println("Data in SendMqttReq()");
|
||||
// Serial.print(TempAv);
|
||||
// Serial.print(" ");
|
||||
// Serial.print(HumAv);
|
||||
// Serial.print(" ");
|
||||
// Serial.print(Eco2Av);
|
||||
// Serial.print(" ");
|
||||
// Serial.println(TvocAv);
|
||||
|
||||
char HumidityInt[8], TemperatureInt[8];
|
||||
dtostrf(TempAv * 100, 4, 0, TemperatureInt);
|
||||
dtostrf(HumAv * 100, 4, 0, HumidityInt);
|
||||
|
||||
doc["mac"] = String(getMacAddress());
|
||||
// doc["mac"] = String(getMacAddress());
|
||||
doc["swver"] = VersionSW;
|
||||
doc["t"] = atoi(TemperatureInt);
|
||||
doc["h"] = atoi(HumidityInt);
|
||||
doc["eco"] = (int)Eco2Av;
|
||||
doc["tvoc"] = (int)TvocAv;
|
||||
doc["rssi"] = rssi;
|
||||
// doc["hall"]= hall;
|
||||
doc["error"] = errorID; //По умолчанию 0
|
||||
doc["time"] = now();
|
||||
|
||||
char resultString[200];
|
||||
|
|
@ -595,6 +683,7 @@ void SendMqttReq()
|
|||
{
|
||||
MqttClient.publish(finishTopic.c_str(), resultString);
|
||||
//Serial.println("SentToTopic - ok");
|
||||
errorID=0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -622,17 +711,19 @@ void reconnectMqtt()
|
|||
|
||||
if (MqttClient.connect(clientId))
|
||||
{
|
||||
String finishTopic = "";
|
||||
finishTopic = String(topicName) + "/" + macc;
|
||||
MqttClient.publish(finishTopic.c_str(), "Reconnect NOW");
|
||||
Serial.print("Connect MQTT OK");
|
||||
//String finishTopic = "";
|
||||
// finishTopic = String(topicName) + "/" + macc;
|
||||
//MqttClient.publish(finishTopic.c_str(), "Reconnect NOW");
|
||||
|
||||
Serial.println("Reconnect NOW");
|
||||
errorID=8;
|
||||
// client.subscribe("inTopic");
|
||||
mqttSendFlag = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
Serial.print("failed, rc=");
|
||||
Serial.print(MqttClient.state());
|
||||
Serial.print("failed сonnect to MQTT, rc=");
|
||||
Serial.println(MqttClient.state());
|
||||
mqttSendFlag = false;
|
||||
delay(1000);
|
||||
}
|
||||
|
|
@ -666,10 +757,9 @@ void loop()
|
|||
if (millis() - timingReqSensor > nextReqSensor)
|
||||
{
|
||||
reqSensorData();
|
||||
|
||||
ledset('b', true);
|
||||
// Serial.print("reqSensorData() - ");
|
||||
// Serial.println(millis());
|
||||
|
||||
timingReqSensor = millis();
|
||||
}
|
||||
|
||||
|
|
@ -677,6 +767,7 @@ void loop()
|
|||
if (millis() - timingSendMqtt > nextMqttSend)
|
||||
{
|
||||
SendMqttReq();
|
||||
ledset('g', true);
|
||||
timingSendMqtt = millis();
|
||||
}
|
||||
|
||||
|
|
@ -684,6 +775,13 @@ void loop()
|
|||
if (!MqttClient.connected())
|
||||
{
|
||||
reconnectMqtt();
|
||||
ledset('w', true);
|
||||
}
|
||||
|
||||
// Serial.println("=============");
|
||||
// rssi = WiFi.RSSI();
|
||||
// Serial.println(rssi);
|
||||
// Serial.println("=============");
|
||||
|
||||
MqttClient.loop();
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -0,0 +1,5 @@
|
|||
[.ShellClassInfo]
|
||||
InfoTip=Ê ýòîé ïàïêå îòêðûò ñîâìåñòíûé äîñòóï â Èíòåðíåòå.
|
||||
IconFile=C:\Program Files\Google\Drive\googledrivesync.exe
|
||||
IconIndex=16
|
||||
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
[.ShellClassInfo]
|
||||
InfoTip=Ê ýòîé ïàïêå îòêðûò ñîâìåñòíûé äîñòóï â Èíòåðíåòå.
|
||||
IconFile=C:\Program Files\Google\Drive\googledrivesync.exe
|
||||
IconIndex=16
|
||||
|
||||
Binary file not shown.
|
|
@ -0,0 +1,5 @@
|
|||
[.ShellClassInfo]
|
||||
InfoTip=Ê ýòîé ïàïêå îòêðûò ñîâìåñòíûé äîñòóï â Èíòåðíåòå.
|
||||
IconFile=C:\Program Files\Google\Drive\googledrivesync.exe
|
||||
IconIndex=16
|
||||
|
||||
Loading…
Reference in New Issue