Marlin fixes

Author: mriscoc

.piopm

@@ -0,0 +1 @@
+{"type": "tool", "name": "framework-arduinoststm32", "version": "4.10900.200819", "spec": {"owner": "platformio", "id": 8080, "name": "framework-arduinoststm32", "requirements": null, "url": null}}

cores/arduino/avr/dtostrf.c

@@ -58,7 +58,8 @@ char *dtostrf(double val, signed char width, unsigned char prec, char *sout)
   remainder *= decade;
   dec_part = (int)remainder;
 
-  if (negative) {
+  // Avoid -0.00...0
+  if (negative && (int_part + dec_part != 0)) {
     sprintf(sout, "-%ld.%0*ld", int_part, prec, dec_part);
   } else {
     sprintf(sout, "%ld.%0*ld", int_part, prec, dec_part);

package.json

@@ -1,6 +1,15 @@
 {
-    "name": "framework-arduinoststm32",
-    "description": "Arduino Wiring-based Framework (STM32 Core)",
-    "version": "0.0.0",
-    "url": "https://github.com/stm32duino/Arduino_Core_STM32"
-}
+  "name": "framework-arduinoststm32",
+  "version": "4.10900.200819",
+  "description": "Arduino Wiring-based Framework for ST STM32 microcontrollers (MRiscoC fixes)",
+  "keywords": [
+    "framework",
+    "arduino",
+    "stmicroelectronics",
+    "stm32"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mriscoc/Arduino_Core_STM32"
+  }
+}

tools/platformio-build.py

@@ -32,7 +32,7 @@
 board = env.BoardConfig()
 
 FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoststm32")
-CMSIS_DIR = join(platform.get_package_dir("framework-arduinoststm32"), "CMSIS", "CMSIS")
+CMSIS_DIR = join(platform.get_package_dir("framework-cmsis"), "CMSIS")
 assert isdir(FRAMEWORK_DIR)
 assert isdir(CMSIS_DIR)
 
@@ -168,6 +168,7 @@ def configure_application_offset(mcu, upload_protocol):
         join(FRAMEWORK_DIR, "cores", "arduino", "stm32"),
         join(FRAMEWORK_DIR, "cores", "arduino", "stm32", "LL"),
         join(FRAMEWORK_DIR, "cores", "arduino", "stm32", "usb"),
+        join(FRAMEWORK_DIR, "cores", "arduino", "stm32", "OpenAMP"),
         join(FRAMEWORK_DIR, "cores", "arduino", "stm32", "usb", "hid"),
         join(FRAMEWORK_DIR, "cores", "arduino", "stm32", "usb", "cdc"),
         join(FRAMEWORK_DIR, "system", "Drivers", series + "_HAL_Driver", "Inc"),
@@ -191,6 +192,37 @@ def configure_application_offset(mcu, upload_protocol):
             "Core",
             "Src",
         ),
+        join(
+            FRAMEWORK_DIR,
+            "system",
+            "Middlewares",
+            "OpenAMP"
+        ),
+        join(
+            FRAMEWORK_DIR,
+            "system",
+            "Middlewares",
+            "OpenAMP",
+            "open-amp",
+            "lib",
+            "include",
+        ),
+        join(
+            FRAMEWORK_DIR,
+            "system",
+            "Middlewares",
+            "OpenAMP",
+            "libmetal",
+            "lib",
+            "include",
+        ),
+        join(
+            FRAMEWORK_DIR,
+            "system",
+            "Middlewares",
+            "OpenAMP",
+            "virtual_driver"
+        ),
         join(CMSIS_DIR, "Core", "Include"),
         join(
             FRAMEWORK_DIR,
@@ -202,7 +234,6 @@ def configure_application_offset(mcu, upload_protocol):
             series,
             "Include",
         ),
-        join(CMSIS_DIR, "DSP", "Include"),
         join(
             FRAMEWORK_DIR,
             "system",
@@ -215,6 +246,7 @@ def configure_application_offset(mcu, upload_protocol):
             "Templates",
             "gcc",
         ),
+        join(CMSIS_DIR, "DSP", "Include"),
         join(FRAMEWORK_DIR, "cores", "arduino"),
         variant_dir,
     ],
@@ -241,6 +273,18 @@ def configure_application_offset(mcu, upload_protocol):
     LIBPATH=[variant_dir, join(CMSIS_DIR, "DSP", "Lib", "GCC")],
 )
 
+if "build.usb_product" in board:
+    env.Append(
+        CPPDEFINES=[
+            ("USB_VID", board.get("build.hwids")[0][0]),
+            ("USB_PID", board.get("build.hwids")[0][1]),
+            ("USB_PRODUCT", '\\"%s\\"' %
+             board.get("build.usb_product", "").replace('"', "")),
+            ("USB_MANUFACTURER", '\\"%s\\"' %
+             board.get("vendor", "").replace('"', ""))
+        ]
+    )
+
 env.ProcessFlags(board.get("build.framework_extra_flags.arduino", ""))
 
 configure_application_offset(mcu, upload_protocol)
@@ -250,9 +294,10 @@ def configure_application_offset(mcu, upload_protocol):
 #
 
 if not board.get("build.ldscript", ""):
+    env.Replace(LDSCRIPT_PATH=join(FRAMEWORK_DIR, "system", "ldscript.ld"))
     if not isfile(join(env.subst(variant_dir), "ldscript.ld")):
         print("Warning! Cannot find linker script for the current target!\n")
-    env.Replace(LDSCRIPT_PATH=join(variant_dir, "ldscript.ld"))
+    env.Append(LINKFLAGS=[("-Wl,--default-script", join(variant_dir, "ldscript.ld"))])
 
 #
 # Process configuration flags