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

DMX flickering bug fixed, RGB on PWM

Browse Source
This commit is contained in:
Andrey Klimov
2020-12-09 04:03:18 +03:00
parent 0055ad0463
commit 54d22620b0
4 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lighthub/dmx.cpp
View File

@@ -22,6 +22,7 @@ e-mail anklimov@gmail.com
//#include <DMXSerial.h> //#include <DMXSerial.h>
#include "options.h" #include "options.h"
#include "item.h" #include "item.h"
#include "main.h"
#ifdef _dmxin #ifdef _dmxin
#if defined(ARDUINO_ARCH_AVR) #if defined(ARDUINO_ARCH_AVR)
@@ -277,17 +278,17 @@ void DMXOUT_propagate()
for(int i=1;i<=DMXOUT_Channels;i++) for(int i=1;i<=DMXOUT_Channels;i++)
{ {
uint8_t currLevel=dmxout.getTx(i); uint8_t currLevel=dmxout.getTx(i);
uint16_t delta = currLevel-DMXinterimBuf[i-1]; int32_t delta = currLevel-DMXinterimBuf[i-1];
if (delta) if (delta)
{ {
uint16_t step = abs(delta) >> 4; uint16_t step = abs(delta) >> 4;
if (!step) step=1; if (!step) step=1;
if (delta<0) if (delta<0)
DmxWrite2(i,currLevel+step); {DmxWrite2(i,currLevel+step);debugSerial<<"<";}
if (delta>0) if (delta>0)
DmxWrite2(i,currLevel-step); {DmxWrite2(i,currLevel-step);debugSerial<<">";}
} }
} }
checkTimestamp=now+DMX_SMOOTH_DELAY; checkTimestamp=now+DMX_SMOOTH_DELAY;

6
lighthub/main.cpp
View File

@@ -712,7 +712,7 @@ void ip_ready_config_loaded_connecting_to_broker() {
return; return;
} }
if (!mqttArr || (n = aJson.getArraySize(mqttArr) < 2)) //At least device name and broker IP must be configured if (!mqttArr || ((n = aJson.getArraySize(mqttArr)) < 2)) //At least device name and broker IP must be configured
{ {
lanStatus = READ_RE_CONFIG; lanStatus = READ_RE_CONFIG;
return; return;
@@ -721,7 +721,7 @@ void ip_ready_config_loaded_connecting_to_broker() {
deviceName = getStringFromConfig(mqttArr, 0); deviceName = getStringFromConfig(mqttArr, 0);
infoSerial<<F("Device Name:")<<deviceName<<endl; infoSerial<<F("Device Name:")<<deviceName<<endl;
debugSerial<<F("N:")<<n<<endl;
char *servername = getStringFromConfig(mqttArr, 1); char *servername = getStringFromConfig(mqttArr, 1);
if (n >= 3) port = aJson.getArrayItem(mqttArr, 2)->valueint; if (n >= 3) port = aJson.getArrayItem(mqttArr, 2)->valueint;
@@ -729,7 +729,7 @@ void ip_ready_config_loaded_connecting_to_broker() {
if (!loadFlash(OFFSET_MQTT_PWD, passwordBuf, sizeof(passwordBuf)) && (n >= 5)) if (!loadFlash(OFFSET_MQTT_PWD, passwordBuf, sizeof(passwordBuf)) && (n >= 5))
{ {
password = getStringFromConfig(mqttArr, 4); password = getStringFromConfig(mqttArr, 4);
infoSerial<<F("Using MQTT password from config"); infoSerial<<F("Using MQTT password from config")<<endl;
} }
mqttClient.setServer(servername, port); mqttClient.setServer(servername, port);

4
lighthub/modules/out_modbus.cpp
View File

@@ -358,8 +358,8 @@ if (store->pollingRegisters && !modbusBusy && (Status() == CST_INITIALIZED) && i
debugSerial<<F("endPoll ")<< item->itemArr->name << endl; debugSerial<<F("endPoll ")<< item->itemArr->name << endl;
//Non blocking waiting to release line //Non blocking waiting to release line
uint32_t time = millis()+50; uint32_t time = millis();
while (millis()<time) while (!isTimeOver(time,millis(),50))
modbusIdle(); modbusIdle();
modbusBusy =0; modbusBusy =0;

22
lighthub/modules/out_pwm.cpp
View File

@@ -102,10 +102,14 @@ int out_pwm::getChanType()
switch (numArgs) switch (numArgs)
{ {
case 3: case 3:
debugSerial<<F("RGB PWM")<<endl;
return CH_RGB; return CH_RGB;
case 4: case 4:
debugSerial<<F("RGBW PWM")<<endl;
return CH_RGBW; return CH_RGBW;
default: default:
debugSerial<<item->itemType<<F(" PWM")<<endl;
return item->itemType; return item->itemType;
} }
} }
@@ -118,6 +122,7 @@ if (!item || !iaddr || !show) return 0;
bool inverse = (item->getArg()<0); bool inverse = (item->getArg()<0);
short cType = getChanType(); short cType = getChanType();
uint8_t storageType;
switch (cmd.getCmd()){ switch (cmd.getCmd()){
case CMD_OFF: case CMD_OFF:
@@ -125,14 +130,27 @@ switch (cmd.getCmd()){
break; break;
} }
if (cType=CH_PWM)
switch (cType)
{
case CH_PWM:
{ short k; { short k;
analogWrite(iaddr, k=cmd.getPercents255(inverse)); analogWrite(iaddr, k=cmd.getPercents255(inverse));
debugSerial<<F("Pin:")<<iaddr<<F("=")<<k<<endl; debugSerial<<F("Pin:")<<iaddr<<F("=")<<k<<endl;
return 1; return 1;
} }
case CH_RGB:
storageType=ST_RGB;
break;
case CH_RGBW:
storageType=ST_RGBW;
break;
default:
storageType=ST_PERCENTS;
}
itemCmd st(storageType,CMD_VOID);
itemCmd st(ST_RGB,CMD_VOID);
st.assignFrom(cmd); st.assignFrom(cmd);
switch (cType) switch (cType)