iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

changed json var names to more visible

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-06-19 14:50:34 +02:00
parent e6637dcd69
commit 48ba3c99dd
18 changed files with 428 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/Global.h
View File

@@ -61,9 +61,9 @@ extern AsyncWebServer server;
extern boolean just_load;
extern const char *hostName;
extern String configSetup;
extern String configJson;
extern String optionJson;
extern String configSetupJson; //все настройки
extern String configLiveJson; //все данные с датчиков (связан с mqtt)
extern String configOptionJson; //для трансфера
extern String chipID;
extern String prex;
@@ -74,7 +74,8 @@ extern String order_loop;
extern String analog_value_names_list;
extern int enter_to_analog_counter;
extern String level_value_name;
extern String levelPr_value_name;
extern String ultrasonicCm_value_name;
extern String dhtT_value_name;
extern String dhtH_value_name;
@@ -228,8 +229,8 @@ extern void text();
extern void textSet();
extern void mqttOrderSend();
extern void httpOrderSend();
extern void firmware();
extern void update_firmware();
extern void firmwareVersion();
extern void firmwareUpdate();
extern void Scenario_init();
extern void txtExecution(String file);
extern void stringExecution(String str);
@@ -295,9 +296,11 @@ extern String add_set(String param_name);
// И как раз тут хорошо просто в Sensors.h это пихать - а не в один здоровенный ФАЙЛ
extern void sensors_init();
extern void level();
extern void levelPr();
extern void ultrasonicCm();
extern void level_reading();
extern void analog();
extern void analog_reading1();
extern void analog_reading2();

4
include/push_pushingbox.h
View File

@@ -5,7 +5,7 @@
void Push_init() {
server.on("/pushingboxDate", HTTP_GET, [](AsyncWebServerRequest* request) {
if (request->hasArg("pushingbox_id")) {
jsonWriteStr(configSetup, "pushingbox_id", request->getParam("pushingbox_id")->value());
jsonWriteStr(configSetupJson, "pushingbox_id", request->getParam("pushingbox_id")->value());
}
saveConfig();
@@ -23,7 +23,7 @@ inline void pushControl() {
static String body_old;
const char* logServer = "api.pushingbox.com";
String deviceId = jsonReadStr(configSetup, "pushingbox_id");
String deviceId = jsonReadStr(configSetupJson, "pushingbox_id");
Serial.println("- starting client");