Release 10.1.0.

eerimoq · Oct 29, 2016 · e789054 · e789054
1 parent 65914d7
commit e789054
Show file tree

Hide file tree

Showing 9 changed files with 114 additions and 26 deletions.
diff --git a/Makefile b/Makefile
@@ -392,7 +392,7 @@ test-esp12e:
 	$(MAKE) BOARD=esp12e SERIAL_PORT=/dev/simba-esp12e test
 
 test-nano32:
-	@echo "NANO32"
+	@echo "Nano32"
 	$(MAKE) BOARD=nano32 SERIAL_PORT=/dev/simba-nano32 test
 
 test-stm32vldiscovery:

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-master
+10.1.0
diff --git a/make/arduino/avr/package_simba_avr_index.json b/make/arduino/avr/package_simba_avr_index.json
@@ -499,6 +499,37 @@
                             "version": "6.0.1-arduino5"
                         }
                     ]
+                },
+                {
+                    "name": "Simba",
+                    "architecture": "avr",
+                    "version": "10.1.0",
+                    "category": "Simba",
+                    "help": {
+                        "online": "https://simba-os.readthedocs.org"
+                    },
+                    "url": "https://sourceforge.net/projects/simba-arduino/files/avr/simba-arduino-avr-10.1.0.zip",
+	            "archiveFileName": "simba-arduino-avr-10.1.0.zip",
+	            "checksum": "SHA-256:606d57c3869d42b7645532bd33e98168d64768122bf032c76856acad844c122c",
+	            "size": "895253",
+                    "boards": [
+	                {"name" : "Arduino Mega 2560"},
+	                {"name" : "Arduino Nano"},
+	                {"name" : "Arduino Pro Micro"},
+	                {"name" : "Arduino Uno"}
+                    ],
+                    "toolsDependencies": [
+                        {
+                            "packager": "arduino",
+                            "name": "avr-gcc",
+                            "version": "4.9.2-atmel3.5.3-arduino2"
+                        },
+                        {
+                            "packager": "arduino",
+                            "name": "avrdude",
+                            "version": "6.0.1-arduino5"
+                        }
+                    ]
                 }
             ],
             "tools": [

diff --git a/make/arduino/esp/package_simba_esp_index.json b/make/arduino/esp/package_simba_esp_index.json
@@ -240,6 +240,35 @@
                             "name": "esptool"
                         }
                     ]
+                },
+                {
+                    "name": "Simba",
+                    "architecture": "esp",
+                    "version": "10.1.0",
+                    "category": "Simba",
+                    "help": {
+                        "online": "https://simba-os.readthedocs.org"
+                    },
+                    "url": "https://sourceforge.net/projects/simba-arduino/files/esp/simba-arduino-esp-10.1.0.zip",
+                    "archiveFileName": "simba-arduino-esp-10.1.0.zip",
+                    "checksum": "SHA-256:73560a17d235fe2a1d33713900156450665de4c2cf33b79615ad25cc0c0a86ee",
+                    "size": "1767288",
+                    "boards": [
+                        {"name" : "ESP-01"},
+                        {"name" : "ESP-12E"}
+                    ],
+                    "toolsDependencies": [
+                        {
+                            "packager": "Simba",
+                            "version": "1.20.0-26-gb404fb9-2",
+                            "name": "xtensa-lx106-elf-gcc"
+                        },
+                        {
+                            "packager": "Simba",
+                            "version": "0.4.9",
+                            "name": "esptool"
+                        }
+                    ]
                 }
             ],
             "tools": [

diff --git a/make/arduino/esp32/package_simba_esp32_index.json b/make/arduino/esp32/package_simba_esp32_index.json
@@ -12,17 +12,17 @@
                 {
                     "name": "Simba",
                     "architecture": "esp32",
-                    "version": "0.0.1",
+                    "version": "10.1.0",
                     "category": "Simba",
                     "help": {
                         "online": "https://simba-os.readthedocs.org"
                     },
-                    "url": "https://sourceforge.net/projects/simba-arduino/files/esp32/simba-arduino-esp32-esp32.zip",
-                    "archiveFileName": "simba-arduino-esp32-esp32.zip",
-                    "checksum": "SHA-256:fe28fd07d5a877e55d495fc8b076c07aaa4ae439408ec7401d6a8757d71b1862",
-                    "size": "17456828",
+                    "url": "https://sourceforge.net/projects/simba-arduino/files/esp32/simba-arduino-esp32-10.1.0.zip",
+                    "archiveFileName": "simba-arduino-esp32-10.1.0.zip",
+                    "checksum": "SHA-256:92a43307e6dee9122b4ad5b70ad65c231ae91a9019ff5af149445d3d57d95e69",
+                    "size": "8063931",
                     "boards": [
-                        {"name" : "NANO32"}
+                        {"name" : "Nano32"}
                     ],
                     "toolsDependencies": [
                         {

diff --git a/make/arduino/sam/package_simba_sam_index.json b/make/arduino/sam/package_simba_sam_index.json
@@ -456,6 +456,34 @@
               "version": "1.6.1-arduino"
             }
           ]
+        },
+        {
+          "name": "Simba",
+          "architecture": "sam",
+          "version": "10.1.0",
+          "category": "Simba",
+          "help": {
+            "online": "https://simba-os.readthedocs.org"
+          },
+          "url": "https://sourceforge.net/projects/simba-arduino/files/sam/simba-arduino-sam-10.1.0.zip",
+	  "archiveFileName": "simba-arduino-sam-10.1.0.zip",
+	  "checksum": "SHA-256:01ffc16628be62a9f14cbdb7773c298e4f495d22fbae46402754616d29fa7df1",
+	  "size": "884325",
+          "boards": [
+	      {"name" : "Arduino Due"}
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "arduino",
+              "name": "arm-none-eabi-gcc",
+              "version": "4.8.3-2014q1"
+            },
+            {
+              "packager": "arduino",
+              "name": "bossac",
+              "version": "1.6.1-arduino"
+            }
+          ]
         }
       ],
       "tools": [

diff --git a/make/platformio.sconscript b/make/platformio.sconscript
@@ -52,7 +52,7 @@ BOARDS = {
             "FAMILY_SAM", 
             "MCU_SAM3X8E", 
             "BOARD_ARDUINO_DUE", 
-            "VERSION=master"
+            "VERSION=10.1.0"
         ], 
         "cflags": [
             "-Werror", 
@@ -211,7 +211,7 @@ BOARDS = {
             "FAMILY_AVR", 
             "MCU_ATMEGA2560", 
             "BOARD_ARDUINO_MEGA", 
-            "VERSION=master", 
+            "VERSION=10.1.0", 
             "__DELAY_BACKWARD_COMPATIBLE__"
         ], 
         "cflags": [
@@ -366,7 +366,7 @@ BOARDS = {
             "FAMILY_AVR", 
             "MCU_ATMEGA328P", 
             "BOARD_ARDUINO_NANO", 
-            "VERSION=master", 
+            "VERSION=10.1.0", 
             "__DELAY_BACKWARD_COMPATIBLE__"
         ], 
         "cflags": [
@@ -521,7 +521,7 @@ BOARDS = {
             "FAMILY_AVR", 
             "MCU_ATMEGA32U4", 
             "BOARD_ARDUINO_PRO_MICRO", 
-            "VERSION=master", 
+            "VERSION=10.1.0", 
             "__DELAY_BACKWARD_COMPATIBLE__"
         ], 
         "cflags": [
@@ -680,7 +680,7 @@ BOARDS = {
             "FAMILY_AVR", 
             "MCU_ATMEGA328P", 
             "BOARD_ARDUINO_UNO", 
-            "VERSION=master", 
+            "VERSION=10.1.0", 
             "__DELAY_BACKWARD_COMPATIBLE__"
         ], 
         "cflags": [
@@ -835,7 +835,7 @@ BOARDS = {
             "FAMILY_LINUX", 
             "MCU_LINUX", 
             "BOARD_CYGWIN", 
-            "VERSION=master"
+            "VERSION=10.1.0"
         ], 
         "cflags": [
             "-Werror", 
@@ -964,7 +964,7 @@ BOARDS = {
             "FAMILY_ESP", 
             "MCU_ESP8266", 
             "BOARD_ESP01", 
-            "VERSION=master", 
+            "VERSION=10.1.0", 
             "ICACHE_FLASH", 
             "__STRICT_ANSI__", 
             "__ets__"
@@ -1120,7 +1120,7 @@ BOARDS = {
             "FAMILY_ESP", 
             "MCU_ESP8266", 
             "BOARD_ESP12E", 
-            "VERSION=master", 
+            "VERSION=10.1.0", 
             "ICACHE_FLASH", 
             "__STRICT_ANSI__", 
             "__ets__"
@@ -1276,7 +1276,7 @@ BOARDS = {
             "FAMILY_LINUX", 
             "MCU_LINUX", 
             "BOARD_LINUX", 
-            "VERSION=master"
+            "VERSION=10.1.0"
         ], 
         "cflags": [
             "-Werror", 
@@ -1405,7 +1405,7 @@ BOARDS = {
             "FAMILY_ESP32", 
             "MCU_ESP32", 
             "BOARD_NANO32", 
-            "VERSION=master", 
+            "VERSION=10.1.0", 
             "ICACHE_FLASH", 
             "__STRICT_ANSI__"
         ], 
@@ -1566,7 +1566,7 @@ BOARDS = {
             "FAMILY_STM32F2", 
             "MCU_STM32F205RG", 
             "BOARD_PHOTON", 
-            "VERSION=master"
+            "VERSION=10.1.0"
         ], 
         "cflags": [
             "-Werror", 
@@ -1727,7 +1727,7 @@ BOARDS = {
             "FAMILY_STM32F3", 
             "MCU_STM32F303VC", 
             "BOARD_STM32F3DISCOVERY", 
-            "VERSION=master"
+            "VERSION=10.1.0"
         ], 
         "cflags": [
             "-Werror", 
@@ -1873,7 +1873,7 @@ BOARDS = {
             "FAMILY_STM32F1", 
             "MCU_STM32F100RB", 
             "BOARD_STM32VLDISCOVERY", 
-            "VERSION=master"
+            "VERSION=10.1.0"
         ], 
         "cflags": [
             "-Werror", 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name":"framework-simba",
   "description":"Simba Embedded Programming Platform",
   "url":"https://github.com/eerimoq/simba",
-  "version":"10.0.0",
+  "version":"10.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/eerimoq/simba.git"

diff --git a/tst/text/std/main.c b/tst/text/std/main.c
@@ -88,13 +88,13 @@ static int test_sprintf(struct harness_t *harness_p)
     std_printf(FSTR("%s\r\n"), buf);
     BTASSERT(size == 14);
 
-    size = std_sprintf(buf, FSTR("INT_MAX %%u: %u"), 0xffffffffL);
+    size = std_sprintf(buf, FSTR("INT_MAX %%lu: %lu"), 0xffffffffL);
     std_printf(FSTR("%s\r\n"), buf);
-    BTASSERT(size == 22);
+    BTASSERT(size == 23);
 
-    size = std_sprintf(buf, FSTR("INT_MAX %%x: %x"), 0xffffffffL);
+    size = std_sprintf(buf, FSTR("INT_MAX %%lx: %lx"), 0xffffffffL);
     std_printf(FSTR("%s\r\n"), buf);
-    BTASSERT(size == 20);
+    BTASSERT(size == 21);
 
 #ifdef ARCH_LINUX
     BTASSERT((size = std_sprintf(buf,