Merge branch 'master' into master

.travis.yml

@@ -17,87 +17,140 @@ env:
 #    - TOOLS_VERSION=1.6.9
 #    - TOOLS_VERSION=1.6.13
 #    - TOOLS_VERSION=1.8.5
-    - TOOLS_VERSION=microchip    
+    - TOOLS_VERSION=1.8.7
+#    - TOOLS_VERSION=microchip
   matrix:
-    - OPTIBOOT_TARGET=bobuino
-    - OPTIBOOT_TARGET=diecimila
-    - OPTIBOOT_TARGET=lilypad
-    - OPTIBOOT_TARGET=lilypad_resonator
-    - OPTIBOOT_TARGET=luminet
-    - OPTIBOOT_TARGET=mega1280
-    - OPTIBOOT_TARGET=mighty1284
-    - OPTIBOOT_TARGET=pro16
-    - OPTIBOOT_TARGET=pro20
-    - OPTIBOOT_TARGET=pro8
-    - OPTIBOOT_TARGET=sanguino
-    - OPTIBOOT_TARGET=virboot328
-    - OPTIBOOT_TARGET=virboot8
-    - OPTIBOOT_TARGET=wildfire
-    - OPTIBOOT_TARGET=wildfirev2
-    - OPTIBOOT_TARGET=wildfirev3
-    - OPTIBOOT_TARGET=xplained168pb
-    - OPTIBOOT_TARGET=xplained328p
-    - OPTIBOOT_TARGET=xplained328pb
+    - OPTIBOOT_TARGET=atmega128
     - OPTIBOOT_TARGET=atmega1280
+    - OPTIBOOT_TARGET=atmega1281
     - OPTIBOOT_TARGET=atmega1284
     - OPTIBOOT_TARGET=atmega1284p
+    - OPTIBOOT_TARGET=atmega128a
     - OPTIBOOT_TARGET=atmega16
-    - OPTIBOOT_TARGET=atmega168
-    - OPTIBOOT_TARGET=atmega168p
-    - OPTIBOOT_TARGET=atmega32
-    - OPTIBOOT_TARGET=atmega328
-    - OPTIBOOT_TARGET="atmega328 LED_START_FLASHES=0"
-    - OPTIBOOT_TARGET="atmega328 LED_START_FLASHES=0 SUPPORT_EEPROM=1"
-    - OPTIBOOT_TARGET="atmega328 LED_START_FLASHES=0 LED_START_ON=1 SUPPORT_EEPROM=1"
-    - OPTIBOOT_TARGET="atmega328 SOFT_UART=1"
-    - OPTIBOOT_TARGET="atmega328 BIGBOOT=1"
-    - OPTIBOOT_TARGET=atmega328_pro8
-    - OPTIBOOT_TARGET=atmega644p
-    - OPTIBOOT_TARGET=atmega8
-    - OPTIBOOT_TARGET=atmega88
-    - OPTIBOOT_TARGET=attiny84
-    - OPTIBOOT_TARGET=attiny1634
-    - OPTIBOOT_TARGET=attiny841
-    - OPTIBOOT_TARGET=attiny828
-    - OPTIBOOT_TARGET=atmega2560
-    - OPTIBOOT_TARGET=mega2560
-    - OPTIBOOT_TARGET="atmega64"
-    - OPTIBOOT_TARGET="atmega88p LED=B5"
-    - OPTIBOOT_TARGET="atmega88pb LED=B5"
-    - OPTIBOOT_TARGET=atmega128
     - OPTIBOOT_TARGET=atmega162
+    - OPTIBOOT_TARGET=atmega164
     - OPTIBOOT_TARGET=atmega164a
     - OPTIBOOT_TARGET=atmega164p
+    - OPTIBOOT_TARGET=atmega164pa
+    - OPTIBOOT_TARGET=atmega168
+    - OPTIBOOT_TARGET=atmega168a
+    - OPTIBOOT_TARGET=atmega168p
+    - OPTIBOOT_TARGET=atmega168pa
     - OPTIBOOT_TARGET="atmega168pb LED=B5"
     - OPTIBOOT_TARGET=atmega169
+    - OPTIBOOT_TARGET=atmega169a
     - OPTIBOOT_TARGET=atmega169p
+    - OPTIBOOT_TARGET=atmega169pa
+    - OPTIBOOT_TARGET=atmega16a
+    - OPTIBOOT_TARGET=atmega2560
+    - OPTIBOOT_TARGET=atmega2561
+    - OPTIBOOT_TARGET=atmega32
+    - OPTIBOOT_TARGET=atmega324
     - OPTIBOOT_TARGET=atmega324a
     - OPTIBOOT_TARGET=atmega324p
     - OPTIBOOT_TARGET=atmega324pa
     - OPTIBOOT_TARGET=atmega324pb
+    - OPTIBOOT_TARGET=atmega328
+    - OPTIBOOT_TARGET=atmega328_pro8
+    - OPTIBOOT_TARGET="atmega328 BIGBOOT=1"
+    - OPTIBOOT_TARGET="atmega328 LED_START_FLASHES=0 LED_START_ON=1 SUPPORT_EEPROM=1"
+    - OPTIBOOT_TARGET="atmega328 LED_START_FLASHES=0 SUPPORT_EEPROM=1"
+    - OPTIBOOT_TARGET="atmega328 LED_START_FLASHES=0"
+    - OPTIBOOT_TARGET="atmega328 SOFT_UART=1"
     - OPTIBOOT_TARGET="atmega328pb LED=B5"
     - OPTIBOOT_TARGET=atmega329
+    - OPTIBOOT_TARGET=atmega3290
+    - OPTIBOOT_TARGET=atmega3290p
+    - OPTIBOOT_TARGET=atmega3290pa
+    - OPTIBOOT_TARGET=atmega329a
     - OPTIBOOT_TARGET=atmega329p
+    - OPTIBOOT_TARGET=atmega329pa
+    - OPTIBOOT_TARGET=atmega64
     - OPTIBOOT_TARGET=atmega640
     - OPTIBOOT_TARGET=atmega644p
     - OPTIBOOT_TARGET=atmega649
-    - OPTIBOOT_TARGET=atmega649p
-    - OPTIBOOT_TARGET=atmega1281
-    - OPTIBOOT_TARGET=atmega2561
-    - OPTIBOOT_TARGET=atmega3290
-    - OPTIBOOT_TARGET=atmega3290p
     - OPTIBOOT_TARGET=atmega6490
     - OPTIBOOT_TARGET=atmega6490p
+    - OPTIBOOT_TARGET=atmega649p
+    - OPTIBOOT_TARGET=atmega64a
+    - OPTIBOOT_TARGET=atmega8
     - OPTIBOOT_TARGET=atmega8515
     - OPTIBOOT_TARGET=atmega8535
+    - OPTIBOOT_TARGET=atmega88
+    - OPTIBOOT_TARGET="atmega88p LED=B5"
+    - OPTIBOOT_TARGET="atmega88pa LED=B5"
+    - OPTIBOOT_TARGET="atmega88pb LED=B5"
+    - OPTIBOOT_TARGET=attiny1634
+    - OPTIBOOT_TARGET=attiny1634at110
+    - OPTIBOOT_TARGET=attiny1634at110ser1
+    - OPTIBOOT_TARGET=attiny1634at12
+    - OPTIBOOT_TARGET=attiny1634at12ser1
+    - OPTIBOOT_TARGET=attiny1634at147
+    - OPTIBOOT_TARGET=attiny1634at147ser1
+    - OPTIBOOT_TARGET=attiny1634at16
+    - OPTIBOOT_TARGET=attiny1634at16ser1
+    - OPTIBOOT_TARGET=attiny1634at737
+    - OPTIBOOT_TARGET=attiny1634at737ser1
+    - OPTIBOOT_TARGET=attiny1634at8
+    - OPTIBOOT_TARGET=attiny1634at8_5v
+    - OPTIBOOT_TARGET=attiny1634at8_5vser1
+    - OPTIBOOT_TARGET=attiny1634at8ser1
+    - OPTIBOOT_TARGET=attiny1634at921
+    - OPTIBOOT_TARGET=attiny1634at921ser1
     - OPTIBOOT_TARGET=attiny167
+    - OPTIBOOT_TARGET=attiny828
+    - OPTIBOOT_TARGET=attiny828at8
+    - OPTIBOOT_TARGET=attiny828at8_5v
+    - OPTIBOOT_TARGET=attiny84
+    - OPTIBOOT_TARGET=attiny841
+    - OPTIBOOT_TARGET=attiny841at110
+    - OPTIBOOT_TARGET=attiny841at110ser1
+    - OPTIBOOT_TARGET=attiny841at12
+    - OPTIBOOT_TARGET=attiny841at12ser1
+    - OPTIBOOT_TARGET=attiny841at147
+    - OPTIBOOT_TARGET=attiny841at147ser1
+    - OPTIBOOT_TARGET=attiny841at16
+    - OPTIBOOT_TARGET=attiny841at16noLED
+    - OPTIBOOT_TARGET=attiny841at16ser1
+    - OPTIBOOT_TARGET=attiny841at184
+    - OPTIBOOT_TARGET=attiny841at184ser1
+    - OPTIBOOT_TARGET=attiny841at20
+    - OPTIBOOT_TARGET=attiny841at20noLED
+    - OPTIBOOT_TARGET=attiny841at20ser1
+    - OPTIBOOT_TARGET=attiny841at737
+    - OPTIBOOT_TARGET=attiny841at737ser1
+    - OPTIBOOT_TARGET=attiny841at8
+    - OPTIBOOT_TARGET=attiny841at8_5v
+    - OPTIBOOT_TARGET=attiny841at8noLED
+    - OPTIBOOT_TARGET=attiny841at8ser1
+    - OPTIBOOT_TARGET=attiny841at921
+    - OPTIBOOT_TARGET=attiny841at921ser1
     - OPTIBOOT_TARGET=attiny87
+    - OPTIBOOT_TARGET=bobuino
+    - OPTIBOOT_TARGET=diecimila
+    - OPTIBOOT_TARGET=lilypad
+    - OPTIBOOT_TARGET=lilypad_resonator
+    - OPTIBOOT_TARGET=luminet
+    - OPTIBOOT_TARGET=mega1280
+    - OPTIBOOT_TARGET=mega2560
+    - OPTIBOOT_TARGET=mighty1284
+    - OPTIBOOT_TARGET=pro16
+    - OPTIBOOT_TARGET=pro20
+    - OPTIBOOT_TARGET=pro8
+    - OPTIBOOT_TARGET=sanguino
+    - OPTIBOOT_TARGET=virboot328
+    - OPTIBOOT_TARGET=virboot8
+    - OPTIBOOT_TARGET=wildfire
+    - OPTIBOOT_TARGET=wildfirev2
+    - OPTIBOOT_TARGET=wildfirev3
+    - OPTIBOOT_TARGET=xplained168pb
+    - OPTIBOOT_TARGET=xplained328p
+    - OPTIBOOT_TARGET=xplained328pb
 
 matrix:
   allow_failures:
-    - env: OPTIBOOT_TARGET=attiny828
-    - env: OPTIBOOT_TARGET=atmega324pb
-    - env: OPTIBOOT_TARGET="atmega328pb LED=B5"
+    - env: OPTIBOOT_TARGET="atmega328 LED_START_FLASHES=0 LED_START_ON=1 SUPPORT_EEPROM=1"
+    - env: OPTIBOOT_TARGET="atmega328 LED_START_FLASHES=0 SUPPORT_EEPROM=1"
 
 script: scripts/travis-build.sh $TOOLS_VERSION $OPTIBOOT_TARGET
 

docs/arduino-gcc-versions.md

@@ -40,3 +40,5 @@ based on Linux versions.
 |1.8.3    |4.9.2    |same as 1.8.2| |
 |1.8.4    |4.9.2    |same as 1.8.2| |
 |1.8.5    |4.9.2    |same as 1.8.2| yes |
+|1.8.6    |5.4.0    |new toolchains, added ATmega328PB and ATmega324PB among others| |
+|1.8.7    |5.4.0    |same as 1.8.6| yes |

optiboot/bootloaders/optiboot/Makefile

@@ -381,7 +381,7 @@ atmega168: AVR_FREQ ?= 16000000L
 ifndef BIGBOOT
 atmega168: LDSECTIONS  = -Wl,--section-start=.text=0x3e00 -Wl,--section-start=.version=0x3ffe
 else
-atmeg168: LDSECTIONS  = -Wl,--section-start=.text=0x3c00 -Wl,--section-start=.version=0x3ffe
+atmega168: LDSECTIONS  = -Wl,--section-start=.text=0x3c00 -Wl,--section-start=.version=0x3ffe
 endif
 atmega168: $(PROGRAM)_atmega168.hex
 ifndef PRODUCTION

optiboot/bootloaders/optiboot/Makefile.MCUdude

@@ -115,15 +115,15 @@ endif
 atmega164pa: atmega164p
 
 #ATmega168/A
-atmega168: TARGET = atmega168
-atmega168: MCU_TARGET = atmega168
-atmega168: CFLAGS += $(COMMON_OPTIONS) $(UART_CMD)
-atmega168: AVR_FREQ ?= 16000000L 
-atmega168: LDSECTIONS = -Wl,--section-start=.text=0x3e00 -Wl,--section-start=.version=0x3ffe
-atmega168: $(PROGRAM)_atmega168_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex
-ifndef PRODUCTION
-atmega168: $(PROGRAM)_atmega168_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst
-endif
+#atmega168: TARGET = atmega168
+#atmega168: MCU_TARGET = atmega168
+#atmega168: CFLAGS += $(COMMON_OPTIONS) $(UART_CMD)
+#atmega168: AVR_FREQ ?= 16000000L 
+#atmega168: LDSECTIONS = -Wl,--section-start=.text=0x3e00 -Wl,--section-start=.version=0x3ffe
+#atmega168: $(PROGRAM)_atmega168_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex
+#ifndef PRODUCTION
+#atmega168: $(PROGRAM)_atmega168_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst
+#endif
 atmega168a: atmega168
 
 #ATmega168P/PA

optiboot/bootloaders/optiboot/Makefile.tiny

@@ -346,14 +346,14 @@ endif
 
 
 attiny828at8: 
-	$(MAKE) attiny828at8 AVR_FREQ=8000000L BAUD_RATE=57600
+	$(MAKE) attiny828 AVR_FREQ=8000000L BAUD_RATE=57600
 	mv $(PROGRAM)_attiny828.hex $(PROGRAM)_$@.hex
 ifndef PRODUCTION
 	mv $(PROGRAM)_attiny828.lst $(PROGRAM)_$@.lst
 endif
 
 attiny828at8_5v: 
-	$(MAKE) attiny828at8 AVR_FREQ=8200000L BAUD_RATE=57600
+	$(MAKE) attiny828 AVR_FREQ=8200000L BAUD_RATE=57600
 	mv $(PROGRAM)_attiny828.hex $(PROGRAM)_$@.hex
 ifndef PRODUCTION
 	mv $(PROGRAM)_attiny828.lst $(PROGRAM)_$@.lst

optiboot/bootloaders/optiboot/makeall.tiny.sh

@@ -42,3 +42,5 @@ make attiny841at8ser1 $*
 make attiny841at20noLED $*
 make attiny841at16noLED $*
 make attiny841at8noLED $*
+
+make attiny828at8 $*

scripts/travis-check-sizes.sh

@@ -46,7 +46,7 @@ else
 fi
 
 # start json
-echo "{\"slug\":\"$REPO\",\"branch\":\"$BRANCH\",\"commit\":\"$TRAVIS_COMMIT\",\"emoji\":\"false\",\"builds\":[" >"$OUTPUT_JSON"
+echo "{\"slug\":\"$REPO\",\"branch\":\"$BRANCH\",\"commit\":\"$TRAVIS_COMMIT\",\"emoji\":\"true\",\"builds\":[" >"$OUTPUT_JSON"
 
 # build everything
 cat $TRAVIS_BUILD_DIR/.travis.yml|grep "    - OPTIBOOT_TARGET="|cut -f 2- -d '=' \