From f364364753242c9a9ee1bdc2e8c0775495c567e2 Mon Sep 17 00:00:00 2001 From: Oskar Pearson Date: Thu, 28 Jan 2016 08:07:35 +0000 Subject: [PATCH 1/4] Added commands to set PA_TABLE1 and PA_TABLE0 registers --- commands.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/commands.c b/commands.c index 6bd1ebc..1b7539d 100644 --- a/commands.c +++ b/commands.c @@ -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; } - From a4b36f42022eb10bce19ccb46c6f57831e073bde Mon Sep 17 00:00:00 2001 From: Oskar Pearson Date: Thu, 28 Jan 2016 08:08:40 +0000 Subject: [PATCH 2/4] Increased power output of radio when in the 868mhz band --- radio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio.c b/radio.c index f5e8fa1..4150b58 100644 --- a/radio.c +++ b/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; From 74e4b3bd6fd3a33e5d8ca7dd3c61e04d309279a2 Mon Sep 17 00:00:00 2001 From: Oskar Pearson Date: Sat, 30 Jan 2016 16:46:50 +0100 Subject: [PATCH 3/4] [circleci] Builds via circleci - Build GitHub releases with GHR --- build-all.sh | 36 ++++++++++++++++++++++++++++++++++++ circle.yml | 15 +++++++++++++++ 2 files changed, 51 insertions(+) create mode 100755 build-all.sh create mode 100644 circle.yml diff --git a/build-all.sh b/build-all.sh new file mode 100755 index 0000000..5529947 --- /dev/null +++ b/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 diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..b687732 --- /dev/null +++ b/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`/ From 9d50ff2f52825558f65ff18ebd829cb65960c743 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 31 Jan 2016 20:43:03 -0600 Subject: [PATCH 4/4] Bump version to 0.6 --- commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands.c b/commands.c index 3475b4e..95bfd48 100644 --- a/commands.c +++ b/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) {