mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into prerelease-14.3.0

This commit is contained in:
Theo Arends 2024-10-14 23:35:52 +02:00
parent 59409aedb2 3569a22dab
commit 55a6bc876b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tasmota/tasmota_xdrv_driver/xdrv_75_dali.ino
View File

@ -141,6 +141,7 @@ void DaliReceiveData(void) {
while (ESP.getCycleCount() < wait); while (ESP.getCycleCount() < wait);
wait += Dali->bit_time; // Auto roll-over wait += Dali->bit_time; // Auto roll-over
dali_read = digitalRead(Dali->pin_rx); dali_read = digitalRead(Dali->pin_rx);
if (DALI_IN_INVERT) { dali_read != dali_read; }
#ifdef DALI_DEBUG #ifdef DALI_DEBUG
digitalWrite(DALI_DEBUG_PIN, bit_number&1); // Add LogicAnalyzer poll indication digitalWrite(DALI_DEBUG_PIN, bit_number&1); // Add LogicAnalyzer poll indication
#endif // DALI_DEBUG #endif // DALI_DEBUG
@ -149,7 +150,7 @@ void DaliReceiveData(void) {
if (0 == bit_state) { // Manchester encoding total 2 bits is always 0 if (0 == bit_state) { // Manchester encoding total 2 bits is always 0
if (bit_number > 2) { // Skip start bit if (bit_number > 2) { // Skip start bit
received_dali_data <<= 1; received_dali_data <<= 1;
received_dali_data |= (DALI_IN_INVERT) ? !dali_read : dali_read; received_dali_data |= dali_read;
} }
} }
else if ((2 == bit_state) && else if ((2 == bit_state) &&
@ -195,6 +196,7 @@ void DaliSendDataOnce(uint16_t send_dali_data) {
*/ */
bool bit_value; bool bit_value;
bool pin_value; bool pin_value;
bool dali_read;
bool collision = false; bool collision = false;
uint32_t bit_pos = 15; uint32_t bit_pos = 15;
uint32_t wait = ESP.getCycleCount(); uint32_t wait = ESP.getCycleCount();
@ -202,7 +204,7 @@ void DaliSendDataOnce(uint16_t send_dali_data) {
while (bit_number < 35) { // 417 * 35 = 14.7 ms while (bit_number < 35) { // 417 * 35 = 14.7 ms
if (!collision) { if (!collision) {
if (0 == (bit_number &1)) { // Even bit if (0 == (bit_number &1)) { // Even bit
// Start bit, Stop bit, Data bits // Start bit, Stop bit, Data bits
bit_value = (0 == bit_number) ? 1 : (34 == bit_number) ? 0 : (bool)((send_dali_data >> bit_pos--) &1); // MSB first bit_value = (0 == bit_number) ? 1 : (34 == bit_number) ? 0 : (bool)((send_dali_data >> bit_pos--) &1); // MSB first
} else { // Odd bit } else { // Odd bit
bit_value = !bit_value; // Complement bit bit_value = !bit_value; // Complement bit
@ -219,7 +221,9 @@ void DaliSendDataOnce(uint16_t send_dali_data) {
while (ESP.getCycleCount() < wait); while (ESP.getCycleCount() < wait);
if (!collision) { if (!collision) {
if ((HIGH == pin_value) && (LOW == digitalRead(Dali->pin_rx))) { // Collision if write is 1 and bus is 0 dali_read = digitalRead(Dali->pin_rx);
if (DALI_IN_INVERT) { dali_read != dali_read; }
if ((HIGH == pin_value) && (LOW == dali_read)) { // Collision if write is 1 and bus is 0
collision = true; collision = true;
pin_value = LOW; pin_value = LOW;
bit_number = 29; // Keep bus low for 4 bits bit_number = 29; // Keep bus low for 4 bits