some change

This commit is contained in:
Dmitry Borisenko
2020-05-19 21:13:54 +02:00
parent 07f439b900
commit 3ea2509b6d
11 changed files with 19 additions and 21 deletions

View File

@@ -474,16 +474,16 @@ void servoSet() {
}
void serialBegin() {
String s_speed = sCmd.next();
//String s_speed = sCmd.next();
//String rxPin = sCmd.next();
//String txPin = sCmd.next();
//SoftwareSerial mySerial(rxPin.toInt(), txPin.toInt());
mySerial.begin(s_speed.toInt());
//mySerial.begin(s_speed.toInt());
}
void serialWrite() {
String text = sCmd.next();
mySerial.println(text);
//String text = sCmd.next();
//mySerial.println(text);
}
//====================================================================================================================================================
/*

View File

@@ -62,9 +62,9 @@ void Device_init() {
bme280H_value_name = "";
bme280A_value_name = "";
//int array_sz = sizeof(sensors_reading_map) / sizeof(sensors_reading_map[0]);
int array_sz = sizeof(sensors_reading_map) / sizeof(sensors_reading_map[0]);
for (int i = 0; i <= 14; i++) {
for (int i = 0; i <= array_sz; i++) {
sensors_reading_map[i] = 0;
}

View File

@@ -1,5 +1,5 @@
//===============================================Логирование============================================================
//logging temp1 1 10 fast Температура Датчики 2
//logging temp1 1 10 Температура Датчики 2
void logging() {
String value_name = sCmd.next();
String period_min = sCmd.next();

View File

@@ -375,7 +375,7 @@ void dhtD_reading() {
Serial.println("[i] sensor 'dhtDewpoint' data: " + String(value));
}
}
//=========================================i2c bus esp8266 scl-4 sda-5 ====================================================================
//=========================================================================================================================================
//=========================================Модуль сенсоров bmp280==========================================================================
//bmp280T temp1 0x76 Температура#bmp280 Датчики any-data 1

View File

@@ -11,7 +11,6 @@ void Time_Init() {
request->send(200, "text/text", "OK"); // отправляем ответ о выполнении
});
ts.add(TIME_SYNC, 30000, [&](void*) {
time_check();
}, nullptr, true);
@@ -25,11 +24,11 @@ void time_check() {
}
void reconfigTime() {
if (WiFi.status() == WL_CONNECTED) {
if (WiFi.status() == WL_CONNECTED) {
String ntp = jsonRead(configSetup, "ntp");
configTime(0, 0, ntp.c_str());
configTime(0, 0, ntp.c_str());
int i = 0;
Serial.println("[i] Awaiting for time ");
Serial.println("[i] Awaiting for time ");
#ifdef ESP32
struct tm timeinfo;
while (!getLocalTime(&timeinfo) && i <= 4) {
@@ -39,11 +38,11 @@ void reconfigTime() {
}
#endif
#ifdef ESP8266
// while (!time(nullptr) && i < 4) {
// Serial.print(".");
// i++;
delay(2000);
// }
//while (!time(nullptr) && i < 4) {
// Serial.print(".");
// i++;
delay(2000);
//}
#endif
if (GetTimeUnix() != "failed") {
Serial.print("[V] Time synchronized = ");

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

6
set.h
View File

@@ -1,5 +1,5 @@
//===============FIRMWARE SETTINGS=====================================
String firmware_version = "2.3.3g";
String firmware_version = "2.3.3";
boolean mb_4_of_memory = true;
//#define OTA_enable
//#define MDNS_enable
@@ -116,8 +116,8 @@ Adafruit_Sensor *bme_temp = bme.getTemperatureSensor();
Adafruit_Sensor *bme_pressure = bme.getPressureSensor();
Adafruit_Sensor *bme_humidity = bme.getHumiditySensor();
#include <SoftwareSerial.h>
SoftwareSerial mySerial(14, 12);
//#include <SoftwareSerial.h>
//SoftwareSerial mySerial(14, 12);
//===============FIRMWARE VARS========================
boolean just_load = true;
const char* hostName = "IoT Manager";

View File

@@ -87,7 +87,6 @@ void handleUdp() {
if (received_udp_line.indexOf("mqttServer") >= 0) {
udp_data_parse = true;
}
}
}
}