jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 02:36:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4080 from Portisch/fix_rf_bridge_uart_receive_len

Browse Source 
fix RF bridge raw receive
This commit is contained in:
Theo Arends 2018-10-16 10:14:24 +02:00 committed by GitHub
commit 36b8f5d293
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sonoff/xdrv_06_snfbridge.ino
View File

@ -301,7 +301,7 @@ void SonoffBridgeReceived()
boolean SonoffBridgeSerialInput() boolean SonoffBridgeSerialInput()
{ {
// iTead Rf Universal Transceiver Module Serial Protocol Version 1.0 (20170420) // iTead Rf Universal Transceiver Module Serial Protocol Version 1.0 (20170420)
int8_t receive_len = 0; static int8_t receive_len = 0;
if (sonoff_bridge_receive_flag) { if (sonoff_bridge_receive_flag) {
if (sonoff_bridge_receive_raw_flag) { if (sonoff_bridge_receive_raw_flag) {
@ -309,12 +309,12 @@ boolean SonoffBridgeSerialInput()
serial_in_buffer[serial_in_byte_counter++] = 0xAA; serial_in_buffer[serial_in_byte_counter++] = 0xAA;
} }
serial_in_buffer[serial_in_byte_counter++] = serial_in_byte; serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
if (serial_in_byte_counter > 2) { if (serial_in_byte_counter == 3) {
if ((0xA6 == serial_in_buffer[1]) || (0xAB == serial_in_buffer[1])) { // AA A6 06 023908010155 55 - 06 is receive_len if ((0xA6 == serial_in_buffer[serial_in_byte_counter - 2]) || (0xAB == serial_in_buffer[serial_in_byte_counter - 2])) { // AA A6 06 023908010155 55 - 06 is receive_len
receive_len = serial_in_buffer[2] + 3 - serial_in_byte_counter; // Get at least receive_len bytes receive_len = serial_in_buffer[serial_in_byte_counter - 1]; // Get at least receive_len bytes
} }
} }
if ((0 == receive_len) && (0x55 == serial_in_byte)) { // 0x55 - End of text if (((0 == receive_len) && (0x55 == serial_in_byte)) || (serial_in_byte_counter == receive_len + 4)) { // 0x55 - End of text
SonoffBridgeReceivedRaw(); SonoffBridgeReceivedRaw();
sonoff_bridge_receive_flag = 0; sonoff_bridge_receive_flag = 0;
return 1; return 1;
@ -345,6 +345,7 @@ boolean SonoffBridgeSerialInput()
serial_in_byte_counter = 0; serial_in_byte_counter = 0;
serial_in_byte = 0; serial_in_byte = 0;
sonoff_bridge_receive_flag = 1; sonoff_bridge_receive_flag = 1;
receive_len = 0;
} }
return 0; return 0;
} }