From: Michael Gernoth Date: Fri, 28 Jun 2013 14:22:02 +0000 (+0200) Subject: rx/tx switching now handled in rf_asksin X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/fhem-stuff/commitdiff_plain?ds=sidebyside rx/tx switching now handled in rf_asksin --- diff --git a/culfw/culfw-cc1100-fix.diff b/culfw/culfw-cc1100-fix.diff deleted file mode 100644 index b67b065..0000000 --- a/culfw/culfw-cc1100-fix.diff +++ /dev/null @@ -1,39 +0,0 @@ -Index: clib/cc1100.c -=================================================================== ---- clib/cc1100.c (revision 373) -+++ clib/cc1100.c (working copy) -@@ -266,26 +266,25 @@ - void - ccTX(void) - { -- uint8_t cnt = 0xff; - EIMSK &= ~_BV(CC1100_INT); - - // Going from RX to TX does not work if there was a reception less than 0.5 -- // sec ago. Due to CCA? Using IDLE helps to shorten this period(?) -- ccStrobe(CC1100_SIDLE); -- while(cnt-- && (ccStrobe( CC1100_STX ) & 0x70) != 2) -- my_delay_us(10); -+ // sec ago. Due to CCA? Wait for chip to enter TX state. -+ -+ while (cc1100_readReg(CC1100_MARCSTATE) != MARCSTATE_TX) { -+ ccStrobe(CC1100_STX); -+ } - } - - //-------------------------------------------------------------------- - void - ccRX(void) - { -- uint8_t cnt = 0xff; -+ while (cc1100_readReg(CC1100_MARCSTATE) != MARCSTATE_RX) { -+ ccStrobe(CC1100_SRX); -+ } - -- while(cnt-- && (ccStrobe( CC1100_SRX ) & 0x70) != 1) -- my_delay_us(10); - EIMSK |= _BV(CC1100_INT); -- - } - -