Skip to content

Commit 450cb49

Browse files
committed
address review comments
1 parent 28887ab commit 450cb49

File tree

9 files changed

+6
-12
lines changed

9 files changed

+6
-12
lines changed

extmod/modhashlib.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ STATIC mp_obj_t hashlib_sha256_digest(mp_obj_t self_in) {
114114

115115
#else
116116

117-
// CIRCUITPY-CHNAGE
117+
// CIRCUITPY-CHANGE
118118
static void check_not_unicode(const mp_obj_t arg) {
119119
#if MICROPY_CPYTHON_COMPAT
120120
if (mp_obj_is_str(arg)) {

ports/unix/mpconfigport.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ typedef long mp_off_t;
152152
#define MICROPY_FATFS_RPATH (2)
153153
#define MICROPY_FATFS_MAX_SS (4096)
154154
#define MICROPY_FATFS_LFN_CODE_PAGE 437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
155-
// CIRCUITPY_CHANGE: enable FAT32 support
155+
// CIRCUITPY-CHANGE: enable FAT32 support
156156
#define MICROPY_FATFS_MKFS_FAT32 (1)
157157
// CIRCUITPY-CHANGE: allow FAT label access
158158
#define MICROPY_FATFS_USE_LABEL (1)

py/formatfloat.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static inline int fp_isless1(float x) {
8080

8181
#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
8282

83-
// CIRCUITPY-CHNAGE: prevent warnings
83+
// CIRCUITPY-CHANGE: prevent warnings
8484
#pragma GCC diagnostic ignored "-Wfloat-equal"
8585
#define FPTYPE double
8686
#define FPCONST(x) x

py/nlrthumb.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ NORETURN void nlr_jump(void *val) {
134134
"bx lr \n" // return
135135
: // output operands
136136
: "r" (top) // input operands
137-
// CIRCUITPY-CHANGE: MicroPython caught up with this change in https://github.com/micropython/micropython/pull/14126
137+
// CIRCUITPY-CHANGE: MicroPython makes this change in https://github.com/micropython/micropython/pull/14126 (later than v1.22)
138138
: "memory" // clobbered registers
139139
);
140140

py/objint.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ STATIC mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *pos_args, mp_map_t
530530
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(int_from_bytes_fun_obj, 3, int_from_bytes);
531531
STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(int_from_bytes_obj, MP_ROM_PTR(&int_from_bytes_fun_obj));
532532

533-
// CIRCUITPY-CHANGE: supprts signed
533+
// CIRCUITPY-CHANGE: supports signed
534534
STATIC mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
535535
enum { ARG_length, ARG_byteorder, ARG_signed };
536536
static const mp_arg_t allowed_args[] = {

py/qstr.h

-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ void qstr_pool_info(size_t *n_pool, size_t *n_qstr, size_t *n_str_data_bytes, si
112112
void qstr_dump_data(void);
113113

114114
#if MICROPY_ROM_TEXT_COMPRESSION
115-
// CIRCUITPY-CHANGE: TODO not const previusly, should it be??
116-
// TEST COMPILE with const ******************
117115
void mp_decompress_rom_string(byte *dst, const mp_rom_error_text_t src);
118116
#define MP_IS_COMPRESSED_ROM_STRING(s) (*(byte *)(s) == 0xff)
119117
#endif

shared-bindings/rainbowio/__init__.h

-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@
99

1010
#include "py/obj.h"
1111

12-
///#include "shared-module/rainbowio/__init__.h"
13-
1412
int32_t colorwheel(mp_float_t pos);

tools/merge_micropython.py

-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@
4646
except sh.ErrorReturnCode_128:
4747
pass
4848

49-
sys.exit(0)
50-
5149
# We inherit stm32 changes into stm because we did a git rename.
5250
git.status("--porcelain=1", "ports/stm", _out=out_buf)
5351
out_buf.seek(0)

0 commit comments

Comments
 (0)