Merge pull request #1807 from nanoframework/release-v1.6.0

Release release-v1.6.0

Author: josesimoes

.vscode/cmake-variants.TEMPLATE.json

@@ -31,25 +31,24 @@
           "TOOL_HEX2DFU_PREFIX": "<path-to-hex2dfu-utility-mind-the-forward-slash>",
           "ESP32_IDF_PATH": "<path-to-esp32-idf-mind-the-forward-slash>/esp-idf",
           "ESP32_LIBS_PATH": "<path-to-esp32-libraries-mind-the-forward-slash>/libs",
-          "ESP32_BOARD": "ESP32_WROOM_32",
+          "TARGET_BOARD": "<valid-board-name-from-platform-boards-collection>",
           "EXECUTABLE_OUTPUT_PATH": "${workspaceRoot}/build",
           "TARGET_SERIES": "<series-name-of-the-target-chip-STM32F0xx-STM32F4xx-STM32F7xx-ESP32-CC32xx>",
+          "TARGET_SERIAL_BAUDRATE": "<baudrate-for-serial-comunication-only-required-to-target-default-override>",
+          "TARGET_NAME": "<target-name-only-required-to-override-target-name>",
           "USE_RNG": "<ON-default-for-using-hardware-true-random-generator-unit>",
           "DP_FLOATINGPOINT": "<OFF-default-ON-for-adding-support-for-double-precision-floating-point>",
           "SUPPORT_ANY_BASE_CONVERSION": "<OFF-default-ON-for-adding-support-for-conversion-strings-to-values-on-any-base>",
           "RTOS": "<one-of-valid-rtos-options-CHIBIOS-FREERTOS-FREERTOS_ESP32-TI_SIMPLELINK>",
           "RTOS_SOURCE_FOLDER": "<path-to-RTOS-source-folder-if-supported-mind-the-forward-slash>",
           "CHIBIOS_CONTRIB_REQUIRED": "OFF-default-ON-to-include_ChibiOS-Contrib-repository-in-the-build",
           "CHIBIOS_CONTRIB_SOURCE": "<path-to-local-ChibiOS-contrib-source-mind-the-forward-slash>",
-          "FREERTOS_BOARD": "<valid-freertos-board-name-from-boards-collection>",
           "RTOS_VERSION": "<valid-rtos-git-branch-if-empty-use-default-cmake-setting>",
           "RTOS_SOURCE": "<path-to-rtos-source-mind-the-forward-slash>",
           "CMSIS_SOURCE": "<path-to-cmsis-source-mind-the-forward-slash>",
           "CMSIS_VERSION": "<valid-cmsis-version-if-empty-use-default-set-cmake>",
-          "CHIBIOS_BOARD": "<valid-chibios-board-name-from-boards-collection>",
           "STM32_CUBE_PACKAGE_REQUIRED": "<OFF-default-ON-to-include_STM-cube-package-in-the-build>",
           "STM32_CUBE_PACKAGE_SOURCE": "<path-to-stm32-cubemx-package-mind-the-forward-slash>",
-          "TI_BOARD": "<valid-TI-board-name-from-boards-collection>",
           "TI_SL_CC32xx_SDK_SOURCE": "<path-to-local-TI-SimpleLink-CC32xx-SDK-source-mind-the-forward-slash>",
           "TI_SL_CC13x2_26x2_SDK_SOURCE": "<path-to-local-TI-SimpleLink-CC13x2_26x2-SDK-source-mind-the-forward-slash>",
           "TI_XDCTOOLS_SOURCE": "<path-to-local-TI-XDC-Tools-source-mind-the-forward-slash>",
@@ -60,6 +59,7 @@
           "FATFS_SOURCE": "<path-to-local-FATFS-source-mind-the-forward-slash>",
           "LWIP_VERSION": "<valid-lwip-version-if-empty-use-default-set-cmake>",
           "NF_BUILD_RTM": "OFF-default-ON-to-enable-RTM-build",
+          "NF_TARGET_HAS_NANOBOOTER": "ON-default-OFF-to-signal-that-target-does-not-have-nanoBooter",
           "NF_WP_TRACE_ERRORS": "OFF-default-ON-to-enable-trace-error-messages-wire-protocol",
           "NF_WP_TRACE_HEADERS": "OFF-default-ON-to-enable-trace-header-messages-wire-protocol",
           "NF_WP_TRACE_STATE": "OFF-default-ON-to-enable-trace-state-messages-wire-protocol",
@@ -91,7 +91,9 @@
           "API_Windows.Devices.Adc": "OFF-default-ON-to-add-this-API",
           "API_System.Device.Dac": "OFF-default-ON-to-add-this-API",
           "API_Windows.Devices.Gpio": "OFF-default-ON-to-add-this-API",
+          "API_System.Device.Gpio": "OFF-default-ON-to-add-this-API",
           "API_Windows.Devices.I2c": "OFF-default-ON-to-add-this-API",
+          "API_System.Device.I2c": "OFF-default-ON-to-add-this-API",
           "API_Windows.Devices.Pwm": "OFF-default-ON-to-add-this-API",
           "API_Windows.Devices.SerialCommunication": "OFF-default-ON-to-add-this-API",
           "API_Windows.Devices.Spi": "OFF-default-ON-to-add-this-API",

.vscode/tasks.TEMPLATE.json

@@ -18,7 +18,7 @@
     {
       "label": "Flash nanoCLR to ESP32",
       "type": "shell",
-      "command": "python <absolute-path-to-the-IDF-folder-mind-the-forward-slashes>/components/esptool_py/esptool/esptool.py --chip esp32 --port \"${input:comPort}\" --baud 921600 --before \"default_reset\" --after \"hard_reset\" write_flash -z --flash_mode \"dio\" --flash_freq \"40m\" --flash_size detect 0x1000 <absolute-path-to-the-esp32-bootloader-folder-mind-the-forward-slashes>/bootloader.bin 0x10000 <absolute-path-to-the-build-folder-mind-the-forward-slashes>/nanoCLR.bin 0x8000 <absolute-path-to-the-build-folder-mind-the-forward-slashes>/partitions_4mb.bin",
+      "command": "python <absolute-path-to-the-IDF-folder-mind-the-forward-slashes>/components/esptool_py/esptool/esptool.py --chip esp32 --port \"${input:comPort}\" --baud 1500000 --before \"default_reset\" --after \"hard_reset\" write_flash -z --flash_mode \"dio\" --flash_freq \"40m\" --flash_size detect 0x1000 <absolute-path-to-the-esp32-bootloader-folder-mind-the-forward-slashes>/bootloader.bin 0x10000 <absolute-path-to-the-build-folder-mind-the-forward-slashes>/nanoCLR.bin 0x8000 <absolute-path-to-the-build-folder-mind-the-forward-slashes>/partitions_${input:esp32Partitions}.bin",
       "presentation": {
         "reveal": "always",
         "panel": "shared"
@@ -28,7 +28,7 @@
     {
       "label": "Erase ESP32 flash",
       "type": "shell",
-      "command": "python <absolute-path-to-the-IDF-folder-mind-the-forward-slashes>/components/esptool_py/esptool/esptool.py --chip esp32 --port \"${input:comPort}\" --baud 921600 --before \"default_reset\" --after \"hard_reset\" erase_flash",
+      "command": "python <absolute-path-to-the-IDF-folder-mind-the-forward-slashes>/components/esptool_py/esptool/esptool.py --chip esp32 --port \"${input:comPort}\" --baud 1500000 --before \"default_reset\" --after \"hard_reset\" erase_flash",
       "presentation": {
         "reveal": "always",
         "panel": "shared"
@@ -80,6 +80,18 @@
       "type": "promptString",
       "default": "COM1",
       "description": "COM port of the ESP32 device."
+    },
+    {
+      "id": "esp32Partitions",
+      "type": "pickString",
+      "description": "Partition to flash to ESP32.",
+      "default": "4mb",
+      "options": [
+        "2mb",
+        "4mb",
+        "8mb",
+        "16mb"
+      ]
     }
   ]
 }

CMake/ChibiOS_target_os.h.in

@@ -11,27 +11,24 @@
 #include <chversion.h>
 
 #ifndef _TARGET_OS_H_
-#define _TARGET_OS_H_
+#define _TARGET_OS_H_ 1
 
 #define STR_HELPER(x) #x
-#define STR(x) STR_HELPER(x)
+#define STR(x)        STR_HELPER(x)
 
-#define VERSION_MAJOR @nanoFramework_VERSION_MAJOR@U
-#define VERSION_MINOR @nanoFramework_VERSION_MINOR@U
-#define VERSION_BUILD @nanoFramework_VERSION_PATCH@U
+#define VERSION_MAJOR    @nanoFramework_VERSION_MAJOR@U
+#define VERSION_MINOR    @nanoFramework_VERSION_MINOR@U
+#define VERSION_BUILD    @nanoFramework_VERSION_PATCH@U
 #define VERSION_REVISION @nanoFramework_VERSION_TWEAK@U
 
 #define TARGETINFOSTRING "@CMAKE_BUILD_TYPE@ build with ChibiOS v" CH_VERSION "." STR(CH_VERSION_MONTH)
 
-#define NANOCLR_LIGHT_MATH @TARGET_LIGHT_MATH@
-#define DP_FLOATINGPOINT @TARGET_DP_FLOATINGPOINT@
-
+#define NANOCLR_LIGHT_MATH          @TARGET_LIGHT_MATH@
+#define DP_FLOATINGPOINT            @TARGET_DP_FLOATINGPOINT@
 #define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
-
-#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
-
-#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
-
-#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
+#define HAS_CONFIG_BLOCK            @TARGET_HAS_CONFIG_BLOCK@
+#define NANOCLR_REFLECTION          @TARGET_NANOCLR_REFLECTION@
+#define NANOCLR_SYSTEM_COLLECTIONS  @TARGET_SYSTEM_COLLECTIONS@
+#define TARGET_HAS_NANOBOOTER       @TARGET_HAS_NANOBOOTER@
 
 #endif /* _TARGET_OS_H_ */

CMake/ESP32_target_os.h.in

@@ -9,24 +9,22 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #ifndef _TARGET_OS_H_
-#define _TARGET_OS_H_
+#define _TARGET_OS_H_ 1
 
-#define VERSION_MAJOR @nanoFramework_VERSION_MAJOR@U
-#define VERSION_MINOR @nanoFramework_VERSION_MINOR@U
-#define VERSION_BUILD @nanoFramework_VERSION_PATCH@U
+#define VERSION_MAJOR    @nanoFramework_VERSION_MAJOR@U
+#define VERSION_MINOR    @nanoFramework_VERSION_MINOR@U
+#define VERSION_BUILD    @nanoFramework_VERSION_PATCH@U
 #define VERSION_REVISION @nanoFramework_VERSION_TWEAK@U
 
 #define TARGETINFOSTRING "@CMAKE_BUILD_TYPE@ build with IDF v3.3.1"
 
-#define NANOCLR_LIGHT_MATH @TARGET_LIGHT_MATH@
-#define DP_FLOATINGPOINT @TARGET_DP_FLOATINGPOINT@
-
+#define NANOCLR_LIGHT_MATH          @TARGET_LIGHT_MATH@
+#define DP_FLOATINGPOINT            @TARGET_DP_FLOATINGPOINT@
 #define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
-
-#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
-
-#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
-
-#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
+#define HAS_CONFIG_BLOCK            @TARGET_HAS_CONFIG_BLOCK@
+#define NANOCLR_REFLECTION          @TARGET_NANOCLR_REFLECTION@
+#define NANOCLR_SYSTEM_COLLECTIONS  @TARGET_SYSTEM_COLLECTIONS@
+#define TARGET_HAS_NANOBOOTER       FALSE
+#cmakedefine TARGET_SERIAL_BAUDRATE      @TARGET_SERIAL_BAUDRATE@
 
 #endif /* _TARGET_OS_H_ */

CMake/FatFS.CMakeLists.cmake.in

@@ -19,7 +19,7 @@ ExternalProject_Add(
     GIT_SHALLOW 1   # download only the tip of the branch, not the complete history
     TIMEOUT 10
     LOG_DOWNLOAD 1
-    INSTALL_COMMAND "${CMAKE_COMMAND}" -E remove "${PROJECT_BINARY_DIR}/FatFS_Source/source/ffconf.h"
+    INSTALL_COMMAND "${CMAKE_COMMAND}" -E remove "${CMAKE_BINARY_DIR}/FatFS_Source/source/ffconf.h"
 
     # Disable all other steps
     CONFIGURE_COMMAND ""

CMake/FreeRTOS_target_os.h.in

@@ -9,26 +9,24 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #ifndef _TARGET_OS_H_
-#define _TARGET_OS_H_
+#define _TARGET_OS_H_ 1
 
 #define STR_HELPER(x) #x
-#define STR(x) STR_HELPER(x)
+#define STR(x)        STR_HELPER(x)
 
-#define VERSION_MAJOR @nanoFramework_VERSION_MAJOR@U
-#define VERSION_MINOR @nanoFramework_VERSION_MINOR@U
-#define VERSION_BUILD @nanoFramework_VERSION_PATCH@U
+#define VERSION_MAJOR    @nanoFramework_VERSION_MAJOR@U
+#define VERSION_MINOR    @nanoFramework_VERSION_MINOR@U
+#define VERSION_BUILD    @nanoFramework_VERSION_PATCH@U
 #define VERSION_REVISION @nanoFramework_VERSION_TWEAK@U
 
-#define TARGETINFOSTRING "@CMAKE_BUILD_TYPE@ build with FREERTOS @FREERTOS_VERSION@"
+#define TARGETINFOSTRING "@CMAKE_BUILD_TYPE@ build with FREERTOS @RTOS_VERSION@"
 
-#define DP_FLOATINGPOINT @TARGET_DP_FLOATINGPOINT@
-
-#define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
-
-#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
-
-#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
-
-#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
+#define NANOCLR_LIGHT_MATH              @TARGET_LIGHT_MATH@
+#define DP_FLOATINGPOINT                @TARGET_DP_FLOATINGPOINT@
+#define SUPPORT_ANY_BASE_CONVERSION     @TARGET_SUPPORT_ANY_BASE_CONVERSION@
+#define HAS_CONFIG_BLOCK                @TARGET_HAS_CONFIG_BLOCK@
+#define NANOCLR_REFLECTION              @TARGET_NANOCLR_REFLECTION@
+#define NANOCLR_SYSTEM_COLLECTIONS      @TARGET_SYSTEM_COLLECTIONS@
+#define TARGET_HAS_NANOBOOTER           @TARGET_HAS_NANOBOOTER@
 
 #endif /* _TARGET_OS_H_ */

CMake/Modules/CHIBIOS_STM32F0xx_GCC_options.cmake

@@ -17,10 +17,10 @@ set(CMAKE_EXE_LINKER_FLAGS " -Wl,--gc-sections -Wl,--no-wchar-size-warning -Wl,-
 function(NF_SET_COMPILER_OPTIONS TARGET)
 
     # include any extra options coming from any extra args?
-    target_compile_options(${TARGET} PUBLIC  ${ARGN} -mthumb -mcpu=cortex-m0 -mabi=aapcs -nostdlib -Wall -Wextra -Werror -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
+    target_compile_options(${TARGET} PUBLIC  ${ARGN} -mthumb -mcpu=cortex-m0 -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
 
     # this series doesn't have FPU 
-    target_compile_definitions(${TARGET} PUBLIC -DCORTEX_USE_FPU=FALSE)
+    target_compile_definitions(${TARGET} PUBLIC -DCORTEX_USE_FPU=FALSE -DUSE_FPU=TRUE)
 
 endfunction()