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

refactoring. help cmd improved. Removed newline from freeMem periodical print.

Browse Source
This commit is contained in:
livello
2018-03-22 20:42:21 +03:00
parent 5e21cd03cc
commit 4d7f6ca875
6 changed files with 1271 additions and 1243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lighthub/inputs.cpp
View File

@@ -23,7 +23,7 @@ e-mail anklimov@gmail.com
#include "item.h"
#include <PubSubClient.h>
extern PubSubClient client;
extern PubSubClient mqttClient;
Input::Input(char * name) //Constructor
{
@@ -121,11 +121,11 @@ void Input::Changed (int val)
if (val)
{ //send set command
if (!scmd) client.publish(emit->valuestring,"ON"); else if (strlen(scmd->valuestring)) client.publish(emit->valuestring,scmd->valuestring);
if (!scmd) mqttClient.publish(emit->valuestring,"ON"); else if (strlen(scmd->valuestring)) mqttClient.publish(emit->valuestring,scmd->valuestring);
}
else
{ //send reset command
if (!rcmd) client.publish(emit->valuestring,"OFF"); else if (strlen(rcmd->valuestring)) client.publish(emit->valuestring,rcmd->valuestring);
if (!rcmd) mqttClient.publish(emit->valuestring,"OFF"); else if (strlen(rcmd->valuestring)) mqttClient.publish(emit->valuestring,rcmd->valuestring);
}
}

1468
lighthub/item.cpp
View File

File diff suppressed because it is too large Load Diff

773
lighthub/main.cpp
View File

File diff suppressed because it is too large Load Diff

12
lighthub/main.h
View File

@@ -25,14 +25,14 @@ void Changed (int i, DeviceAddress addr, int val);
void modbusIdle(void);
void _handleHelp(int arg_cnt, char **args);
void _kill(int arg_cnt, char **args);
void parseConfig();
void parseConfigFromParsedJSON();
void _loadConfig (int arg_cnt, char **args);
int loadConfig (int arg_cnt, char **args);
void _mqttConfigReq (int arg_cnt, char **args);
int mqttConfigReq (int arg_cnt, char **args);
int loadConfigFromEEPROM(int arg_cnt, char **args);
void _mqttConfigRequest(int arg_cnt, char **args);
int mqttConfigRequest(int arg_cnt, char **args);
int mqttConfigResp (char * as);
void _saveConfig(int arg_cnt, char **args);
void _setConfig(int arg_cnt, char **args);
void _saveConfigToEEPROM(int arg_cnt, char **args);
void _setMacAddress(int arg_cnt, char **args);
void _getConfig(int arg_cnt, char **args);
void printBool (bool arg);
void saveFlash(short n, char* str);

251
lighthub/owTerm.cpp
View File

@@ -22,67 +22,74 @@ e-mail anklimov@gmail.com
#include "owTerm.h"
#include <Arduino.h>
#include "utils.h"
#include "options.h"
OneWire *net = NULL;
// Pass our oneWire reference to Dallas Temperature.
//DallasTemperature sensors(&net);
DeviceAddress *term = NULL;
DeviceAddress *term = NULL;
//int *regs = NULL;
uint16_t *wstat = NULL;
uint16_t *wstat = NULL;
DallasTemperature *sensors = NULL;
short si=0;
short si = 0;
int t_count = 0;
unsigned long owTimer=0;
unsigned long owTimer = 0;
owChangedType owChanged;
owChangedType owChanged;
int owUpdate()
{
unsigned long finish = millis() + 5000;
short sr;
//net.setStrongPullup();
Serial.println(F("Searching"));
if (net) net->reset_search();
for (short i=0;i<t_count;i++) wstat[i]&=~SW_FIND; //absent
int owUpdate() {
unsigned long finish = millis() + 5000;
short sr;
while (net && net->wireSearch(term[t_count])>0 && (t_count<t_max) && finish > millis ())
{ short ifind=-1;
if (net->crc8(term[t_count], 7) == term[t_count][7])
{
for (short i=0;i<t_count;i++) if (!memcmp(term[i],term[t_count],8)) {ifind=i;wstat[i]|=SW_FIND;
Serial.print(F(" Node:"));PrintBytes(term[t_count],8);Serial.println(F(" alive"));
break;}; //alive
if (ifind<0 && sensors)
{
wstat[t_count]=SW_FIND; //Newly detected
Serial.print(F("dev#"));Serial.print(t_count);Serial.print(F(" Addr:"));PrintBytes(term[t_count],8);
Serial.println();
if (term[t_count][0]==0x28)
{
//net.setStrongPullup();
Serial.println(F("Searching"));
if (net) net->reset_search();
for (short i = 0; i < t_count; i++) wstat[i] &= ~SW_FIND; //absent
while (net && net->wireSearch(term[t_count]) > 0 && (t_count < t_max) && finish > millis()) {
short ifind = -1;
if (net->crc8(term[t_count], 7) == term[t_count][7]) {
for (short i = 0; i < t_count; i++)
if (!memcmp(term[i], term[t_count], 8)) {
ifind = i;
wstat[i] |= SW_FIND;
Serial.print(F(" Node:"));
PrintBytes(term[t_count], 8);
Serial.println(F(" alive"));
break;
}; //alive
if (ifind < 0 && sensors) {
wstat[t_count] = SW_FIND; //Newly detected
Serial.print(F("dev#"));
Serial.print(t_count);
Serial.print(F(" Addr:"));
PrintBytes(term[t_count], 8);
Serial.println();
if (term[t_count][0] == 0x28) {
sensors->setResolution(term[t_count], TEMPERATURE_PRECISION);
net->setStrongPullup();
// sensors.requestTemperaturesByAddress(term[t_count]);
}
t_count++;}
}//if
} //while
// sensors.requestTemperaturesByAddress(term[t_count]);
}
t_count++;
}
}//if
} //while
Serial.print(F("1-wire count: "));
Serial.println(t_count);
Serial.print(F("1-wire count: "));
Serial.println(t_count);
}
int owSetup(owChangedType owCh) {
//// todo - move memory allocation to here
//// todo - move memory allocation to here
#ifdef DS2482_100_I2C_TO_1W_BRIDGE
Serial.println(F("DS2482_100_I2C_TO_1W_BRIDGE init"));
net = new OneWire;
net = new OneWire;
#else
Serial.print(F("One wire setup on PIN:"));
Serial.println(QUOTE(USE_1W_PIN));
@@ -92,110 +99,104 @@ net = new OneWire (USE_1W_PIN);
// Pass our oneWire reference to Dallas Temperature.
sensors = new DallasTemperature (net);
sensors = new DallasTemperature(net);
term = new DeviceAddress[t_max];
term = new DeviceAddress[t_max];
//regs = new int [t_max];
wstat = new uint16_t [t_max];
wstat = new uint16_t[t_max];
#ifdef DS2482_100_I2C_TO_1W_BRIDGE
Wire.begin();
if (net->checkPresence())
{
Serial.println(F("DS2482-100 present"));
net->deviceReset();
#ifdef APU_OFF
Serial.println(F("APU off"));
#else
net->setActivePullup();
#endif
Serial.println(F("\tChecking for 1-Wire devices..."));
if (net->wireReset())
Serial.println(F("\tReset done"));
sensors->begin();
owChanged=owCh;
//owUpdate();
//Serial.println(F("\t1-w Updated"));
sensors->setWaitForConversion(false);
#ifdef DS2482_100_I2C_TO_1W_BRIDGE
Wire.begin();
if (net->checkPresence()) {
Serial.println(F("DS2482-100 present"));
net->deviceReset();
#ifdef APU_OFF
Serial.println(F("APU off"));
#else
net->setActivePullup();
#endif
return true;
}
#endif
return false;
// IC Default 9 bit. If you have troubles consider upping it 12. Ups the delay giving the IC more time to process the temperature measurement
delay(500);
Serial.println(F("\tChecking for 1-Wire devices..."));
if (net->wireReset())
Serial.println(F("\tReset done"));
sensors->begin();
owChanged = owCh;
//owUpdate();
//Serial.println(F("\t1-w Updated"));
sensors->setWaitForConversion(false);
return true;
}
#endif
return false;
// IC Default 9 bit. If you have troubles consider upping it 12. Ups the delay giving the IC more time to process the temperature measurement
delay(500);
}
int sensors_loop(void)
{
if (!sensors) return -1;
if (si>=t_count)
{
owUpdate(); //every check circle - scan for new devices
si=0;
return 8000;
}
int sensors_loop(void) {
if (!sensors) return -1;
if (si >= t_count) {
owUpdate(); //every check circle - scan for new devices
si = 0;
return 8000;
}
int t;
switch (term[si][0]) {
case 0x28: // Thermomerer
t = sensors->getTempC(term[si]);//*10.0;
//Serial.println("o");
if (owChanged) owChanged(si, term[si], t);
sensors->requestTemperaturesByAddress(term[si]);
si++;
return 2500;
// default
// return sensors_ext();
} //switch
si++;
return check_circle;
int t;
switch (term[si][0]){
case 0x28: // Thermomerer
t=sensors->getTempC(term[si]);//*10.0;
//Serial.println("o");
if (owChanged) owChanged(si,term[si],t);
sensors->requestTemperaturesByAddress(term[si]);
si++;
return 2500;
// default
// return sensors_ext();
} //switch
si++;
return check_circle;
}
void owLoop()
{
if (millis() >=owTimer) owTimer=millis()+sensors_loop();
void owLoop() {
if (millis() >= owTimer) owTimer = millis() + sensors_loop();
}
int owFind(DeviceAddress addr)
{
for (short i=0;i<t_count;i++) if (!memcmp(term[i],addr,8)) return i;//find
return -1;
int owFind(DeviceAddress addr) {
for (short i = 0; i < t_count; i++) if (!memcmp(term[i], addr, 8)) return i;//find
return -1;
}
void owAdd (DeviceAddress addr)
{
wstat[t_count]=SW_FIND; //Newly detected
memcpy (term[t_count],addr,8);
//term[t_count]=addr;
Serial.print(F("dev#"));Serial.print(t_count);Serial.print(F(" Addr:"));PrintBytes(term[t_count],8);
Serial.println();
if (term[t_count][0]==0x28)
{
sensors->setResolution(term[t_count], TEMPERATURE_PRECISION);
net->setStrongPullup();
// sensors.requestTemperaturesByAddress(term[t_count]);
}
t_count++;
void owAdd(DeviceAddress addr) {
wstat[t_count] = SW_FIND; //Newly detected
memcpy(term[t_count], addr, 8);
//term[t_count]=addr;
Serial.print(F("dev#"));
Serial.print(t_count);
Serial.print(F(" Addr:"));
PrintBytes(term[t_count], 8);
Serial.println();
if (term[t_count][0] == 0x28) {
sensors->setResolution(term[t_count], TEMPERATURE_PRECISION);
net->setStrongPullup();
// sensors.requestTemperaturesByAddress(term[t_count]);
}
t_count++;
}

4
platformio.ini
View File

@@ -10,8 +10,8 @@
[platformio]
src_dir = lighthub
env_default =
; megaatmega2560
due
megaatmega2560
; due
[env:due]
platform = atmelsam