Skip to content

Commit 3fe9ffc

Browse files
committed
micropython: Update to 1.26.
This also drops most of the previous patches concerning the unix/ev3dev variants.
1 parent 54ce559 commit 3fe9ffc

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

bricks/_common/mpconfigport.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
// to print such value. So, we avoid int32_t and use int directly.
135135
#define UINT_FMT "%u"
136136
#define INT_FMT "%d"
137+
#define HEX_FMT "%x"
137138
typedef intptr_t mp_int_t; // must be pointer size
138139
typedef uintptr_t mp_uint_t; // must be pointer size
139140

bricks/_common/mphalport.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
8282
return len;
8383
}
8484

85-
void mp_hal_stdout_tx_flush(void) {
85+
static void pb_stdout_flush(void) {
8686
// Don't raise, just wait for data to clear.
8787
while (!pbsys_host_tx_is_idle()) {
8888
MICROPY_VM_HOOK_LOOP;
@@ -95,7 +95,7 @@ void mp_hal_stdout_tx_flush(void) {
9595
*/
9696
void pb_stdout_flush_to_new_line(void) {
9797

98-
mp_hal_stdout_tx_flush();
98+
pb_stdout_flush();
9999

100100
// A program may be interrupted in the middle of a long print, or the user
101101
// may have printed without a newline. Ensure we end on a new line.
@@ -109,6 +109,6 @@ void pb_stdout_flush_to_new_line(void) {
109109
pbsys_host_stdout_write((const uint8_t *)eol, &size);
110110
ended_on_new_line = true;
111111

112-
mp_hal_stdout_tx_flush();
112+
pb_stdout_flush();
113113
}
114114
}

bricks/nxt/mphalport.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
8989
return len;
9090
}
9191

92-
void mp_hal_stdout_tx_flush(void) {
93-
// currently not buffered
94-
}
95-
9692
void pb_stdout_flush_to_new_line(void) {
9793
// currently not buffered
9894
}

micropython

Submodule micropython updated 911 files

0 commit comments

Comments
 (0)