andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-06 11:49:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

rebase on upstream master

Browse Source
This commit is contained in:
livello
2018-03-19 12:59:08 +03:00
parent 72366a6cc2 85490e0d15
commit f53181805e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lighthub/main.cpp
View File

@@ -136,7 +136,7 @@ EthernetClient ethClient;
#define QUOTE(x) Q(x) #define QUOTE(x) Q(x)
#ifndef PIO_SRC_REV #ifndef PIO_SRC_REV
#define PIO_SRC_REV v0.97 #define PIO_SRC_REV v0.98
#endif #endif
@@ -148,7 +148,9 @@ EthernetClient ethClient;
extern Artnet *artnet; extern Artnet *artnet;
#endif #endif
#ifdef _sd
#include "sd_card_w5100.h" #include "sd_card_w5100.h"
#endif
// Hardcoded definitions // Hardcoded definitions
//Thermostate histeresys //Thermostate histeresys
@@ -161,7 +163,7 @@ extern Artnet *artnet;
#define inprefix "/myhome/in/" #define inprefix "/myhome/in/"
const char outprefix[] PROGMEM = "/myhome/s_out/"; const char outprefix[] PROGMEM = "/myhome/s_out/";
const char subprefix[] PROGMEM = "/myhome/in/#"; #define subprefix "/myhome/in/#"
aJsonObject *root = NULL; aJsonObject *root = NULL;
aJsonObject *items = NULL; aJsonObject *items = NULL;
@@ -767,8 +769,8 @@ int getConfig (int arg_cnt, char **args)
int returnCode =0; int returnCode =0;
char ch; char ch;
char URI [32]; char URI [40];
char server[sizeof(CONFIG_SERVER)+21] = CONFIG_SERVER; char server[32] = CONFIG_SERVER;
if (arg_cnt>0) { if (arg_cnt>0) {
strncpy(server,args[1],sizeof(server)-1); strncpy(server,args[1],sizeof(server)-1);
saveFlash(0,server); saveFlash(0,server);
@@ -906,7 +908,10 @@ void setup_main() {
Serial.print(F("\nLazyhome.ru LightHub controller ")); Serial.print(F("\nLazyhome.ru LightHub controller "));
Serial.println(F(QUOTE(PIO_SRC_REV))); Serial.println(F(QUOTE(PIO_SRC_REV)));
#ifdef _sd
sd_card_w5100_setup(); sd_card_w5100_setup();
#endif
cmdAdd("help", _handleHelp); cmdAdd("help", _handleHelp);
cmdAdd("save", _saveConfig); cmdAdd("save", _saveConfig);