===================================================================
--- clib/rf_asksin.c (revision 373)
+++ clib/rf_asksin.c (working copy)
-@@ -11,13 +11,13 @@
+@@ -9,15 +9,18 @@
+ #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] = {
0x0B, 0x06,
0x0D, 0x21,
0x0E, 0x65,
-@@ -26,18 +26,22 @@
+@@ -26,18 +29,22 @@
0x11, 0x93,
0x12, 0x03,
0x15, 0x34,
- 0x17, 0x30, // always go into IDLE
-+ 0x17, 0x3F, // always go into RX after TX, CCA, ELV uses 0x03
++ 0x17, 0x3F, // always go into RX, CCA; ELV uses 0x03
0x18, 0x18,
0x19, 0x16,
0x1B, 0x43,
};
+static inline uint8_t read_cc1100_rxbytes(void);
-+static inline void rf_asksin_reset_rx(void);
++static void rf_asksin_reset_rx(void);
+
void
rf_asksin_init(void)
{
-@@ -56,20 +60,44 @@
+@@ -56,20 +63,44 @@
my_delay_us(100);
// load configuration
+ return rxbytes;
+}
+
-+static inline void
++static void
+rf_asksin_reset_rx(void)
+{
+ ccStrobe( CC1100_SFRX );
void
rf_asksin_task(void)
{
-@@ -77,18 +105,41 @@
+@@ -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;
+ 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;
++ }
+
enc[0] = cc1100_readReg( CC1100_RXFIFO ) & 0x7f; // read len
+ rxfifo_cnt--;
+ return;
+ }
+
-+ l = 50;
-+ while (l-- && ((enc[0] + 2) < rxfifo_cnt)) { // Wait for more data
-+ my_delay_ms(1);
-+ rxfifo_cnt = (read_cc1100_rxbytes() & 0x7f);
-+ }
++ 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 (!l) {
-+ // Not enough data received, out of sync?
-+ rf_asksin_reset_rx();
-+ return;
++ 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 +148,19 @@
+@@ -97,14 +167,19 @@
}
rssi = cc1100_sendbyte( 0 );
dec[0] = enc[0];
dec[1] = (~enc[1]) ^ 0x89;
-@@ -113,7 +169,6 @@
+@@ -113,7 +188,6 @@
dec[l] = enc[l] ^ dec[2];
if (tx_report & REP_BINTIME) {
DC('a');
-@@ -131,26 +186,17 @@
+@@ -131,26 +205,17 @@
DNL();
}
}
void
-@@ -173,20 +219,7 @@
+@@ -173,20 +238,7 @@
my_delay_ms(3); // 3ms: Found by trial and error
}
enc[0] = dec[0];
enc[1] = (~dec[1]) ^ 0x89;
-@@ -195,6 +228,15 @@
+@@ -195,6 +247,15 @@
enc[l] = dec[l] ^ dec[2];
// send
CC1100_ASSERT;
cc1100_sendbyte(CC1100_WRITE_BURST | CC1100_TXFIFO);
-@@ -205,12 +247,17 @@
+@@ -205,12 +266,17 @@
CC1100_DEASSERT;