From: Michael Gernoth Date: Fri, 21 Jun 2013 20:05:26 +0000 (+0200) Subject: go back to hardware packet handling X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/fhem-stuff/commitdiff_plain/222456d4edba28dede43232231fee62df2a45880 go back to hardware packet handling there are still unsolved problems with the software packet handling reliably detecting packet boundaries --- diff --git a/culfw/culfw-asksin-fix.diff b/culfw/culfw-asksin-fix.diff index 3887a57..168ad47 100644 --- a/culfw/culfw-asksin-fix.diff +++ b/culfw/culfw-asksin-fix.diff @@ -2,13 +2,8 @@ Index: clib/rf_asksin.c =================================================================== --- clib/rf_asksin.c (revision 373) +++ clib/rf_asksin.c (working copy) -@@ -9,15 +9,18 @@ +@@ -11,8 +11,8 @@ - #include "rf_asksin.h" - -+//we receive a new byte approximately every 8 ms... -+#define RX_TIMEOUT_MS 10 -+ uint8_t asksin_on = 0; -const uint8_t PROGMEM ASKSIN_CFG[50] = { @@ -18,18 +13,12 @@ Index: clib/rf_asksin.c 0x02, 0x2e, 0x03, 0x0d, 0x04, 0xE9, - 0x05, 0xCA, -- 0x07, 0x0C, -+ 0x07, 0x04, - 0x0B, 0x06, - 0x0D, 0x21, - 0x0E, 0x65, -@@ -26,18 +29,22 @@ +@@ -26,18 +26,21 @@ 0x11, 0x93, 0x12, 0x03, 0x15, 0x34, - 0x17, 0x30, // always go into IDLE -+ 0x17, 0x3F, // always go into RX, CCA; ELV uses 0x03 ++ 0x17, 0x33, // go into RX after TX, CCA; ELV uses 0x03 0x18, 0x18, 0x19, 0x16, 0x1B, 0x43, @@ -44,13 +33,12 @@ Index: clib/rf_asksin.c + 0x3e, 0xc3 }; -+static inline uint8_t read_cc1100_rxbytes(void); +static void rf_asksin_reset_rx(void); + void rf_asksin_init(void) { -@@ -56,20 +63,44 @@ +@@ -56,20 +59,27 @@ my_delay_us(100); // load configuration @@ -72,64 +60,24 @@ Index: clib/rf_asksin.c + ccRX(); } -+// Workaround for CC1101 Errata 3 -+static inline uint8_t -+read_cc1100_rxbytes(void) -+{ -+ uint8_t rxbytes, rxbytes2; -+ -+ rxbytes = cc1100_readReg(CC1100_RXBYTES); -+ while((rxbytes2 = cc1100_readReg(CC1100_RXBYTES)) != rxbytes) -+ rxbytes = rxbytes2; -+ -+ return rxbytes; -+} -+ +static void +rf_asksin_reset_rx(void) +{ + ccStrobe( CC1100_SFRX ); + ccStrobe( CC1100_SIDLE ); + ccStrobe( CC1100_SNOP ); -+ -+ while (read_cc1100_rxbytes() & 0x7f) -+ cc1100_readReg(CC1100_RXFIFO); -+ + ccStrobe( CC1100_SRX ); +} + void rf_asksin_task(void) { -@@ -77,18 +108,57 @@ - uint8_t dec[MAX_ASKSIN_MSG]; - uint8_t rssi; - uint8_t l; -+ uint8_t rxfifo_cnt; -+ uint16_t timeout; - - if(!asksin_on) - return; - -- // see if a CRC OK pkt has been arrived -- if (bit_is_set( CC1100_IN_PORT, CC1100_IN_PIN )) { -+ // see if there is data to be read -+ while (bit_is_set( CC1100_IN_PORT, CC1100_IN_PIN )) { -+ rxfifo_cnt = read_cc1100_rxbytes(); +@@ -83,12 +93,14 @@ -+ if (rxfifo_cnt & 0x80) // Overflow -+ break; -+ -+ rxfifo_cnt &= 0x7f; -+ -+ // We must not read the last byte from the RX fifo while RX is in progress (Errata 1) -+ while ((rxfifo_cnt == 1) && (cc1100_readReg(CC1100_PKTSTATUS) & (1 << 3))) { -+ my_delay_ms(1); -+ rxfifo_cnt = read_cc1100_rxbytes() & 0x7f; -+ } -+ + // see if a CRC OK pkt has been arrived + if (bit_is_set( CC1100_IN_PORT, CC1100_IN_PIN )) { +- enc[0] = cc1100_readReg( CC1100_RXFIFO ) & 0x7f; // read len -+ rxfifo_cnt--; - if (enc[0]>=MAX_ASKSIN_MSG) - enc[0] = MAX_ASKSIN_MSG-1; @@ -139,57 +87,26 @@ Index: clib/rf_asksin.c + rf_asksin_reset_rx(); + return; + } -+ -+ if ((enc[0] + 2) > rxfifo_cnt) { -+ timeout = RX_TIMEOUT_MS * ((enc[0] + 2) - rxfifo_cnt); -+ while (timeout-- && ((enc[0] + 2) > rxfifo_cnt)) { // Wait for more data -+ my_delay_ms(1); -+ rxfifo_cnt = read_cc1100_rxbytes(); -+ -+ if (rxfifo_cnt & 0x80) { // Overflow -+ rf_asksin_reset_rx(); -+ return; -+ } -+ -+ rxfifo_cnt &= 0x7f; -+ } -+ -+ if (!timeout) { -+ // Not enough data received, out of sync? -+ rf_asksin_reset_rx(); -+ return; -+ } -+ } + CC1100_ASSERT; cc1100_sendbyte( CC1100_READ_BURST | CC1100_RXFIFO ); -@@ -97,14 +167,19 @@ +@@ -97,12 +109,10 @@ } rssi = cc1100_sendbyte( 0 ); - ++ l = cc1100_sendbyte( 0 ); + CC1100_DEASSERT; - ccStrobe( CC1100_SFRX ); - ccStrobe( CC1100_SIDLE ); - ccStrobe( CC1100_SNOP ); -- ccStrobe( CC1100_SRX ); -+ // We must not read the last byte from the RX fifo while RX is in progress (Errata 1) -+ while (((read_cc1100_rxbytes() & 0x7f) == 1) && (cc1100_readReg(CC1100_PKTSTATUS) & (1 << 3))) { -+ my_delay_ms(1); -+ } + ccStrobe( CC1100_SRX ); -+ l = cc1100_readReg(CC1100_RXFIFO); -+ -+ if (!(l & 0x80)) // CRC not ok -+ continue; -+ dec[0] = enc[0]; - dec[1] = (~enc[1]) ^ 0x89; - -@@ -113,7 +188,6 @@ +@@ -113,7 +123,6 @@ dec[l] = enc[l] ^ dec[2]; @@ -197,7 +114,7 @@ Index: clib/rf_asksin.c if (tx_report & REP_BINTIME) { DC('a'); -@@ -131,26 +205,17 @@ +@@ -131,26 +140,17 @@ DNL(); } @@ -233,7 +150,7 @@ Index: clib/rf_asksin.c } void -@@ -173,20 +238,7 @@ +@@ -173,20 +173,7 @@ my_delay_ms(3); // 3ms: Found by trial and error } @@ -254,7 +171,7 @@ Index: clib/rf_asksin.c enc[0] = dec[0]; enc[1] = (~dec[1]) ^ 0x89; -@@ -195,6 +247,15 @@ +@@ -195,6 +182,15 @@ enc[l] = dec[l] ^ dec[2]; @@ -270,7 +187,7 @@ Index: clib/rf_asksin.c // send CC1100_ASSERT; cc1100_sendbyte(CC1100_WRITE_BURST | CC1100_TXFIFO); -@@ -205,12 +266,17 @@ +@@ -205,12 +201,17 @@ CC1100_DEASSERT;