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

compilation fix, motor driver fix

Browse Source
This commit is contained in:
Andrey Klimov
2021-04-02 02:37:35 +03:00
parent 3d03aa661d
commit 0474c0ac48
2 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lighthub/modules/out_modbus.cpp
View File

@@ -127,7 +127,14 @@ bool out_Modbus::getConfig()
if (baudObj && baudObj->type == aJson_Int && baudObj->valueint) store->baud = baudObj->valueint; if (baudObj && baudObj->type == aJson_Int && baudObj->valueint) store->baud = baudObj->valueint;
else store->baud = 9600; else store->baud = 9600;
modbusSerial.begin(store->baud, store->serialParam); #if defined (__SAM3X8E__)
modbusSerial.begin(store->baud, static_cast <USARTClass::USARTModes> (store->serialParam));
#elif defined (ARDUINO_ARCH_ESP8266)
modbusSerial.begin(store->baud, static_cast <SerialConfig>(store->serialParam));
#else
modbusSerial.begin(store->baud, (store->serialParam));
#endif
aJsonObject * pollObj=aJson.getObjectItem(templateObj, "poll"); aJsonObject * pollObj=aJson.getObjectItem(templateObj, "poll");
if (pollObj && pollObj->type == aJson_Object) if (pollObj && pollObj->type == aJson_Object)
{ {

38
lighthub/modules/out_motor.cpp
View File

@@ -85,7 +85,17 @@ return driverStatus;
int out_Motor::isActive() int out_Motor::isActive()
{ {
return item->getVal(); itemCmd st;
switch (item->getCmd())
{
case CMD_OFF:
case CMD_HALT:
return 0;
break;
default:
st.loadItem(item);
return st.getPercents();
}
} }
int out_Motor::Poll(short cause) int out_Motor::Poll(short cause)
@@ -114,7 +124,7 @@ switch (item->getCmd())
{ {
case CMD_ON: case CMD_ON:
case CMD_XON: case CMD_XON:
if (targetPos<15) targetPos=100; //if (targetPos<15) targetPos=100;
break; break;
@@ -292,30 +302,6 @@ case S_CMD:
switch (cmd.getCmd()) switch (cmd.getCmd())
{ {
case CMD_ON: case CMD_ON:
/*
//retrive stored values
if (st.loadItem(item))
{
if (st.getPercents() && (st.getPercents()<MIN_VOLUME))
{ //Volume too low
st.Percents(INIT_VOLUME);
st.saveItem(item);
item->SendStatus(SEND_COMMAND | SEND_PARAMETERS);
}
debugSerial<<F("Restored: ")<<st.getPercents()<<endl;
}
else
{
debugSerial<<F(": No stored values - default\n");
// Store
st.setDefault();
st.saveItem(item);
//st=100;
//item->setVal(st);
item->SendStatus(SEND_COMMAND | SEND_PARAMETERS );
}
*/
if (item->getExt()) item->setExt(millisNZ()); //Extend motor time if (item->getExt()) item->setExt(millisNZ()); //Extend motor time
return 1; return 1;