From fe81eea96789b1b0bfb7be2c86ccdaeb89c5971a Mon Sep 17 00:00:00 2001 From: mux Date: Thu, 19 Jun 2014 14:40:00 +0200 Subject: Add MICROPY_HW_MICRO_NAME to boards config --- stmhal/boards/HYDRABUS/mpconfigboard.h | 1 + stmhal/boards/NETDUINO_PLUS_2/mpconfigboard.h | 1 + stmhal/boards/PYBV10/mpconfigboard.h | 1 + stmhal/boards/PYBV3/mpconfigboard.h | 1 + stmhal/boards/PYBV4/mpconfigboard.h | 1 + stmhal/boards/STM32F4DISC/mpconfigboard.h | 1 + stmhal/pyexec.c | 2 +- 7 files changed, 7 insertions(+), 1 deletion(-) (limited to 'stmhal') 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/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 -- cgit v1.2.3 From a75e382a9bb992fa177536315c621f3dba533e7e Mon Sep 17 00:00:00 2001 From: mux Date: Fri, 27 Jun 2014 00:35:53 +0200 Subject: Change MCU name config micro --- stmhal/boards/HYDRABUS/mpconfigboard.h | 2 +- stmhal/boards/NETDUINO_PLUS_2/mpconfigboard.h | 2 +- stmhal/boards/PYBV10/mpconfigboard.h | 2 +- stmhal/boards/PYBV3/mpconfigboard.h | 2 +- stmhal/boards/PYBV4/mpconfigboard.h | 2 +- stmhal/boards/STM32F4DISC/mpconfigboard.h | 2 +- stmhal/pyexec.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'stmhal') diff --git a/stmhal/boards/HYDRABUS/mpconfigboard.h b/stmhal/boards/HYDRABUS/mpconfigboard.h index 8480c5bf0..db49434b5 100644 --- a/stmhal/boards/HYDRABUS/mpconfigboard.h +++ b/stmhal/boards/HYDRABUS/mpconfigboard.h @@ -1,7 +1,7 @@ #define HYDRABUSV10 #define MICROPY_HW_BOARD_NAME "HydraBus1.0" -#define MICROPY_HW_MICRO_NAME "STM32F4" +#define MICROPY_HW_MCU_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 d7ee97ac4..2679aee57 100644 --- a/stmhal/boards/NETDUINO_PLUS_2/mpconfigboard.h +++ b/stmhal/boards/NETDUINO_PLUS_2/mpconfigboard.h @@ -1,7 +1,7 @@ #define NETDUINO_PLUS_2 #define MICROPY_HW_BOARD_NAME "NetduinoPlus2" -#define MICROPY_HW_MICRO_NAME "STM32F405RG" +#define MICROPY_HW_MCU_NAME "STM32F405RG" #define MICROPY_HW_HAS_SWITCH (1) diff --git a/stmhal/boards/PYBV10/mpconfigboard.h b/stmhal/boards/PYBV10/mpconfigboard.h index 8c31d4388..4ae6954a7 100644 --- a/stmhal/boards/PYBV10/mpconfigboard.h +++ b/stmhal/boards/PYBV10/mpconfigboard.h @@ -1,7 +1,7 @@ #define PYBV10 #define MICROPY_HW_BOARD_NAME "PYBv1.0" -#define MICROPY_HW_MICRO_NAME "STM32F405RG" +#define MICROPY_HW_MCU_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 e0e4dd11c..43d860a0c 100644 --- a/stmhal/boards/PYBV3/mpconfigboard.h +++ b/stmhal/boards/PYBV3/mpconfigboard.h @@ -1,7 +1,7 @@ #define PYBV3 #define MICROPY_HW_BOARD_NAME "PYBv3" -#define MICROPY_HW_MICRO_NAME "STM32F405RG" +#define MICROPY_HW_MCU_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 220e3b4f6..a278dea9f 100644 --- a/stmhal/boards/PYBV4/mpconfigboard.h +++ b/stmhal/boards/PYBV4/mpconfigboard.h @@ -1,7 +1,7 @@ #define PYBV4 #define MICROPY_HW_BOARD_NAME "PYBv4" -#define MICROPY_HW_MICRO_NAME "STM32F405RG" +#define MICROPY_HW_MCU_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 7a553c5e8..10bbe4518 100644 --- a/stmhal/boards/STM32F4DISC/mpconfigboard.h +++ b/stmhal/boards/STM32F4DISC/mpconfigboard.h @@ -1,7 +1,7 @@ #define STM32F4DISC #define MICROPY_HW_BOARD_NAME "F4DISC" -#define MICROPY_HW_MICRO_NAME "STM32F407" +#define MICROPY_HW_MCU_NAME "STM32F407" #define MICROPY_HW_HAS_SWITCH (1) #define MICROPY_HW_HAS_SDCARD (0) diff --git a/stmhal/pyexec.c b/stmhal/pyexec.c index 6dfc00776..baf6ddfb3 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 " MICROPY_HW_MICRO_NAME "\r\n"); + stdout_tx_str("Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n"); stdout_tx_str("Type \"help()\" for more information.\r\n"); // to test ctrl-C -- cgit v1.2.3 From 8a96ebea75158987c1136f1a618d98cf387445fd Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 27 Jun 2014 20:54:22 +0300 Subject: py: Move stack_ctrl_init() to mp_init(). As stack checking is enabled by default, ports which don't call stack_ctrl_init() are broken now (report RuntimeError on startup). Save them trouble and just init stack control framework in interpreter init. --- stmhal/main.c | 1 - 1 file changed, 1 deletion(-) (limited to 'stmhal') diff --git a/stmhal/main.c b/stmhal/main.c index 4e50daba4..9f48fbfd6 100644 --- a/stmhal/main.c +++ b/stmhal/main.c @@ -187,7 +187,6 @@ 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); -- cgit v1.2.3