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

noSerial option, DHT fix, 8266 slim to fit Sonoff

Browse Source
This commit is contained in:
Климов Андрей Николаевич
2022-12-16 17:14:59 +03:00
parent a974290389
commit b06dad9395
25 changed files with 705 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lighthub/flashstream.cpp
View File

@@ -116,7 +116,7 @@ NRFFlashStorage EEPROM;
debugSerial<<(F(" Res:"))<<res<<endl;
return res;
};
void flashStream::close() {fs.close(); debugSerial<<filename<<" Closed\n";};
void flashStream::close() {fs.flush();fs.close(); debugSerial<<filename<<" Closed\n";};
void flashStream::flush() {fs.flush(); debugSerial<<filename<<" Flushed\n";};
size_t flashStream::write(uint8_t ch)
{

6
lighthub/inputs.cpp
View File

@@ -464,6 +464,8 @@ void Input::dht22Poll() {
#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
DHTesp dhtSensor;
dhtSensor.setup(pin, DHTesp::DHT22);
//pinMode(pin, INPUT_PULLUP);
//digitalWrite(pin, LOW); // Switch bus to receive data
TempAndHumidity dhtSensorData = dhtSensor.getTempAndHumidity();
float temp = roundf(dhtSensorData.temperature * 10) / 10;
float humidity = roundf(dhtSensorData.humidity);
@@ -479,8 +481,8 @@ debugSerial << F("IN:") << pin << F(" DHT22 type. T=") << temp << F("°C H=") <<
// New tyle unified activities
aJsonObject *actT = aJson.getObjectItem(inputObj, "temp");
aJsonObject *actH = aJson.getObjectItem(inputObj, "hum");
executeCommand(actT,-1,itemCmd(temp));
executeCommand(actH,-1,itemCmd(humidity));
if (!isnan(temp)) executeCommand(actT,-1,itemCmd(temp));
if (!isnan(humidity)) executeCommand(actH,-1,itemCmd(humidity));
//Legacy action conf - TODO - remove in further releases
aJsonObject *emit = aJson.getObjectItem(inputObj, "emit");

188
lighthub/main.cpp
View File

@@ -39,13 +39,26 @@ e-mail anklimov@gmail.com
Syslog udpSyslog(udpSyslogClient, SYSLOG_PROTO_BSD);
static char syslogDeviceHostname[16];
Streamlog debugSerial(&debugSerialPort,LOG_DEBUG,&udpSyslog);
Streamlog errorSerial(&debugSerialPort,LOG_ERROR,&udpSyslog,ledRED);
Streamlog infoSerial (&debugSerialPort,LOG_INFO,&udpSyslog);
#if defined(debugSerialPort)
Streamlog debugSerial(&debugSerialPort,LOG_DEBUG,&udpSyslog);
Streamlog errorSerial(&debugSerialPort,LOG_ERROR,&udpSyslog,ledRED);
Streamlog infoSerial (&debugSerialPort,LOG_INFO,&udpSyslog);
#else
Streamlog debugSerial(NULL,LOG_DEBUG,&udpSyslog);
Streamlog errorSerial(NULL,LOG_ERROR,&udpSyslog,ledRED);
Streamlog infoSerial (NULL,LOG_INFO,&udpSyslog);
#endif
#else
Streamlog debugSerial(&debugSerialPort,LOG_DEBUG);
Streamlog errorSerial(&debugSerialPort,LOG_ERROR, ledRED);
Streamlog infoSerial (&debugSerialPort,LOG_INFO);
#if defined(debugSerialPort)
Streamlog debugSerial(&debugSerialPort,LOG_DEBUG);
Streamlog errorSerial(&debugSerialPort,LOG_ERROR, ledRED);
Streamlog infoSerial (&debugSerialPort,LOG_INFO);
#else
Streamlog debugSerial(NULL,LOG_DEBUG);
Streamlog errorSerial(NULL,LOG_ERROR, ledRED);
Streamlog infoSerial (NULL,LOG_INFO);
#endif
#endif
flashStream sysConfStream;
@@ -400,12 +413,11 @@ if (lanStatus == RETAINING_COLLECTING)
{
if (mqttClient.isRetained())
{
pfxlen=inTopic(topic,T_BCST);
if (!pfxlen) pfxlen = inTopic(topic,T_DEV);
if (!pfxlen) return; // Not command topic ever
//itemName=topic+pfxlen;
//pfxlen=inTopic(topic,T_BCST); //Dont delete bcast topics (just skip on restore retaining)
//if (!pfxlen) pfxlen = inTopic(topic,T_DEV);
pfxlen = inTopic(topic,T_DEV);
if (!pfxlen) return; // Not command topic
if (strrchr(topic,'$')) return;
//if (itemName[0]=='$') return;// -6; //Skipping homie stuff
debugSerial<<F("CleanUp retained topic ")<<topic<<endl;
mqttClient.deleteTopic(topic);
}
@@ -585,6 +597,7 @@ lan_status lanLoop() {
if (isTimeOver(WiFiAwaitingTime,millis(),WIFI_TIMEOUT))
{
errorSerial<<F("\nProblem with WiFi!");
WiFi.reconnect();
return lanStatus = DO_REINIT;
}
#else
@@ -697,6 +710,19 @@ lan_status lanLoop() {
if (mqttClient.connected()) mqttClient.disconnect();
timerLanCheckTime = millis();// + 5000;
lanStatus = RECONNECT;
/*
#if defined(WIFI_ENABLE)
if (WiFi.status() != WL_CONNECTED)
{
infoSerial<<"Reconnecting WiFi"<<endl;
lanStatus = INITIAL_STATE;
WiFi.disconnect();
WiFi.reconnect();
}
#endif
*/
break;
case RECONNECT:
@@ -1002,7 +1028,7 @@ void ip_ready_config_loaded_connecting_to_broker() {
setTopic(buf,sizeof(buf),T_DEV);
strncat(buf, "#", sizeof(buf));
debugSerialPort.println(buf);
debugSerial.println(buf);
mqttClient.subscribe(buf);
//onMQTTConnect();
@@ -1500,28 +1526,7 @@ if (arg_cnt>1)
#else
sysConfStream.open(FN_CONFIG_JSON,'w');
#endif
/*
#if defined(__SAM3X8E__)
long configBufSize = min(MAX_JSON_CONF_SIZE,freeRam()-1024);
debugSerial<<"Allocate "<<configBufSize<<" bytes for buffer"<<endl;
char* outBuf = (char*) malloc(configBufSize);
if (!outBuf)
{
sysConfStream.close();
errorSerial<<"Can't allocate RAM"<<endl;
return 500;
}
infoSerial<<F("Saving config to EEPROM..")<<endl;
aJsonStringStream stringStream(NULL, outBuf, configBufSize-2);
aJson.print(root, &stringStream);
int len = strlen(outBuf);
outBuf[len++]= EOFchar;
infoSerial<<len<< F(" bytes collected")<<endl;
size_t res = sysConfStream.write((byte*) outBuf,len);
free (outBuf);
infoSerial<<res<< F(" bytes are saved to EEPROM")<<endl;
#else */
aJsonStream jsonEEPROMStream = aJsonStream(&sysConfStream);
infoSerial<<F("Saving config to EEPROM..");
aJson.print(root, &jsonEEPROMStream);
@@ -1995,13 +2000,113 @@ int16_t attachTimer(double microseconds, timerCallback callback, const char* Tim
}
#endif
#if defined(WIFI_ENABLE)
#if defined (ESP32)
void WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info)
{
debugSerial.printf("[WiFi-event] event: %d\n", event);
switch (event) {
case SYSTEM_EVENT_WIFI_READY:
debugSerial.println("WiFi interface ready");
break;
case SYSTEM_EVENT_SCAN_DONE:
debugSerial.println("Completed scan for access points");
break;
case SYSTEM_EVENT_STA_START:
debugSerial.println("WiFi client started");
break;
case SYSTEM_EVENT_STA_STOP:
debugSerial.println("WiFi client stopped");
//changeState(MYSTATE_OFFLINE);
break;
case SYSTEM_EVENT_STA_CONNECTED:
debugSerial.println("Connected to access point");
break;
case SYSTEM_EVENT_STA_DISCONNECTED:
debugSerial.println("Disconnected from WiFi access point");
WiFi.reconnect();
break;
case SYSTEM_EVENT_STA_AUTHMODE_CHANGE:
debugSerial.println("Authentication mode of access point has changed");
break;
case SYSTEM_EVENT_STA_GOT_IP:
debugSerial.print("Obtained IP address: ");
//Serial.println(WiFi.localIP());
//Serial.println("WiFi connected");
//Serial.print("IP address: ");
debugSerial.println(IPAddress(info.got_ip.ip_info.ip.addr));
//changeState(MYSTATE_ONLINE);
break;
case SYSTEM_EVENT_STA_LOST_IP:
debugSerial.println("Lost IP address and IP address is reset to 0");
//changeState(MYSTATE_OFFLINE);
break;
case SYSTEM_EVENT_STA_WPS_ER_SUCCESS:
debugSerial.println("WiFi Protected Setup (WPS): succeeded in enrollee mode");
break;
case SYSTEM_EVENT_STA_WPS_ER_FAILED:
debugSerial.println("WiFi Protected Setup (WPS): failed in enrollee mode");
break;
case SYSTEM_EVENT_STA_WPS_ER_TIMEOUT:
debugSerial.println("WiFi Protected Setup (WPS): timeout in enrollee mode");
break;
case SYSTEM_EVENT_STA_WPS_ER_PIN:
debugSerial.println("WiFi Protected Setup (WPS): pin code in enrollee mode");
break;
case SYSTEM_EVENT_AP_START:
debugSerial.println("WiFi access point started");
break;
case SYSTEM_EVENT_AP_STOP:
debugSerial.println("WiFi access point stopped");
break;
case SYSTEM_EVENT_AP_STACONNECTED:
debugSerial.println("Client connected");
break;
case SYSTEM_EVENT_AP_STADISCONNECTED:
debugSerial.println("Client disconnected");
break;
case SYSTEM_EVENT_AP_STAIPASSIGNED:
debugSerial.println("Assigned IP address to client");
break;
case SYSTEM_EVENT_AP_PROBEREQRECVED:
debugSerial.println("Received probe request");
break;
case SYSTEM_EVENT_GOT_IP6:
debugSerial.println("IPv6 is preferred");
break;
case SYSTEM_EVENT_ETH_START:
debugSerial.println("Ethernet started");
break;
case SYSTEM_EVENT_ETH_STOP:
debugSerial.println("Ethernet stopped");
break;
case SYSTEM_EVENT_ETH_CONNECTED:
debugSerial.println("Ethernet connected");
break;
case SYSTEM_EVENT_ETH_DISCONNECTED:
debugSerial.println("Ethernet disconnected");
break;
case SYSTEM_EVENT_ETH_GOT_IP:
debugSerial.println("Obtained IP address");
break;
default: break;
}
}
#endif
#endif
void setup_main() {
#if (SERIAL_BAUD)
debugSerialPort.begin(SERIAL_BAUD);
#if defined(debugSerialPort)
debugSerialPort.begin(SERIAL_BAUD);
#endif
#else
#if not defined (__SAM3X8E__)
#if not defined (__SAM3X8E__) && defined (debugSerialPort)
debugSerialPort.begin();
#endif
delay(1000);
@@ -2020,11 +2125,15 @@ void setup_main() {
if(SPIFFS.begin())
#endif
{
#if defined(debugSerialPort)
debugSerialPort.println("SPIFFS Initialize....ok");
#endif
}
else
{
#if defined(debugSerialPort)
debugSerialPort.println("SPIFFS Initialization...failed");
#endif
}
#endif
#else
@@ -2039,7 +2148,9 @@ void setup_main() {
if (!sysConf.isValidSysConf())
{
#if defined(debugSerialPort)
debugSerialPort.println(F("No valid EEPROM data. Initializing."));
#endif
sysConf.clear();
}
// scan_i2c_bus();
@@ -2092,6 +2203,11 @@ void setup_main() {
//#ifdef _artnet
// artnetSetup();
//#endif
#if defined(WIFI_ENABLE)
#if defined (ESP32)
WiFi.onEvent(WiFiEvent);
#endif
#endif
#if defined(WIFI_ENABLE) and not defined(WIFI_MANAGER_DISABLE)
// WiFiManager wifiManager;

15
lighthub/modules/in_ccs811_hdc1080.cpp
View File

@@ -21,16 +21,21 @@ static bool CCS811ready = false;
int in_ccs811::Setup()
{
if (CCS811ready) {debugSerial<<F("ccs811 is already initialized")<<endl; return 0;}
if (CCS811ready) {errorSerial<<F("ccs811 is already initialized")<<endl; return 0;}
#ifdef WAK_PIN
pinMode(WAK_PIN,OUTPUT);
digitalWrite(WAK_PIN,LOW);
#endif
debugSerial.println("CCS811 Init");
infoSerial.println("CCS811 Init");
#if defined (TWI_SCL) && defined (TWI_SDA)
Wire.begin(TWI_SDA,TWI_SCL); //Inialize I2C Harware
#else
Wire.begin(); //Inialize I2C Harware
#endif
Wire.setClock(4000);
//It is recommended to check return status on .begin(), but it is not
@@ -40,7 +45,7 @@ Wire.setClock(4000);
if (returnCode != CCS811Core::SENSOR_SUCCESS)
//if (returnCode != CCS811Core::CCS811_Stat_SUCCESS)
{
Serial.print("CCS811 Init error ");
errorSerial.print("CCS811 Init error ");
//debugSerial.println(ccs811.statusString(returnCode));
printDriverError(returnCode);
return 0;
@@ -116,8 +121,8 @@ if (reg!=0xff)
// New tyle unified activities
aJsonObject *actT = aJson.getObjectItem(in->inputObj, "temp");
aJsonObject *actH = aJson.getObjectItem(in->inputObj, "hum");
executeCommand(actT,-1,itemCmd(t));
executeCommand(actH,-1,itemCmd(h));
if (!isnan(t)) executeCommand(actT,-1,itemCmd(t));
if (!isnan(t)) executeCommand(actH,-1,itemCmd(h));
publish(t,"/T");
publish(h,"/H");

23
lighthub/modules/in_ccs811_hdc1080.h
View File

@@ -10,15 +10,22 @@
//#define CCS811_ADDR 0x5B //Default I2C Address
#define CCS811_ADDR 0x5A //Alternate I2C Address
#if defined (ARDUINO_ARCH_ESP8266)
#define twi_scl D1
#ifndef WAK_PIN
#define WAK_PIN D3
#endif
#if defined (ARDUINO_ARCH_ESP8266)
#if not defined (TWI_SCL) && defined (D1)
#define TWI_SCL D1
#endif
#if not defined (WAK_PIN) && defined (D3)
#define WAK_PIN D3
#endif
#if defined (TWI_SCL)
#define SCL_LOW() (GPES = (1 << TWI_SCL))
#define SCL_HIGH() (GPEC = (1 << TWI_SCL))
#define SCL_RESET
#endif
#define SCL_LOW() (GPES = (1 << twi_scl))
#define SCL_HIGH() (GPEC = (1 << twi_scl))
#define SCL_RESET
#endif
/*

2
lighthub/modules/out_multivent.cpp
View File

@@ -155,7 +155,7 @@ while (i)
case CMD_OFF:
cmd.Percents255(0);
}
if (cmdObj->valueint == CMD_ON && setObj->valueint<20)
if (isNotRetainingStatus() && (cmdObj->valueint == CMD_ON) && (setObj->valueint<20))
{
setObj->valueint=30;
cmd.Percents255(30);

5
lighthub/modules/out_pid.cpp
View File

@@ -181,7 +181,7 @@ if (store && store->pid && (Status() == CST_INITIALIZED) && item && (item->getCm
if (((abs(store->output-store->prevOut)>OUTPUT_TRESHOLD) || (item->getCmd() == CMD_ENABLE)) && !store->alarmArmed)
{
aJsonObject * oCmd = aJson.getArrayItem(item->itemArg, 1);
if (item->getCmd() == CMD_ENABLE)
if ((item->getCmd() == CMD_ENABLE) && (store->output>0.))
{
executeCommand(oCmd,-1,itemCmd().Cmd(CMD_ON));
item->setCmd(CMD_VOID);
@@ -349,7 +349,8 @@ case S_CMD:
case CMD_ENABLE:
item->setCmd(CMD_ENABLE);
item->SendStatus(SEND_COMMAND);
executeCommand(oCmd,-1,value);
executeCommand(oCmd,-1,value);
store->prevOut=-2.0;
return 1;
case CMD_DISABLE:

10
lighthub/options.h
View File

@@ -303,12 +303,14 @@
//#ifdef M5STACK
//#define debugSerial M5.Lcd
//#endif
#ifndef debugSerialPort
#define debugSerialPort Serial
#ifdef noSerial
#undef debugSerialPort
#else
#ifndef debugSerialPort
#define debugSerialPort Serial
#endif
#endif
#ifndef Wiz5500
#define W5100_ETHERNET_SHIELD
#else