Merge pull request #19 from ps2/dev

Release 0.6

build-all.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -x
+set -e
+
+############################################################################
+# Rileylink and similar
+############################################################################
+# USA:
+make -f Makefile.uart1_alt2
+make -f Makefile.uart1_alt2 CODE_LOC=0x400 CODE_LOC_NAME=CCTL
+# Worldwide:
+make -f Makefile.uart1_alt2 RADIO_LOCALE=WW
+make -f Makefile.uart1_alt2 CODE_LOC=0x400 CODE_LOC_NAME=CCTL RADIO_LOCALE=WW
+
+############################################################################
+# ERF stick
+############################################################################
+# USA:
+make -f Makefile.uart0_alt1 BOARD_TYPE=SRF_ERF
+make -f Makefile.uart0_alt1 BOARD_TYPE=SRF_ERF CODE_LOC=0x400 CODE_LOC_NAME=CCTL
+# Worldwide:
+make -f Makefile.uart0_alt1 BOARD_TYPE=SRF_ERF RADIO_LOCALE=WW
+make -f Makefile.uart0_alt1 BOARD_TYPE=SRF_ERF CODE_LOC=0x400 CODE_LOC_NAME=CCTL RADIO_LOCALE=WW
+
+############################################################################
+# TI stick
+############################################################################
+# USA:
+make -f Makefile.usb_ep0
+make -f Makefile.usb_ep0 CODE_LOC=0x1400 CODE_LOC_NAME=CCBOOTLOADER
+# Worldwide:
+make -f Makefile.usb_ep0 RADIO_LOCALE=WW
+make -f Makefile.usb_ep0 RADIO_LOCALE=WW CODE_LOC=0x1400 CODE_LOC_NAME=CCBOOTLOADER
+
+exit 0

circle.yml

@@ -0,0 +1,15 @@
+machine:
+  pre:
+    - sudo apt-get install -y sdcc
+    - go get github.com/tcnksm/ghr
+test:
+  override:
+    - ./build-all.sh
+
+deployment:
+  release:
+    branch: master
+    commands:
+      - mkdir -p output/`git describe --tags`/
+      - mv output/*/*.hex output/`git describe --tags`/
+      - cd output ; ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME --replace `git describe --tags` `git describe --tags`/

commands.c

@@ -38,7 +38,7 @@ void cmd_get_state() {
 }
 
 void cmd_get_version() {
-  serial_tx_str("subg_rfspy 0.5");
+  serial_tx_str("subg_rfspy 0.6");
 }
 
 void do_cmd(uint8_t cmd) {
@@ -205,6 +205,12 @@ void cmd_update_register() {
     case 0x1F:
       FSCAL0 = value;
       break;
+    case 0x20:
+      PA_TABLE1 = value;
+      break;
+    case 0x21:
+      PA_TABLE0 = value;
+      break;
     default:
       rval = 2;
   }
@@ -216,4 +222,3 @@ void cmd_reset() {
   EA = 0;
   WDCTL = BIT3 | BIT0;
 }
-

radio.c

@@ -66,7 +66,7 @@ void configure_radio()
   FREQ1     = 0x2E; // frequency control word, middle byte
   FREQ0     = 0x38; // frequency control word, low byte
   CHANNR    = 0x00; // channel number
-  PA_TABLE1 = 0x50; // Max configurable power output at this frequency is 0x50
+  PA_TABLE1 = 0xC2; // Max configurable power output at this frequency is 0xC2
 #endif
 
   IEN2 |= IEN2_RFIE;