merged updates from fsm branch, including RampingIOS V3 and Werner UIs...

... plus a bunch of other updates, fixes, improvements, etc.

3 files changed, 18 insertions, 6 deletions

diff --git a/bin/build-25.sh b/bin/build-25.sh
index 2c58db5..2be8269 100755
--- a/bin/build-25.sh
+++ b/bin/build-25.sh
@@ -3,7 +3,7 @@
 # Instead of using a Makefile, since most of the firmwares here build in the
 # same exact way, here's a script to do the same thing
 
-export PROGRAM=$1
+export PROGRAM=$1 ; shift
 export ATTINY=25
 export MCU=attiny$ATTINY
 export CC=avr-gcc
@@ -14,13 +14,17 @@ export LDFLAGS=
 export OBJCOPYFLAGS='--set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex'
 export OBJS=$PROGRAM.o
 
+for arg in "$*" ; do
+  OTHERFLAGS="$OTHERFLAGS $arg"
+done
+
 function run () {
   echo $*
   $*
   if [ x"$?" != x0 ]; then exit 1 ; fi
 }
 
-run $CC $CFLAGS -o $PROGRAM.o -c $PROGRAM.c
+run $CC $OTHERFLAGS $CFLAGS -o $PROGRAM.o -c $PROGRAM.c
 run $CC $OFLAGS $LDFLAGS -o $PROGRAM.elf $PROGRAM.o
 run $OBJCOPY $OBJCOPYFLAGS $PROGRAM.elf $PROGRAM.hex
 run avr-size -C --mcu=$MCU $PROGRAM.elf | grep Full
diff --git a/bin/build-85.sh b/bin/build-85.sh
index 8b2937d..8e3704b 100755
--- a/bin/build-85.sh
+++ b/bin/build-85.sh
@@ -3,7 +3,7 @@
 # Instead of using a Makefile, since most of the firmwares here build in the
 # same exact way, here's a script to do the same thing
 
-export PROGRAM=$1
+export PROGRAM=$1 ; shift
 export ATTINY=85
 export MCU=attiny$ATTINY
 export CC=avr-gcc
@@ -14,13 +14,17 @@ export LDFLAGS=
 export OBJCOPYFLAGS='--set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex'
 export OBJS=$PROGRAM.o
 
+for arg in "$*" ; do
+  OTHERFLAGS="$OTHERFLAGS $arg"
+done
+
 function run () {
   echo $*
   $*
   if [ x"$?" != x0 ]; then exit 1 ; fi
 }
 
-run $CC $CFLAGS -o $PROGRAM.o -c $PROGRAM.c
+run $CC $OTHERFLAGS $CFLAGS -o $PROGRAM.o -c $PROGRAM.c
 run $CC $OFLAGS $LDFLAGS -o $PROGRAM.elf $PROGRAM.o
 run $OBJCOPY $OBJCOPYFLAGS $PROGRAM.elf $PROGRAM.hex
 run avr-size -C --mcu=$MCU $PROGRAM.elf | grep Full
diff --git a/bin/build.sh b/bin/build.sh
index 68f981d..86afd1d 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -3,7 +3,7 @@
 # Instead of using a Makefile, since most of the firmwares here build in the
 # same exact way, here's a script to do the same thing
 
-export PROGRAM=$1
+export PROGRAM=$1 ; shift
 export ATTINY=13
 export MCU=attiny$ATTINY
 export CC=avr-gcc
@@ -14,13 +14,17 @@ export LDFLAGS=
 export OBJCOPYFLAGS='--set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex'
 export OBJS=$PROGRAM.o
 
+for arg in "$*" ; do
+  OTHERFLAGS="$OTHERFLAGS $arg"
+done
+
 function run () {
   echo $*
   $*
   if [ x"$?" != x0 ]; then exit 1 ; fi
 }
 
-run $CC $CFLAGS -o $PROGRAM.o -c $PROGRAM.c
+run $CC $OTHERFLAGS $CFLAGS -o $PROGRAM.o -c $PROGRAM.c
 run $CC $OFLAGS $LDFLAGS -o $PROGRAM.elf $PROGRAM.o
 run $OBJCOPY $OBJCOPYFLAGS $PROGRAM.elf $PROGRAM.hex
 run avr-size -C --mcu=$MCU $PROGRAM.elf | grep Full