aboutsummaryrefslogtreecommitdiff
path: root/stmhal
diff options
context:
space:
mode:
Diffstat (limited to 'stmhal')
-rw-r--r--stmhal/adc.c4
-rw-r--r--stmhal/boards/HYDRABUS/mpconfigboard.h1
-rw-r--r--stmhal/boards/NETDUINO_PLUS_2/mpconfigboard.h1
-rw-r--r--stmhal/boards/PYBV10/mpconfigboard.h1
-rw-r--r--stmhal/boards/PYBV3/mpconfigboard.h1
-rw-r--r--stmhal/boards/PYBV4/mpconfigboard.h1
-rw-r--r--stmhal/boards/STM32F4DISC/mpconfigboard.h1
-rw-r--r--stmhal/boards/stm32f4xx-prefix.c2
-rw-r--r--stmhal/bufhelper.c2
-rw-r--r--stmhal/diskio.c2
-rw-r--r--stmhal/gccollect.c2
-rw-r--r--stmhal/import.c2
-rw-r--r--stmhal/lexerfatfs.c2
-rw-r--r--stmhal/main.c7
-rw-r--r--stmhal/mpconfigport.h1
-rw-r--r--stmhal/pendsv.c2
-rw-r--r--stmhal/pin.c8
-rw-r--r--stmhal/pin_named_pins.c2
-rw-r--r--stmhal/printf.c2
-rw-r--r--stmhal/pybstdio.c2
-rw-r--r--stmhal/pyexec.c2
-rw-r--r--stmhal/readline.c2
-rw-r--r--stmhal/rng.c2
-rw-r--r--stmhal/rtc.c2
-rw-r--r--stmhal/sdcard.c2
-rw-r--r--stmhal/stm32f4xx_hal_msp.c2
-rw-r--r--stmhal/stm32f4xx_it.c2
-rw-r--r--stmhal/storage.c2
-rw-r--r--stmhal/systick.c1
-rw-r--r--stmhal/usrsw.c2
30 files changed, 40 insertions, 25 deletions
diff --git a/stmhal/adc.c b/stmhal/adc.c
index c2419d543..817b32ea8 100644
--- a/stmhal/adc.c
+++ b/stmhal/adc.c
@@ -202,7 +202,9 @@ STATIC mp_obj_t adc_read(mp_obj_t self_in) {
STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_read_obj, adc_read);
/// \method read_timed(buf, freq)
-/// Read analog values into the given buffer at the given frequency.
+/// Read analog values into the given buffer at the given frequency. Buffer
+/// can be bytearray or array.array for example. If a buffer with 8-bit elements
+/// is used, sample resolution will be reduced to 8 bits.
///
/// Example:
///
diff --git a/stmhal/boards/HYDRABUS/mpconfigboard.h b/stmhal/boards/HYDRABUS/mpconfigboard.h
index f87a14142..db49434b5 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_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 0e4054525..2679aee57 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_MCU_NAME "STM32F405RG"
#define MICROPY_HW_HAS_SWITCH (1)
diff --git a/stmhal/boards/PYBV10/mpconfigboard.h b/stmhal/boards/PYBV10/mpconfigboard.h
index 3def53123..4ae6954a7 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_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 ac0d84ca2..43d860a0c 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_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 9fedb7013..a278dea9f 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_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 e6780eacb..10bbe4518 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_MCU_NAME "STM32F407"
#define MICROPY_HW_HAS_SWITCH (1)
#define MICROPY_HW_HAS_SDCARD (0)
diff --git a/stmhal/boards/stm32f4xx-prefix.c b/stmhal/boards/stm32f4xx-prefix.c
index 4d2313075..3bbb6bda0 100644
--- a/stmhal/boards/stm32f4xx-prefix.c
+++ b/stmhal/boards/stm32f4xx-prefix.c
@@ -5,8 +5,8 @@
#include "stm32f4xx_hal.h"
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "pin.h"
diff --git a/stmhal/bufhelper.c b/stmhal/bufhelper.c
index dd7265552..1f823ea96 100644
--- a/stmhal/bufhelper.c
+++ b/stmhal/bufhelper.c
@@ -24,8 +24,8 @@
* THE SOFTWARE.
*/
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "bufhelper.h"
diff --git a/stmhal/diskio.c b/stmhal/diskio.c
index cde587494..35b9eab99 100644
--- a/stmhal/diskio.c
+++ b/stmhal/diskio.c
@@ -32,8 +32,8 @@
#include "stm32f4xx_hal.h"
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "systick.h"
diff --git a/stmhal/gccollect.c b/stmhal/gccollect.c
index 79082e2f2..721aa062d 100644
--- a/stmhal/gccollect.c
+++ b/stmhal/gccollect.c
@@ -28,8 +28,8 @@
#include <stm32f4xx_hal.h>
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "gc.h"
diff --git a/stmhal/import.c b/stmhal/import.c
index abc618bef..88ddaefac 100644
--- a/stmhal/import.c
+++ b/stmhal/import.c
@@ -27,8 +27,8 @@
#include <stdio.h>
#include <stdint.h>
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "lexer.h"
#include "ff.h"
diff --git a/stmhal/lexerfatfs.c b/stmhal/lexerfatfs.c
index 6a0e83fb1..c578b13af 100644
--- a/stmhal/lexerfatfs.c
+++ b/stmhal/lexerfatfs.c
@@ -27,8 +27,8 @@
#include <stdint.h>
#include <stdio.h>
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "lexer.h"
#include "lexerfatfs.h"
diff --git a/stmhal/main.c b/stmhal/main.c
index 7e3c5a7c6..0cad768ad 100644
--- a/stmhal/main.c
+++ b/stmhal/main.c
@@ -29,10 +29,10 @@
#include "stm32f4xx_hal.h"
+#include "mpconfig.h"
#include "misc.h"
#include "systick.h"
#include "pendsv.h"
-#include "mpconfig.h"
#include "qstr.h"
#include "misc.h"
#include "nlr.h"
@@ -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"
@@ -185,6 +186,10 @@ static const char fresh_readme_txt[] =
int main(void) {
// TODO disable JTAG
+ // 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/mpconfigport.h b/stmhal/mpconfigport.h
index 28cd90bb0..f5110d8f0 100644
--- a/stmhal/mpconfigport.h
+++ b/stmhal/mpconfigport.h
@@ -44,6 +44,7 @@
*/
#define MICROPY_ENABLE_LFN (1)
#define MICROPY_LFN_CODE_PAGE (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
+#define MICROPY_PY_BUILTINS_STR_UNICODE (0)
#define MICROPY_PY_BUILTINS_FROZENSET (1)
#define MICROPY_PY_SYS_EXIT (1)
#define MICROPY_PY_SYS_STDFILES (1)
diff --git a/stmhal/pendsv.c b/stmhal/pendsv.c
index f8e3b3007..a0eff7e5d 100644
--- a/stmhal/pendsv.c
+++ b/stmhal/pendsv.c
@@ -27,8 +27,8 @@
#include <stdlib.h>
#include <stm32f4xx_hal.h>
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "pendsv.h"
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/pin_named_pins.c b/stmhal/pin_named_pins.c
index 3a1794e1d..d59ba8d11 100644
--- a/stmhal/pin_named_pins.c
+++ b/stmhal/pin_named_pins.c
@@ -30,8 +30,8 @@
#include "stm32f4xx_hal.h"
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
diff --git a/stmhal/printf.c b/stmhal/printf.c
index 26c552039..c4731aa88 100644
--- a/stmhal/printf.c
+++ b/stmhal/printf.c
@@ -28,10 +28,10 @@
#include <string.h>
#include <stdarg.h>
+#include "mpconfig.h"
#include "std.h"
#include "misc.h"
#include "systick.h"
-#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "pfenv.h"
diff --git a/stmhal/pybstdio.c b/stmhal/pybstdio.c
index 05ea06eb4..13057a8a0 100644
--- a/stmhal/pybstdio.c
+++ b/stmhal/pybstdio.c
@@ -28,8 +28,8 @@
#include <stm32f4xx_hal.h>
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "misc.h"
#include "obj.h"
diff --git a/stmhal/pyexec.c b/stmhal/pyexec.c
index 45928427e..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 STM32F405RG\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
diff --git a/stmhal/readline.c b/stmhal/readline.c
index d40bd4219..0e7ed2d64 100644
--- a/stmhal/readline.c
+++ b/stmhal/readline.c
@@ -29,8 +29,8 @@
#include <stm32f4xx_hal.h>
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "misc.h"
#include "obj.h"
diff --git a/stmhal/rng.c b/stmhal/rng.c
index 69fcb9d6f..ea636770c 100644
--- a/stmhal/rng.c
+++ b/stmhal/rng.c
@@ -28,8 +28,8 @@
#include "stm32f4xx_hal.h"
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "rng.h"
diff --git a/stmhal/rtc.c b/stmhal/rtc.c
index 412816c39..8f0d00732 100644
--- a/stmhal/rtc.c
+++ b/stmhal/rtc.c
@@ -28,8 +28,8 @@
#include "stm32f4xx_hal.h"
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
diff --git a/stmhal/sdcard.c b/stmhal/sdcard.c
index bd45af3a1..204dbe3b4 100644
--- a/stmhal/sdcard.c
+++ b/stmhal/sdcard.c
@@ -28,8 +28,8 @@
#include <stm32f4xx_hal.h>
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
diff --git a/stmhal/stm32f4xx_hal_msp.c b/stmhal/stm32f4xx_hal_msp.c
index 5816249e2..90baa41f8 100644
--- a/stmhal/stm32f4xx_hal_msp.c
+++ b/stmhal/stm32f4xx_hal_msp.c
@@ -66,8 +66,8 @@
#include "stm32f4xx_hal.h"
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "servo.h"
diff --git a/stmhal/stm32f4xx_it.c b/stmhal/stm32f4xx_it.c
index 17cdaf5fa..5fa7f8289 100644
--- a/stmhal/stm32f4xx_it.c
+++ b/stmhal/stm32f4xx_it.c
@@ -70,8 +70,8 @@
#include "stm32f4xx_it.h"
#include "stm32f4xx_hal.h"
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "extint.h"
diff --git a/stmhal/storage.c b/stmhal/storage.c
index ba7e303e2..001d87afe 100644
--- a/stmhal/storage.c
+++ b/stmhal/storage.c
@@ -28,9 +28,9 @@
#include <string.h>
#include <stm32f4xx_hal.h>
+#include "mpconfig.h"
#include "misc.h"
#include "systick.h"
-#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "led.h"
diff --git a/stmhal/systick.c b/stmhal/systick.c
index 8a8d6403d..196f1fbca 100644
--- a/stmhal/systick.c
+++ b/stmhal/systick.c
@@ -25,6 +25,7 @@
*/
#include <stm32f4xx_hal.h>
+#include "mpconfig.h"
#include "misc.h"
#include "systick.h"
diff --git a/stmhal/usrsw.c b/stmhal/usrsw.c
index 4ed9e3abe..8a082eac9 100644
--- a/stmhal/usrsw.c
+++ b/stmhal/usrsw.c
@@ -28,8 +28,8 @@
#include "stm32f4xx_hal.h"
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-04 15:01:35 +0000