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 IN fix (rollback to 2021)

Browse Source
This commit is contained in:
Andrey
2023-11-20 01:13:25 +03:00
parent 6e283e32db
commit 454b88fbbf
1 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lighthub/dmx.cpp
View File

@@ -127,11 +127,14 @@ void DMXSemiImmediateUpdate(short tch,short trh, int val)
void DMXput(void) void DMXput(void)
{ {
if (!DMXin) return; if (!DMXin) return;
for (short tch=0; tch<=3 ; tch++) for (short tch=0; tch<=3 ; tch++)
{ {
short base = tch*4; short base = tch*4;
DMXImmediateUpdate(tch,DMXin[base],DMXin[base+1],DMXin[base+2],DMXin[base+3]); DMXImmediateUpdate(tch,DMXin[base],DMXin[base+1],DMXin[base+2],DMXin[base+3]);
} }
}; };
extern volatile uint8_t timerHandlerBusy; extern volatile uint8_t timerHandlerBusy;
@@ -139,7 +142,7 @@ extern volatile uint8_t timerHandlerBusy;
#if defined(_dmxin) #if defined(_dmxin)
volatile int DMXinDoublecheck=0; volatile int DMXinDoublecheck=0;
#endif #endif
/*
void DMXUpdate(void) void DMXUpdate(void)
{ {
#if defined(_dmxin) #if defined(_dmxin)
@@ -181,7 +184,40 @@ for (short tch=0; tch<=3 ; tch++)
//Serial.print(D_State,BIN);Serial.println(); //Serial.print(D_State,BIN);Serial.println();
#endif #endif
} }
*/
void DMXUpdate(void)
{
#if defined(_dmxin)
int t;
if(!DMXin) return;
#if defined(__SAM3X8E__)
if (dmxin.getRxLength()<16) return;
#endif
for (short tch=0; tch<=3 ; tch++)
{
short base = tch*4;
bool updated = 0;
for (short trh=0; trh<4 ; trh++)
if ((t=dmxin.read(base+trh+1)) != DMXin[base+trh])
{
D_State |= (1<<tch);
updated=1;
//Serial.print("onContactChanged :"); Serial.print(DMXin[tch*4+trh]); Serial.print(" => "); Serial.print(t);Serial.println();
DMXin[base+trh]=t;
//DMXImmediateUpdate(tch,trh,t);
//break;
}
if (updated)
{
DMXImmediateUpdate(tch,DMXin[base],DMXin[base+1],DMXin[base+2],DMXin[base+3]);
D_checkT=millisNZ();
}
}
//Serial.print(D_State,BIN);Serial.println();
#endif
}
void DMXCheck(void) void DMXCheck(void)
{ {
@@ -209,7 +245,7 @@ D_checkT=0;
// Here code for network update // Here code for network update
//int ch = 0; //int ch = 0;
DMXput(); //DMXput();
#ifdef _dmxout #ifdef _dmxout
for (int i=1; i<17; i++) {debugSerial.print(dmxin.read(i));debugSerial.print(";");} for (int i=1; i<17; i++) {debugSerial.print(dmxin.read(i));debugSerial.print(";");}