Merge branch 'dev'

ps2 · Mar 29, 2016 · ef3b95a · ef3b95a
2 parents 015da9d + fa8d417
commit ef3b95a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/Readme.md b/Readme.md
@@ -29,6 +29,14 @@ pump model number ends with 'WW' then you need a 'WorldWide' firmware:
 
     make -f Makefile.uart1_alt2 RADIO_LOCALE=WW
 
+# cc111x UART1_alt2 connected to the Intel Edison UART_1
+
+    P1.4 - CT / SSN -> UART_1_RTS (GP129) (pin 63)
+    P1.5 - RT / SCK -> UART_1_CTS (GP128) (pin 65)
+    P1.6 - TX / MOSI -> UART_1_RX (GP130) (pin 61)
+    P1.7 - RX / MISO -> UART_1_TX (GP131) (pin 46)
+
+
 # UART on the WirelessThings ERF stick
 
 Perform the build. The output file will be stored at output/uart0_alt1_SRF_ERF_US/uart0_alt1_SRF_ERF_US.hex

diff --git a/commands.c b/commands.c
@@ -38,7 +38,7 @@ void cmd_get_state() {
 }
 
 void cmd_get_version() {
-  serial_tx_str("subg_rfspy 0.7");
+  serial_tx_str("subg_rfspy 0.8");
 }
 
 void do_cmd(uint8_t cmd) {

diff --git a/radio.c b/radio.c
@@ -89,8 +89,12 @@ void rftxrx_isr(void) __interrupt RFTXRX_VECTOR {
     if (packet_count == 0) {
       packet_count = 1;
     }
-    radio_rx_buf[radio_rx_buf_len] = d_byte;
-    radio_rx_buf_len++;
+    if (radio_rx_buf_len < MAX_PACKET_LEN) {
+      radio_rx_buf[radio_rx_buf_len] = d_byte;
+      radio_rx_buf_len++;
+    } else {
+      // Overflow
+    }
     if (d_byte == 0) {
       RFST = RFST_SIDLE;
       while(MARCSTATE!=MARC_STATE_IDLE);