8
8
9
9
# associative array for the platforms that will be verified in build_main_platforms()
10
10
# this will be eval'd in the functions below because arrays can't be exported
11
- # Uno is ATmega328, Zero is SAMD21G18, ESP8277 , Leonardo is ATmega32u4, M4 is SAMD51, Mega is ATmega2560, ESP32
12
- export MAIN_PLATFORMS=' declare -A main_platforms=( [uno]="arduino:avr:uno" [due]="arduino:sam:arduino_due_x" [zero]="arduino:samd:arduino_zero_native" [esp8266]="esp8266:esp8266:huzzah:FlashSize=4M3M,CpuFrequency=80" [leonardo]="arduino:avr:leonardo" [m4]="adafruit:samd:adafruit_metro_m4" [mega2560]="arduino:avr:mega:cpu=atmega2560" [esp32]="espressif :esp32:featheresp32:FlashFreq=80" )'
11
+ # Uno is ATmega328, Zero is SAMD21G18, ESP8266 , Leonardo is ATmega32u4, M4 is SAMD51, Mega is ATmega2560, ESP32
12
+ export MAIN_PLATFORMS=' declare -A main_platforms=( [uno]="arduino:avr:uno" [due]="arduino:sam:arduino_due_x" [zero]="arduino:samd:arduino_zero_native" [esp8266]="esp8266:esp8266:huzzah:FlashSize=4M3M,CpuFrequency=80" [leonardo]="arduino:avr:leonardo" [m4]="adafruit:samd:adafruit_metro_m4" [mega2560]="arduino:avr:mega:cpu=atmega2560" [esp32]="esp32 :esp32:featheresp32:FlashFreq=80" )'
13
13
14
14
# associative array for other platforms that can be called explicitly in .travis.yml configs
15
15
# this will be eval'd in the functions below because arrays can't be exported
@@ -21,7 +21,7 @@ export SAMD_PLATFORMS='declare -A samd_platforms=( [zero]="arduino:samd:arduino_
21
21
22
22
export M4_PLATFORMS=' declare -A m4_platforms=( [m4]="adafruit:samd:adafruit_metro_m4" )'
23
23
24
- export IO_PLATFORMS=' declare -A io_platforms=( [zero]="arduino:samd:arduino_zero_native" [esp8266]="esp8266:esp8266:huzzah:FlashSize=4M3M,CpuFrequency=80" [esp32]="espressif :esp32:featheresp32:FlashFreq=80" )'
24
+ export IO_PLATFORMS=' declare -A io_platforms=( [zero]="arduino:samd:arduino_zero_native" [esp8266]="esp8266:esp8266:huzzah:FlashSize=4M3M,CpuFrequency=80" [esp32]="esp32 :esp32:featheresp32:FlashFreq=80" )'
25
25
26
26
# make display available for arduino CLI
27
27
/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16
@@ -37,7 +37,7 @@ echo "########################################################################";
37
37
38
38
# if .travis.yml does not set version
39
39
if [ -z $ARDUINO_IDE_VERSION ]; then
40
- export ARDUINO_IDE_VERSION=" 1.8.5 "
40
+ export ARDUINO_IDE_VERSION=" 1.8.6 "
41
41
echo " NOTE: YOUR .TRAVIS.YML DOES NOT SPECIFY ARDUINO IDE VERSION, USING $ARDUINO_IDE_VERSION "
42
42
fi
43
43
@@ -46,7 +46,7 @@ if [ ! -f $HOME/arduino_ide/$ARDUINO_IDE_VERSION ] && [ -f $HOME/arduino_ide/ard
46
46
echo -n " DIFFERENT VERSION OF ARDUINO IDE REQUESTED: "
47
47
shopt -s extglob
48
48
cd $HOME /arduino_ide/
49
- rm -r -f ! (esp32)
49
+ rm -rf *
50
50
if [ $? -ne 0 ]; then echo -e " " " $RED " " \xe2\x9c\x96" ; else echo -e " " " $GREEN " " \xe2\x9c\x93" ; fi
51
51
cd $OLDPWD
52
52
fi
@@ -80,31 +80,12 @@ echo "########################################################################";
80
80
81
81
# install the due, esp8266, and adafruit board packages
82
82
echo -n " ADD PACKAGE INDEX: "
83
- DEPENDENCY_OUTPUT=$( arduino --pref " boardsmanager.additional.urls=https://adafruit.github.io/arduino-board-index/package_adafruit_index.json,http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs 2>&1 )
83
+ DEPENDENCY_OUTPUT=$( arduino --pref " boardsmanager.additional.urls=https://adafruit.github.io/arduino-board-index/package_adafruit_index.json,http://arduino.esp8266.com/stable/package_esp8266com_index.json,https://dl.espressif.com/dl/package_esp32_index.json " --save-prefs 2>&1 )
84
84
if [ $? -ne 0 ]; then echo -e " " " $RED " " \xe2\x9c\x96" ; else echo -e " " " $GREEN " " \xe2\x9c\x93" ; fi
85
85
86
86
echo -n " ESP32: "
87
-
88
- if [ ! -d $HOME /Arduino/hardware/espressif ]; then
89
- DEPENDENCY_OUTPUT=$( mkdir -p $HOME /Arduino/hardware/espressif &&
90
- cd $HOME /Arduino/hardware/espressif &&
91
- echo -n " DOWNLOADING: " &&
92
- git clone https://github.com/espressif/arduino-esp32.git esp32 -q &&
93
- cd esp32/tools/ &&
94
- python get.py &&
95
- cd $TRAVIS_BUILD_DIR
96
- )
97
- else
98
- DEPENDENCY_OUTPUT=$( cd $HOME /Arduino/hardware/espressif &&
99
- echo -n " UPDATING: " &&
100
- git pull origin master -q &&
101
- cd esp32/tools/ &&
102
- python get.py &&
103
- cd $TRAVIS_BUILD_DIR
104
- )
105
- fi
106
-
107
- if [ $? -ne 0 ]; then echo -e " " " $RED " " \xe2\x9c\x96" ; else echo -e " " " $GREEN " " \xe2\x9c\x93" ; fi
87
+ DEPENDENCY_OUTPUT=$( arduino --install-boards esp32:esp32 2>&1 )
88
+ if [ $? -ne 0 ]; then echo -e " \xe2\x9c\x96 OR CACHED" ; else echo -e " " " $GREEN " " \xe2\x9c\x93" ; fi
108
89
109
90
echo -n " DUE: "
110
91
DEPENDENCY_OUTPUT=$( arduino --install-boards arduino:sam 2>&1 )
@@ -665,4 +646,4 @@ function json_main_platforms()
665
646
666
647
echo -e " ||||||||||||||||||||||||||||| JSON STATUS ||||||||||||||||||||||||||||||\n"
667
648
668
- }
649
+ }
0 commit comments