From 08808be62b384028fc9ad253e1e72e68cb078e31 Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Wed, 11 Mar 2015 20:45:11 +0200 Subject: [PATCH] Fix "frameworks" field to JSON array --- platformio/boards/arduino.json | 62 ++++++++++++------------- platformio/boards/digistump.json | 10 ++-- platformio/boards/engduino.json | 6 +-- platformio/boards/freescalekinetis.json | 24 +++++----- platformio/boards/microduino.json | 18 +++---- platformio/boards/misc.json | 10 ++-- platformio/boards/nordicnrf51.json | 28 +++++------ platformio/boards/nxplpc.json | 52 ++++++++++----------- platformio/boards/ststm32.json | 36 +++++++------- platformio/boards/teensy.json | 8 ++-- platformio/boards/timsp430.json | 14 +++--- platformio/boards/titiva.json | 6 +-- platformio/commands/init.py | 6 +-- tests/commands/test_init.py | 2 +- 14 files changed, 141 insertions(+), 141 deletions(-) diff --git a/platformio/boards/arduino.json b/platformio/boards/arduino.json index 12cadb1c..2736d067 100644 --- a/platformio/boards/arduino.json +++ b/platformio/boards/arduino.json @@ -10,7 +10,7 @@ "variant": "leonardo", "vid": "0x1B4F" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "LilyPad Arduino USB", "platform": "atmelavr", "upload": { @@ -34,7 +34,7 @@ "mcu": "atmega168", "variant": "standard" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino NG or older ATmega168", "platform": "atmelavr", "upload": { @@ -55,7 +55,7 @@ "mcu": "atmega8", "variant": "standard" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino NG or older ATmega8", "platform": "atmelavr", "upload": { @@ -76,7 +76,7 @@ "mcu": "atmega168", "variant": "eightanaloginputs" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino BT ATmega168", "platform": "atmelavr", "upload": { @@ -98,7 +98,7 @@ "mcu": "atmega328p", "variant": "eightanaloginputs" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino BT ATmega328", "platform": "atmelavr", "upload": { @@ -120,7 +120,7 @@ "mcu": "atmega168", "variant": "standard" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Duemilanove or Diecimila ATmega168", "platform": "atmelavr", "upload": { @@ -141,7 +141,7 @@ "mcu": "atmega328p", "variant": "standard" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Duemilanove or Diecimila ATmega328", "platform": "atmelavr", "upload": { @@ -165,7 +165,7 @@ "variant": "leonardo", "vid": "0x2341" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Esplora", "platform": "atmelavr", "upload": { @@ -189,7 +189,7 @@ "mcu": "atmega328p", "variant": "ethernet" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Ethernet", "platform": "atmelavr", "upload": { @@ -210,7 +210,7 @@ "mcu": "atmega328p", "variant": "eightanaloginputs" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Fio", "platform": "atmelavr", "upload": { @@ -234,7 +234,7 @@ "variant": "leonardo", "vid": "0x2341" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Leonardo", "platform": "atmelavr", "upload": { @@ -258,7 +258,7 @@ "mcu": "atmega168", "variant": "standard" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "LilyPad Arduino ATmega168", "platform": "atmelavr", "upload": { @@ -279,7 +279,7 @@ "mcu": "atmega328p", "variant": "standard" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "LilyPad Arduino ATmega328", "platform": "atmelavr", "upload": { @@ -300,7 +300,7 @@ "mcu": "atmega2560", "variant": "mega" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Mega ADK", "platform": "atmelavr", "upload": { @@ -321,7 +321,7 @@ "mcu": "atmega1280", "variant": "mega" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Mega or Mega 2560 ATmega1280", "platform": "atmelavr", "upload": { @@ -342,7 +342,7 @@ "mcu": "atmega2560", "variant": "mega" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Mega or Mega 2560 ATmega2560 (Mega 2560)", "platform": "atmelavr", "upload": { @@ -366,7 +366,7 @@ "variant": "micro", "vid": "0x2341" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Micro", "platform": "atmelavr", "upload": { @@ -390,7 +390,7 @@ "mcu": "atmega168", "variant": "eightanaloginputs" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Mini ATmega168", "platform": "atmelavr", "upload": { @@ -411,7 +411,7 @@ "mcu": "atmega328p", "variant": "eightanaloginputs" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Mini ATmega328", "platform": "atmelavr", "upload": { @@ -432,7 +432,7 @@ "mcu": "atmega168", "variant": "eightanaloginputs" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Nano ATmega168", "platform": "atmelavr", "upload": { @@ -453,7 +453,7 @@ "mcu": "atmega328p", "variant": "eightanaloginputs" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Nano ATmega328", "platform": "atmelavr", "upload": { @@ -474,7 +474,7 @@ "mcu": "atmega168", "variant": "eightanaloginputs" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Pro or Pro Mini ATmega168 (5V, 16 MHz)", "platform": "atmelavr", "upload": { @@ -495,7 +495,7 @@ "mcu": "atmega328p", "variant": "eightanaloginputs" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Pro or Pro Mini ATmega328 (5V, 16 MHz)", "platform": "atmelavr", "upload": { @@ -516,7 +516,7 @@ "mcu": "atmega168", "variant": "eightanaloginputs" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Pro or Pro Mini ATmega168 (3.3V, 8 MHz)", "platform": "atmelavr", "upload": { @@ -537,7 +537,7 @@ "mcu": "atmega328p", "variant": "eightanaloginputs" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Pro or Pro Mini ATmega328 (3.3V, 8 MHz)", "platform": "atmelavr", "upload": { @@ -561,7 +561,7 @@ "variant": "robot_control", "vid": "0x2341" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Robot Control", "platform": "atmelavr", "upload": { @@ -588,7 +588,7 @@ "variant": "robot_motor", "vid": "0x2341" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Robot Motor", "platform": "atmelavr", "upload": { @@ -612,7 +612,7 @@ "mcu": "atmega328p", "variant": "standard" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Uno", "platform": "atmelavr", "upload": { @@ -636,7 +636,7 @@ "variant": "yun", "vid": "0x2341" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Yun", "platform": "atmelavr", "upload": { @@ -666,7 +666,7 @@ "vid": "0x2341", "ldscript": "sam3x8e.ld" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Due (Programming Port)", "platform": "atmelsam", "upload": { @@ -694,7 +694,7 @@ "vid": "0x2341", "ldscript": "sam3x8e.ld" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Arduino Due (USB Native Port)", "platform": "atmelsam", "upload": { diff --git a/platformio/boards/digistump.json b/platformio/boards/digistump.json index 0f0f135e..c03d3680 100644 --- a/platformio/boards/digistump.json +++ b/platformio/boards/digistump.json @@ -7,7 +7,7 @@ "mcu": "attiny85", "variant": "digispark_tiny" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Digispark (Default - 16 MHz)", "platform": "atmelavr", "upload": { @@ -26,7 +26,7 @@ "mcu": "attiny167", "variant": "digispark_pro" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Digispark Pro (Default 16 MHz)", "platform": "atmelavr", "upload": { @@ -45,7 +45,7 @@ "mcu": "attiny167", "variant": "digispark_pro32" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Digispark Pro (16 MHz) (32 byte buffer)", "platform": "atmelavr", "upload": { @@ -64,7 +64,7 @@ "mcu": "attiny167", "variant": "digispark_pro64" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Digispark Pro (16 MHz) (64 byte buffer)", "platform": "atmelavr", "upload": { @@ -88,7 +88,7 @@ "variant": "digispark_digix", "vid": "0x16D0" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Digistump DigiX", "platform": "atmelsam", "upload": { diff --git a/platformio/boards/engduino.json b/platformio/boards/engduino.json index 159887a1..a08639cf 100644 --- a/platformio/boards/engduino.json +++ b/platformio/boards/engduino.json @@ -10,7 +10,7 @@ "variant": "engduinov1", "vid": "0x1B4F" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Engduino 1", "platform": "atmelavr", "upload": { @@ -37,7 +37,7 @@ "variant": "engduinov2", "vid": "0x1B4F" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Engduino 2", "platform": "atmelavr", "upload": { @@ -64,7 +64,7 @@ "variant": "engduinov3", "vid": "0x1B4F" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Engduino 3", "platform": "atmelavr", "upload": { diff --git a/platformio/boards/freescalekinetis.json b/platformio/boards/freescalekinetis.json index b33cbd84..88be3603 100644 --- a/platformio/boards/freescalekinetis.json +++ b/platformio/boards/freescalekinetis.json @@ -3,9 +3,9 @@ "build": { "f_cpu": "48000000L", "cpu": "cortex-m0plus", - "mcu": "mkl25z128vlk4" + "mcu": "mkl25z128vlk4" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "Freescale Kinetis FRDM-KL25Z", "platform": "freescalekinetis", "upload": { @@ -19,9 +19,9 @@ "build": { "f_cpu": "48000000L", "cpu": "cortex-m0plus", - "mcu": "mkl46z256vll4" + "mcu": "mkl46z256vll4" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "Freescale Kinetis FRDM-KL46Z", "platform": "freescalekinetis", "upload": { @@ -35,9 +35,9 @@ "build": { "f_cpu": "120000000L", "cpu": "cortex-m4", - "mcu": "mk64fn1m0vll12" + "mcu": "mk64fn1m0vll12" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "Freescale Kinetis FRDM-K64F", "platform": "freescalekinetis", "upload": { @@ -51,9 +51,9 @@ "build": { "f_cpu": "48000000L", "cpu": "cortex-m0plus", - "mcu": "mkl05z32vfm4" + "mcu": "mkl05z32vfm4" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "Freescale Kinetis FRDM-KL05Z", "platform": "freescalekinetis", "upload": { @@ -67,9 +67,9 @@ "build": { "f_cpu": "48000000L", "cpu": "cortex-m4", - "mcu": "mk20dx128vlh5" + "mcu": "mk20dx128vlh5" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "Freescale Kinetis FRDM-K20D50M", "platform": "freescalekinetis", "upload": { @@ -84,9 +84,9 @@ "build": { "f_cpu": "120000000L", "cpu": "cortex-m4", - "mcu": "mk22fn512vlh12" + "mcu": "mk22fn512vlh12" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "Freescale Kinetis FRDM-K22F", "platform": "freescalekinetis", "upload": { diff --git a/platformio/boards/microduino.json b/platformio/boards/microduino.json index 42b3411f..3336fc2e 100644 --- a/platformio/boards/microduino.json +++ b/platformio/boards/microduino.json @@ -7,7 +7,7 @@ "mcu": "atmega1284p", "variant": "plus" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Microduino Core+ (ATmega1284P@16M,5V)", "platform": "atmelavr", "upload": { @@ -28,7 +28,7 @@ "mcu": "atmega1284p", "variant": "plus" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Microduino Core+ (ATmega1284P@8M,3.3V)", "platform": "atmelavr", "upload": { @@ -49,7 +49,7 @@ "mcu": "atmega168p", "variant": "standard" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Microduino Core (Atmega168PA@16M,5V)", "platform": "atmelavr", "upload": { @@ -70,7 +70,7 @@ "mcu": "atmega168p", "variant": "standard" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Microduino Core (Atmega168PA@8M,3.3V)", "platform": "atmelavr", "upload": { @@ -91,7 +91,7 @@ "mcu": "atmega328p", "variant": "standard" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Microduino Core (Atmega328P@16M,5V)", "platform": "atmelavr", "upload": { @@ -112,7 +112,7 @@ "mcu": "atmega328p", "variant": "standard" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Microduino Core (Atmega328P@8M,3.3V)", "platform": "atmelavr", "upload": { @@ -135,7 +135,7 @@ "variant": "32u4", "vid": "0x2341" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Microduino Core USB (ATmega32U4@16M,5V)", "platform": "atmelavr", "upload": { @@ -159,7 +159,7 @@ "mcu": "atmega644p", "variant": "plus" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Microduino Core+ (Atmega644PA@16M,5V)", "platform": "atmelavr", "upload": { @@ -180,7 +180,7 @@ "mcu": "atmega644p", "variant": "plus" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Microduino Core+ (Atmega644PA@8M,3.3V)", "platform": "atmelavr", "upload": { diff --git a/platformio/boards/misc.json b/platformio/boards/misc.json index 2b24d002..abb6d9a1 100644 --- a/platformio/boards/misc.json +++ b/platformio/boards/misc.json @@ -7,7 +7,7 @@ "mcu": "atmega328p", "variant": "standard" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Raspduino", "platform": "atmelavr", "upload": { @@ -33,7 +33,7 @@ "vid": "0x2341", "ldscript": "sam3x8e.ld" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "SainSmart Due (Programming Port)", "platform": "atmelsam", "upload": { @@ -41,7 +41,7 @@ "maximum_ram_size": 32768, "maximum_size": 524288, "protocol": "sam-ba", - "require_upload_port" : true, + "require_upload_port" : true, "use_1200bps_touch": true, "wait_for_upload_port": true }, @@ -61,7 +61,7 @@ "vid": "0x2341", "ldscript": "sam3x8e.ld" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "SainSmart Due (USB Native Port)", "platform": "atmelsam", "upload": { @@ -69,7 +69,7 @@ "maximum_ram_size": 32768, "maximum_size": 524288, "protocol": "sam-ba", - "require_upload_port" : true, + "require_upload_port" : true, "use_1200bps_touch": true, "wait_for_upload_port": true }, diff --git a/platformio/boards/nordicnrf51.json b/platformio/boards/nordicnrf51.json index d88d4ebf..acdabaee 100644 --- a/platformio/boards/nordicnrf51.json +++ b/platformio/boards/nordicnrf51.json @@ -3,9 +3,9 @@ "build": { "f_cpu": "16000000L", "cpu": "cortex-m0", - "mcu": "nrf51822" + "mcu": "nrf51822" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "Nordic nRF51822-mKIT", "platform": "nordicnrf51", "upload": { @@ -19,9 +19,9 @@ "build": { "f_cpu": "16000000L", "cpu": "cortex-m0", - "mcu": "nrf51822" + "mcu": "nrf51822" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "Switch Science mbed HRM1017", "platform": "nordicnrf51", "upload": { @@ -35,9 +35,9 @@ "build": { "f_cpu": "16000000L", "cpu": "cortex-m0", - "mcu": "nrf51822" + "mcu": "nrf51822" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "RedBearLab nRF51822", "platform": "nordicnrf51", "upload": { @@ -51,9 +51,9 @@ "build": { "f_cpu": "32000000L", "cpu": "cortex-m0", - "mcu": "nrf51822" + "mcu": "nrf51822" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "Nordic nRF51-DK", "platform": "nordicnrf51", "upload": { @@ -67,9 +67,9 @@ "build": { "f_cpu": "16000000L", "cpu": "cortex-m0", - "mcu": "nrf51822" + "mcu": "nrf51822" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "RedBearLab BLE Nano", "platform": "nordicnrf51", "upload": { @@ -83,9 +83,9 @@ "build": { "f_cpu": "32000000L", "cpu": "cortex-m0", - "mcu": "nrf51822" + "mcu": "nrf51822" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "Nordic nRF51-Dongle", "platform": "nordicnrf51", "upload": { @@ -100,9 +100,9 @@ "build": { "f_cpu": "16000000L", "cpu": "cortex-m0", - "mcu": "nrf51822" + "mcu": "nrf51822" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "JKSoft Wallbot BLE", "platform": "nordicnrf51", "upload": { diff --git a/platformio/boards/nxplpc.json b/platformio/boards/nxplpc.json index 57cfdfc8..67392e27 100644 --- a/platformio/boards/nxplpc.json +++ b/platformio/boards/nxplpc.json @@ -3,9 +3,9 @@ "build": { "f_cpu": "96000000L", "cpu": "cortex-m3", - "mcu": "lpc1768" + "mcu": "lpc1768" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "mbed LPC1768", "platform": "nxplpc", "upload": { @@ -19,9 +19,9 @@ "build": { "f_cpu": "48000000L", "cpu": "cortex-m0", - "mcu": "lpc11u24" + "mcu": "lpc11u24" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "mbed LPC11U24", "platform": "nxplpc", "upload": { @@ -35,9 +35,9 @@ "build": { "f_cpu": "120000000L", "cpu": "cortex-m4", - "mcu": "lpc4088" + "mcu": "lpc4088" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "EA LPC4088 QuickStart Board", "platform": "nxplpc", "upload": { @@ -51,9 +51,9 @@ "build": { "f_cpu": "50000000L", "cpu": "cortex-m0", - "mcu": "lpc11u24" + "mcu": "lpc11u24" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "DipCortex M0", "platform": "nxplpc", "upload": { @@ -67,9 +67,9 @@ "build": { "f_cpu": "48000000L", "cpu": "cortex-m0", - "mcu": "lpc11u24" + "mcu": "lpc11u24" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "BlueBoard-LPC11U24", "platform": "nxplpc", "upload": { @@ -83,9 +83,9 @@ "build": { "f_cpu": "96000000L", "cpu": "cortex-m3", - "mcu": "lpc1768" + "mcu": "lpc1768" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "Seeeduino-Arch-Pro", "platform": "nxplpc", "upload": { @@ -99,9 +99,9 @@ "build": { "f_cpu": "96000000L", "cpu": "cortex-m3", - "mcu": "lpc1768" + "mcu": "lpc1768" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "u-blox C027", "platform": "nxplpc", "upload": { @@ -115,9 +115,9 @@ "build": { "f_cpu": "48000000L", "cpu": "cortex-m0", - "mcu": "lpc1114fn28" + "mcu": "lpc1114fn28" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "mbed LPC1114FN28", "platform": "nxplpc", "upload": { @@ -131,9 +131,9 @@ "build": { "f_cpu": "48000000L", "cpu": "cortex-m0", - "mcu": "lpc11u35" + "mcu": "lpc11u35" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "EA LPC11U35 QuickStart Board", "platform": "nxplpc", "upload": { @@ -147,9 +147,9 @@ "build": { "f_cpu": "48000000L", "cpu": "cortex-m0", - "mcu": "lpc11u35" + "mcu": "lpc11u35" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "TG-LPC11U35-501", "platform": "nxplpc", "upload": { @@ -163,9 +163,9 @@ "build": { "f_cpu": "72000000L", "cpu": "cortex-m3", - "mcu": "lpc1549" + "mcu": "lpc1549" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "LPCXpresso1549", "platform": "nxplpc", "upload": { @@ -179,9 +179,9 @@ "build": { "f_cpu": "48000000L", "cpu": "cortex-m0", - "mcu": "lpc11u24" + "mcu": "lpc11u24" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "Outrageous Circuits mBuino", "platform": "nxplpc", "upload": { @@ -195,9 +195,9 @@ "build": { "f_cpu": "120000000L", "cpu": "cortex-m4", - "mcu": "lpc4088" + "mcu": "lpc4088" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "EA LPC4088 Display Module", "platform": "nxplpc", "upload": { diff --git a/platformio/boards/ststm32.json b/platformio/boards/ststm32.json index c917d2f6..b1e29c7d 100644 --- a/platformio/boards/ststm32.json +++ b/platformio/boards/ststm32.json @@ -9,7 +9,7 @@ "mcu": "stm32f407vgt6", "variant": "stm32f4" }, - "frameworks": "cmsis,spl,opencm3,mbed", + "frameworks": ["cmsis", "spl", "opencm3", "mbed"], "name": "STM32F4DISCOVERY", "platform": "ststm32", "upload": { @@ -29,7 +29,7 @@ "mcu": "stm32l152rbt6", "variant": "stm32l1" }, - "frameworks": "cmsis,spl,opencm3", + "frameworks": ["cmsis","spl","opencm3"], "name": "STM32LDISCOVERY", "platform": "ststm32", "upload": { @@ -65,7 +65,7 @@ "cpu": "cortex-m3", "mcu": "stm32f100rbt6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "STM32VLDISCOVERY", "platform": "ststm32", "upload": { @@ -81,7 +81,7 @@ "cpu": "cortex-m0", "mcu": "stm32f051r8t6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "STM32F0DISCOVERY", "platform": "ststm32", "upload": { @@ -97,7 +97,7 @@ "cpu": "cortex-m4", "mcu": "stm32f334c8t6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "32F3348DISCOVERY", "platform": "ststm32", "upload": { @@ -113,7 +113,7 @@ "cpu": "cortex-m4", "mcu": "stm32f401vct6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "32F401CDISCOVERY", "platform": "ststm32", "upload": { @@ -129,7 +129,7 @@ "cpu": "cortex-m4", "mcu": "stm32f429zit6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "32F429IDISCOVERY", "platform": "ststm32", "upload": { @@ -145,7 +145,7 @@ "cpu": "cortex-m0", "mcu": "stm32f030r8t6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "ST Nucleo F030R8", "platform": "ststm32", "upload": { @@ -161,7 +161,7 @@ "cpu": "cortex-m0", "mcu": "stm32f070rbt6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "ST Nucleo F070RB", "platform": "ststm32", "upload": { @@ -177,7 +177,7 @@ "cpu": "cortex-m0", "mcu": "stm32f072rbt6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "ST Nucleo F072RB", "platform": "ststm32", "upload": { @@ -193,7 +193,7 @@ "cpu": "cortex-m0", "mcu": "stm32f091rct6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "ST Nucleo F091RC", "platform": "ststm32", "upload": { @@ -209,7 +209,7 @@ "cpu": "cortex-m3", "mcu": "stm32f103rbt6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "ST Nucleo F103RB", "platform": "ststm32", "upload": { @@ -225,7 +225,7 @@ "cpu": "cortex-m4", "mcu": "stm32f302r8t6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "ST Nucleo F302R8", "platform": "ststm32", "upload": { @@ -241,7 +241,7 @@ "cpu": "cortex-m4", "mcu": "stm32f334r8t6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "ST Nucleo F334R8", "platform": "ststm32", "upload": { @@ -257,7 +257,7 @@ "cpu": "cortex-m4", "mcu": "stm32f401ret6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "ST Nucleo F401RE", "platform": "ststm32", "upload": { @@ -273,7 +273,7 @@ "cpu": "cortex-m4", "mcu": "stm32f411ret6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "ST Nucleo F411RE", "platform": "ststm32", "upload": { @@ -289,7 +289,7 @@ "cpu": "cortex-m0", "mcu": "stm32l053r8t6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "ST Nucleo L053R8", "platform": "ststm32", "upload": { @@ -305,7 +305,7 @@ "cpu": "cortex-m3", "mcu": "stm32l152ret6" }, - "frameworks": "mbed", + "frameworks": ["mbed"], "name": "ST Nucleo L152RE", "platform": "ststm32", "upload": { diff --git a/platformio/boards/teensy.json b/platformio/boards/teensy.json index 6914b37a..bb3b4a88 100644 --- a/platformio/boards/teensy.json +++ b/platformio/boards/teensy.json @@ -5,7 +5,7 @@ "f_cpu": "16000000L", "mcu": "atmega32u4" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Teensy 2.0", "platform": "teensy", "upload": { @@ -22,7 +22,7 @@ "f_cpu": "16000000L", "mcu": "at90usb1286" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Teensy++ 2.0", "platform": "teensy", "upload": { @@ -42,7 +42,7 @@ "mcu": "mk20dx128", "cpu": "cortex-m4" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Teensy 3.0", "platform": "teensy", "upload": { @@ -62,7 +62,7 @@ "mcu": "mk20dx256", "cpu": "cortex-m4" }, - "frameworks": "arduino", + "frameworks": ["arduino"], "name": "Teensy 3.1", "platform": "teensy", "upload": { diff --git a/platformio/boards/timsp430.json b/platformio/boards/timsp430.json index b93e9fab..88731614 100644 --- a/platformio/boards/timsp430.json +++ b/platformio/boards/timsp430.json @@ -6,7 +6,7 @@ "mcu": "msp430f5529", "variant": "launchpad_f5529" }, - "frameworks": "energia", + "frameworks": ["energia"], "name": "LaunchPad w/ msp430f5529 (16MHz)", "platform": "timsp430", "upload": { @@ -24,7 +24,7 @@ "mcu": "msp430f5529", "variant": "launchpad_f5529" }, - "frameworks": "energia", + "frameworks": ["energia"], "name": "LaunchPad w/ msp430f5529 (25MHz)", "platform": "timsp430", "upload": { @@ -42,7 +42,7 @@ "mcu": "msp430fr5739", "variant": "fraunchpad" }, - "frameworks": "energia", + "frameworks": ["energia"], "name": "FraunchPad w/ msp430fr5739", "platform": "timsp430", "upload": { @@ -60,7 +60,7 @@ "mcu": "msp430fr5969", "variant": "launchpad_fr5969" }, - "frameworks": "energia", + "frameworks": ["energia"], "name": "LaunchPad w/ msp430fr5969", "platform": "timsp430", "upload": { @@ -78,7 +78,7 @@ "mcu": "msp430g2231", "variant": "launchpad" }, - "frameworks": "energia", + "frameworks": ["energia"], "name": "LaunchPad w/ msp430g2231 (1 MHz)", "platform": "timsp430", "upload": { @@ -96,7 +96,7 @@ "mcu": "msp430g2452", "variant": "launchpad" }, - "frameworks": "energia", + "frameworks": ["energia"], "name": "LaunchPad w/ msp430g2452 (16MHz)", "platform": "timsp430", "upload": { @@ -114,7 +114,7 @@ "mcu": "msp430g2553", "variant": "launchpad" }, - "frameworks": "energia", + "frameworks": ["energia"], "name": "LaunchPad w/ msp430g2553 (16MHz)", "platform": "timsp430", "upload": { diff --git a/platformio/boards/titiva.json b/platformio/boards/titiva.json index 0fcbc576..6b90b012 100644 --- a/platformio/boards/titiva.json +++ b/platformio/boards/titiva.json @@ -8,7 +8,7 @@ "mcu": "lplm4f120h5qr", "variant": "stellarpad" }, - "frameworks": "energia,opencm3", + "frameworks": ["energia", "opencm3"], "name": "LaunchPad (Stellaris) w/ lm4f120 (80MHz)", "platform": "titiva", "upload": { @@ -27,7 +27,7 @@ "mcu": "lptm4c1230c3pm", "variant": "stellarpad" }, - "frameworks": "energia,opencm3", + "frameworks": ["energia", "opencm3"], "name": "LaunchPad (Tiva C) w/ tm4c123 (80MHz)", "platform": "titiva", "upload": { @@ -46,7 +46,7 @@ "mcu": "lptm4c1294ncpdt", "variant": "launchpad_129" }, - "frameworks": "energia,opencm3", + "frameworks": ["energia", "opencm3"], "name": "LaunchPad (Tiva C) w/ tm4c129 (120MHz)", "platform": "titiva", "upload": { diff --git a/platformio/commands/init.py b/platformio/commands/init.py index 355597e4..1c32ecca 100644 --- a/platformio/commands/init.py +++ b/platformio/commands/init.py @@ -94,11 +94,11 @@ def fill_project_envs(project_file, board_types, disable_auto_uploading): data = builtin_boards[type_] # find default framework for board - framework = data.get("frameworks", None).split(",")[0] + frameworks = data.get("frameworks") content.append("[env:autogen_%s]" % type_) content.append("platform = %s" % data['platform']) - if framework: - content.append("framework = %s" % framework) + if frameworks: + content.append("framework = %s" % frameworks[0]) content.append("board = %s" % type_) content.append("%stargets = upload" % ("# " if disable_auto_uploading diff --git a/tests/commands/test_init.py b/tests/commands/test_init.py index 3dd9e318..0d816ff2 100644 --- a/tests/commands/test_init.py +++ b/tests/commands/test_init.py @@ -41,7 +41,7 @@ def test_init_special_board(platformio_setup, clirunner, validate_cliresult): config = util.get_project_config() expected_result = [ ("platform", str(uno['platform'])), - ("framework", str(uno['framework'])), + ("framework", str(uno['frameworks'][0])), ("board", "uno"), ("targets", "upload") ]