Program AVR on install

diff --git a/MANIFEST.in b/MANIFEST.in
index 56d2aa120eb8b4c92b7db2d0ee252dd9d5100ba7..0277ea22091a562fdae5844ba38d94cc2662c2d1 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
 recursive-include src/py/bbctrl/http *
-include package.json README.md scripts/install.sh
+include package.json README.md scripts/install.sh avr/bbctrl-avr-firmware.hex
+include scripts/avr109-flash.py

diff --git a/Makefile b/Makefile
index c5a7683e3305563f6fe8ec6bd043fb65d594578f..97805f7255e795f8d25fe313904d2be79f78a2b0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,8 @@ STATIC     := $(shell find src/resources -type f)
 STATIC     := $(patsubst src/resources/%,$(TARGET)/%,$(STATIC))
 TEMPLS     := $(wildcard src/jade/templates/*.jade)
 
+AVR_FIRMWARE := avr/bbctrl-avr-firmware.hex
+
 RSYNC_EXCLUDE := \*.pyc __pycache__ \*.egg-info \\\#* \*~ .\\\#\*
 RSYNC_EXCLUDE := $(patsubst %,--exclude %,$(RSYNC_EXCLUDE))
 RSYNC_OPTS := $(RSYNC_EXCLUDE) -rv --no-g --delete --force
@@ -36,9 +38,13 @@ all: html css js static
 copy: pkg
        rsync $(RSYNC_OPTS) pkg/$(PKG_NAME)/ $(DEST)/bbctrl/
 
-pkg: all
+pkg: all $(AVR_FIRMWARE)
        ./setup.py sdist
 
+.PHONY: $(AVR_FIRMWARE)
+$(AVR_FIRMWARE):
+       $(MAKE) -C avr $(shell basename $@)
+
 publish: pkg
        echo -n $(VERSION) > dist/latest.txt
        rsync $(RSYNC_OPTS) dist/$(PKG_NAME).tar.bz2 dist/latest.txt $(PUB_PATH)/
@@ -111,7 +117,7 @@ tidy:
        rm -f $(shell find "$(DIR)" -name \*~)
 
 clean: tidy
-       rm -rf build html pkg
+       rm -rf build html dist
 
 dist-clean: clean
        rm -rf node_modules

diff --git a/package.json b/package.json
index 55c598ffffc4835d6d94c4ab52d0fce65e3a5c8a..d3fd8092d3676e2fc5fa055d3d5a792dc1e6ec69 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bbctrl",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "homepage": "https://github.com/buildbotics/rpi-firmware",
   "license": "GPL 3+",
 

diff --git a/scripts/avr109-flash.py b/scripts/avr109-flash.py
index f151dadedb58c60a471171b25967c50af113db22..7aeb6e01d3c85fe0ae9e02eae86cc41f51472f17 100755 (executable)
--- a/scripts/avr109-flash.py
+++ b/scripts/avr109-flash.py
@@ -8,7 +8,7 @@ from subprocess import call
 
 
 dev = '/dev/ttyAMA0'
-baud = 115200
+baud = 921600
 boot_id = 'bbctrl '
 verbose = False
 

diff --git a/scripts/install.sh b/scripts/install.sh
index d7084d03017649f1fbe128df3795db442c4b2b17..274ce213706681527ba09a8422fbaac5b9ee37da 100755 (executable)
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
 
+sudo service bbctrl stop
+sudo ./scripts/avr109-flash.py avr/bbctrl-avr-firmware.hex
+sudo rm -rf /usr/local/lib/python*/dist-packages/bbctrl-*
 sudo ./setup.py install
-sudo service bbctrl restart
+sudo service bbctrl start