0x00, 0x07,
0x02, 0x2e,
0x03, 0x0d,
-@@ -26,16 +26,18 @@
+@@ -26,16 +26,17 @@
0x11, 0x93,
0x12, 0x03,
0x15, 0x34,
- 0x17, 0x30, // always go into IDLE
-+ 0x17, 0x3F, // always go into RX, CCA, ELV uses 0x03
++ 0x17, 0x3F, // always go into RX after TX, CCA, ELV uses 0x03
0x18, 0x18,
0x19, 0x16,
0x1B, 0x43,
+ 0x29, 0x59,
+ 0x2c, 0x81,
0x2D, 0x35,
- 0x3e, 0xc3,
+- 0x3e, 0xc3,
- 0xff
-+ 0xff, 0xff
++ 0x3e, 0xc3
};
void
-@@ -56,7 +58,7 @@
+@@ -56,18 +57,16 @@
my_delay_us(100);
// load configuration
- for (uint8_t i = 0; i<50; i += 2) {
+-
+- if (pgm_read_byte( &ASKSIN_CFG[i] )>0x40)
+- break;
+-
+ for (uint8_t i = 0; i < sizeof(ASKSIN_CFG); i += 2) {
-
- if (pgm_read_byte( &ASKSIN_CFG[i] )>0x40)
- break;
-@@ -67,7 +69,9 @@
+ cc1100_writeReg( pgm_read_byte(&ASKSIN_CFG[i]),
+ pgm_read_byte(&ASKSIN_CFG[i+1]) );
+ }
ccStrobe( CC1100_SCAL );
}
void
-@@ -97,14 +101,10 @@
- }
-
- rssi = cc1100_sendbyte( 0 );
-+ /* LQI = */ cc1100_sendbyte( 0 );
-
- CC1100_DEASSERT;
+@@ -77,80 +76,74 @@
+ uint8_t dec[MAX_ASKSIN_MSG];
+ uint8_t rssi;
+ uint8_t l;
++ uint8_t rxfifo_cnt;
+
+ if(!asksin_on)
+ return;
+
+ // see if a CRC OK pkt has been arrived
+ if (bit_is_set( CC1100_IN_PORT, CC1100_IN_PIN )) {
++ while((rxfifo_cnt = cc1100_readReg(CC1100_RXBYTES)) != 0x00) {
++ if (rxfifo_cnt & 0x80) // Overflow
++ break;
+
+- enc[0] = cc1100_readReg( CC1100_RXFIFO ) & 0x7f; // read len
++ enc[0] = cc1100_readReg( CC1100_RXFIFO ) & 0x7f; // read len
+
+- if (enc[0]>=MAX_ASKSIN_MSG)
+- enc[0] = MAX_ASKSIN_MSG-1;
+-
+- CC1100_ASSERT;
+- cc1100_sendbyte( CC1100_READ_BURST | CC1100_RXFIFO );
+-
+- for (uint8_t i=0; i<enc[0]; i++) {
+- enc[i+1] = cc1100_sendbyte( 0 );
+- }
+-
+- rssi = cc1100_sendbyte( 0 );
+-
+- CC1100_DEASSERT;
++ if (enc[0]>=MAX_ASKSIN_MSG)
++ enc[0] = MAX_ASKSIN_MSG-1;
++
++ CC1100_ASSERT;
++ cc1100_sendbyte( CC1100_READ_BURST | CC1100_RXFIFO );
++
++ for (uint8_t i=0; i<enc[0]; i++) {
++ enc[i+1] = cc1100_sendbyte( 0 );
++ }
++
++ rssi = cc1100_sendbyte( 0 );
++ /* LQI = */ cc1100_sendbyte( 0 );
- ccStrobe( CC1100_SFRX );
- ccStrobe( CC1100_SIDLE );
- ccStrobe( CC1100_SNOP );
- ccStrobe( CC1100_SRX );
--
- dec[0] = enc[0];
- dec[1] = (~enc[1]) ^ 0x89;
-
-@@ -113,7 +113,6 @@
-
- dec[l] = enc[l] ^ dec[2];
-
++ CC1100_DEASSERT;
+
+- dec[0] = enc[0];
+- dec[1] = (~enc[1]) ^ 0x89;
+-
+- for (l = 2; l < dec[0]; l++)
+- dec[l] = (enc[l-1] + 0xdc) ^ enc[l];
+-
+- dec[l] = enc[l] ^ dec[2];
+-
-
- if (tx_report & REP_BINTIME) {
+- if (tx_report & REP_BINTIME) {
++ while(cc1100_readReg(CC1100_RXBYTES) & 0x7f)
++ cc1100_readReg( CC1100_RXFIFO );
++
++ dec[0] = enc[0];
++ dec[1] = (~enc[1]) ^ 0x89;
- DC('a');
-@@ -133,24 +132,14 @@
+- DC('a');
+- for (uint8_t i=0; i<=dec[0]; i++)
+- DC( dec[i] );
+-
+- } else {
+- DC('A');
++ for (l = 2; l < dec[0]; l++)
++ dec[l] = (enc[l-1] + 0xdc) ^ enc[l];
+
+- for (uint8_t i=0; i<=dec[0]; i++)
+- DH2( dec[i] );
++ dec[l] = enc[l] ^ dec[2];
+
+- if (tx_report & REP_RSSI)
+- DH2(rssi);
+-
+- DNL();
++ if (tx_report & REP_BINTIME) {
++
++ DC('a');
++ for (uint8_t i=0; i<=dec[0]; i++)
++ DC( dec[i] );
++
++ } else {
++ DC('A');
++
++ for (uint8_t i=0; i<=dec[0]; i++)
++ DH2( dec[i] );
++
++ if (tx_report & REP_RSSI)
++ DH2(rssi);
++
++ DNL();
++ }
}
-
- return;
+-
+- return;
-
}
-
-
- }
-+ if (cc1100_readReg( CC1100_MARCSTATE ) == MARCSTATE_RXFIFO_OVERFLOW) {
++ switch(cc1100_readReg( CC1100_MARCSTATE )) {
++ case MARCSTATE_RXFIFO_OVERFLOW:
+ ccStrobe( CC1100_SFRX );
++ case MARCSTATE_IDLE:
+ ccStrobe( CC1100_SIDLE );
+ ccStrobe( CC1100_SNOP );
+ ccStrobe( CC1100_SRX );
++ break;
+ }
}
void
-@@ -173,20 +162,7 @@
+@@ -173,20 +166,7 @@
my_delay_ms(3); // 3ms: Found by trial and error
}
enc[0] = dec[0];
enc[1] = (~dec[1]) ^ 0x89;
-@@ -195,6 +171,13 @@
+@@ -195,6 +175,15 @@
enc[l] = dec[l] ^ dec[2];
+ // According to ELV, devices get activated every 300ms, so send burst for 360ms
+ for(l = 0; l < 3; l++)
+ my_delay_ms(120); // arg is uint_8, so loop
++ } else {
++ my_delay_ms(10);
+ }
+
// send
CC1100_ASSERT;
cc1100_sendbyte(CC1100_WRITE_BURST | CC1100_TXFIFO);
-@@ -205,12 +188,10 @@
+@@ -205,12 +194,17 @@
CC1100_DEASSERT;
+ // wait for TX to finish
+ while(cc1100_readReg( CC1100_MARCSTATE ) == MARCSTATE_TX)
+ ;
++
++ if (cc1100_readReg( CC1100_MARCSTATE ) == MARCSTATE_TXFIFO_UNDERFLOW) {
++ ccStrobe( CC1100_SFTX );
++ ccStrobe( CC1100_SIDLE );
++ ccStrobe( CC1100_SNOP );
++ ccStrobe( CC1100_SRX );
++ }
- while( cc1100_readReg( CC1100_MARCSTATE ) != 1 )
- my_delay_ms(5);