9 files changed, 17 insertions, 5 deletions
diff --git a/stmhal/boards/HYDRABUS/mpconfigboard.h b/stmhal/boards/HYDRABUS/mpconfigboard.h
index f87a14142..8480c5bf0 100644
--- a/stmhal/boards/HYDRABUS/mpconfigboard.h
+++ b/stmhal/boards/HYDRABUS/mpconfigboard.h
@@ -1,6 +1,7 @@
 #define HYDRABUSV10
 
 #define MICROPY_HW_BOARD_NAME       "HydraBus1.0"
+#define MICROPY_HW_MICRO_NAME       "STM32F4"
 
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_HAS_SDCARD       (1)
diff --git a/stmhal/boards/NETDUINO_PLUS_2/mpconfigboard.h b/stmhal/boards/NETDUINO_PLUS_2/mpconfigboard.h
index 0e4054525..d7ee97ac4 100644
--- a/stmhal/boards/NETDUINO_PLUS_2/mpconfigboard.h
+++ b/stmhal/boards/NETDUINO_PLUS_2/mpconfigboard.h
@@ -1,6 +1,7 @@
 #define NETDUINO_PLUS_2
 
 #define MICROPY_HW_BOARD_NAME       "NetduinoPlus2"
+#define MICROPY_HW_MICRO_NAME       "STM32F405RG"
 
 #define MICROPY_HW_HAS_SWITCH       (1)
 
diff --git a/stmhal/boards/PYBV10/mpconfigboard.h b/stmhal/boards/PYBV10/mpconfigboard.h
index 3def53123..8c31d4388 100644
--- a/stmhal/boards/PYBV10/mpconfigboard.h
+++ b/stmhal/boards/PYBV10/mpconfigboard.h
@@ -1,6 +1,7 @@
 #define PYBV10
 
 #define MICROPY_HW_BOARD_NAME       "PYBv1.0"
+#define MICROPY_HW_MICRO_NAME       "STM32F405RG"
 
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_HAS_SDCARD       (1)
diff --git a/stmhal/boards/PYBV3/mpconfigboard.h b/stmhal/boards/PYBV3/mpconfigboard.h
index ac0d84ca2..e0e4dd11c 100644
--- a/stmhal/boards/PYBV3/mpconfigboard.h
+++ b/stmhal/boards/PYBV3/mpconfigboard.h
@@ -1,6 +1,7 @@
 #define PYBV3
 
 #define MICROPY_HW_BOARD_NAME       "PYBv3"
+#define MICROPY_HW_MICRO_NAME       "STM32F405RG"
 
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_HAS_SDCARD       (1)
diff --git a/stmhal/boards/PYBV4/mpconfigboard.h b/stmhal/boards/PYBV4/mpconfigboard.h
index 9fedb7013..220e3b4f6 100644
--- a/stmhal/boards/PYBV4/mpconfigboard.h
+++ b/stmhal/boards/PYBV4/mpconfigboard.h
@@ -1,6 +1,7 @@
 #define PYBV4
 
 #define MICROPY_HW_BOARD_NAME       "PYBv4"
+#define MICROPY_HW_MICRO_NAME       "STM32F405RG"
 
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_HAS_SDCARD       (1)
diff --git a/stmhal/boards/STM32F4DISC/mpconfigboard.h b/stmhal/boards/STM32F4DISC/mpconfigboard.h
index e6780eacb..7a553c5e8 100644
--- a/stmhal/boards/STM32F4DISC/mpconfigboard.h
+++ b/stmhal/boards/STM32F4DISC/mpconfigboard.h
@@ -1,6 +1,7 @@
 #define STM32F4DISC
 
 #define MICROPY_HW_BOARD_NAME       "F4DISC"
+#define MICROPY_HW_MICRO_NAME       "STM32F407"
 
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_HAS_SDCARD       (0)
diff --git a/stmhal/main.c b/stmhal/main.c
index e264fdf4b..4e50daba4 100644
--- a/stmhal/main.c
+++ b/stmhal/main.c
@@ -40,6 +40,7 @@
 #include "parse.h"
 #include "obj.h"
 #include "runtime.h"
+#include "stackctrl.h"
 #include "gc.h"
 #include "gccollect.h"
 #include "pybstdio.h"
@@ -186,6 +187,11 @@ static const char fresh_readme_txt[] =
 int main(void) {
     // TODO disable JTAG
 
+    stack_ctrl_init();
+    // Stack limit should be less than real stack size, so we
+    // had chance to recover from limit hit.
+    stack_set_limit(&_ram_end - &_heap_end - 512);
+
     /* STM32F4xx HAL library initialization:
          - Configure the Flash prefetch, instruction and Data caches
          - Configure the Systick to generate an interrupt each 1 msec
diff --git a/stmhal/pin.c b/stmhal/pin.c
index 9806a8c49..449b5074f 100644
--- a/stmhal/pin.c
+++ b/stmhal/pin.c
@@ -100,8 +100,8 @@ STATIC mp_obj_t pin_class_map_dict;
 STATIC bool pin_class_debug;
 
 void pin_init(void) {
-    pin_class_mapper = MP_OBJ_NULL;
-    pin_class_map_dict = MP_OBJ_NULL;
+    pin_class_mapper = mp_const_none;
+    pin_class_map_dict = mp_const_none;
     pin_class_debug = false;
 }
 
@@ -120,7 +120,7 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
         return pin_obj;
     }
 
-    if (pin_class_mapper != MP_OBJ_NULL) {
+    if (pin_class_mapper != mp_const_none) {
         pin_obj = mp_call_function_1(pin_class_mapper, user_obj);
         if (pin_obj != mp_const_none) {
             if (!MP_OBJ_IS_TYPE(pin_obj, &pin_type)) {
@@ -139,7 +139,7 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
         // other lookup methods.
     }
 
-    if (pin_class_map_dict != MP_OBJ_NULL) {
+    if (pin_class_map_dict != mp_const_none) {
         mp_map_t *pin_map_map = mp_obj_dict_get_map(pin_class_map_dict);
         mp_map_elem_t *elem = mp_map_lookup(pin_map_map, user_obj, MP_MAP_LOOKUP);
         if (elem != NULL && elem->value != NULL) {
diff --git a/stmhal/pyexec.c b/stmhal/pyexec.c
index 45928427e..6dfc00776 100644
--- a/stmhal/pyexec.c
+++ b/stmhal/pyexec.c
@@ -185,7 +185,7 @@ int pyexec_friendly_repl(void) {
 #endif
 
 friendly_repl_reset:
-    stdout_tx_str("Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with STM32F405RG\r\n");
+    stdout_tx_str("Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MICRO_NAME "\r\n");
     stdout_tx_str("Type \"help()\" for more information.\r\n");
 
     // to test ctrl-C