Partial applying of stm32duino/Arduino_Core_STM32#1739

Author: mriscoc

cores/arduino/core_debug.h

@@ -1,9 +1,9 @@
 #ifndef _CORE_DEBUG_H
 #define _CORE_DEBUG_H
-#ifdef CORE_DEBUG
+#if !defined(NDEBUG)
   #include <stdio.h>
   #include <stdarg.h>
-#endif /* CORE_DEBUG */
+#endif /* NDEBUG */
 
 #ifdef __cplusplus
 extern "C" {
@@ -18,14 +18,14 @@ extern "C" {
  */
 static inline void core_debug(const char *format, ...)
 {
-#ifdef CORE_DEBUG
+#if !defined(NDEBUG)
   va_list args;
   va_start(args, format);
   vfprintf(stderr, format, args);
   va_end(args);
 #else
   (void)(format);
-#endif /* CORE_DEBUG */
+#endif /* NDEBUG */
 }
 
 #ifdef __cplusplus

cores/arduino/stm32/stm32_def.h

@@ -77,9 +77,22 @@ extern "C" {
 // weaked functions declaration
 void SystemClock_Config(void);
 
-void _Error_Handler(const char *, int);
+#if defined(NDEBUG)
+  #if !defined(_Error_Handler)
+    #define _Error_Handler(str, value); \
+      while (1) {\
+      }
+  #endif
+  #if !defined(Error_Handler)
+    #define Error_Handler() \
+      while (1) {\
+      }
+  #endif
+#else
+  void _Error_Handler(const char *, int);
 
-#define Error_Handler() _Error_Handler(__FILE__, __LINE__)
+  #define Error_Handler() _Error_Handler(__FILE__, __LINE__)
+#endif
 
 #ifdef __cplusplus
 } // extern "C"

libraries/SrcWrapper/src/stm32/stm32_def.c

@@ -1,3 +1,4 @@
+
 #include "stm32_def.h"
 #include "core_debug.h"
 
@@ -10,13 +11,15 @@ extern "C" {
   * @param  None
   * @retval None
   */
+#if !defined(NDEBUG)
 WEAK void _Error_Handler(const char *msg, int val)
 {
   /* User can add his own implementation to report the HAL error return state */
   core_debug("Error: %s (%i)\n", msg, val);
   while (1) {
   }
 }
+#endif
 
 #ifdef __cplusplus
 }

platform.txt

@@ -99,6 +99,7 @@ build.enable_virtio=
 build.startup_file=
 build.flags.fp=
 build.flags.optimize=-Os
+build.flags.debug=-DNDEBUG
 build.flags.ldspecs=--specs=nano.specs
 build.flash_offset=0
 

system/extras/prebuild.sh

@@ -2,6 +2,7 @@
 
 BUILD_PATH="$1"
 BUILD_SOURCE_PATH="$2"
+BOARD_PLATFORM_PATH="$3"
 
 # Create sketch dir if not exists
 if [ ! -f "$BUILD_PATH/sketch" ]; then
@@ -13,5 +14,10 @@ if [ ! -f "$BUILD_SOURCE_PATH/build_opt.h" ]; then
   touch "$BUILD_PATH/sketch/build_opt.h"
 fi
 
+# Append -fmacro-prefix-map option to change __FILE__ absolute path of the board
+# platform folder to a relative path by using '.'.
+# (i.e. the folder containing boards.txt)
+printf '\n-fmacro-prefix-map=%s=.' "${BOARD_PLATFORM_PATH//\\/\\\\}" > "$BUILD_PATH/sketch/build.opt"
+
 # Force include of SrcWrapper library
 echo "#include <SrcWrapper.h>" >"$BUILD_PATH/sketch/SrcWrapper.cpp"