Skip to content

Commit 6f4a861

Browse files
committed
Small bug in 'machine_mem.c" fixed
1 parent bc8185b commit 6f4a861

File tree

7 files changed

+4
-5
lines changed

7 files changed

+4
-5
lines changed

firmware/MaixPy.bin

0 Bytes
Binary file not shown.

firmware/MaixPy.kfpkg

26 Bytes
Binary file not shown.

firmware/MaixPy_firmware.zip

249 Bytes
Binary file not shown.

firmware/MaixPy_sqlite.bin

0 Bytes
Binary file not shown.

firmware/MaixPy_sqlite.kfpkg

70 Bytes
Binary file not shown.

k210-freertos/mpy_support/standard_lib/machine/modmachine.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args)
358358
mp_int_t freq = mp_obj_get_int(args[0]);
359359
freq = (freq / 10) * 10;
360360
if ((freq != 100) && (freq != 200) && (freq != 400)) {
361-
mp_raise_ValueError("Allowed CPU frequencies: 100, 400, 400 MHz");
361+
mp_raise_ValueError("Allowed CPU frequencies: 100, 200, 400 MHz");
362362
}
363363
freq *= 1000000;
364364
if (pll0 > 0) sysctl_pll_set_freq(SYSCTL_PLL0, pll0);
@@ -785,7 +785,6 @@ STATIC mp_obj_t mod_machine_membytes(mp_obj_t size_in)
785785
{
786786
uint16_t size = mp_obj_get_int(size_in);
787787
if ((size < 9) || (size > MYCROPY_SYS_RAMBUF_SIZE)) {
788-
mp_raise_ValueError("Out pf membytes size range (9 ~ ");
789788
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Out pf membytes size range (9 ~ %d)", MYCROPY_SYS_RAMBUF_SIZE));
790789
}
791790
machine_mem_obj_t *self = m_new_obj(machine_mem_obj_t);

micropython/extmod/machine_mem.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ STATIC uintptr_t machine_mem_get_addr(mp_obj_t addr_o, uint align) {
5959
STATIC void machine_mem_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
6060
(void)kind;
6161
machine_mem_obj_t *self = MP_OBJ_TO_PTR(self_in);
62-
if ((self->elem_size > 0) && (self->elem_size < 8)) mp_printf(print, "<%u-bit memory>", 8 * self->elem_size);
62+
if ((self->elem_size > 0) && (self->elem_size <= 8)) mp_printf(print, "<%u-bit memory>", 8 * self->elem_size);
6363
else if (self->elem_size > 8) mp_printf(print, "<%u bytes memory>", self->elem_size);
6464
else mp_printf(print, "<string memory>");
6565
}
@@ -79,7 +79,7 @@ STATIC mp_obj_t machine_mem_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t va
7979
uintptr_t ram_addr = addr + K210_SRAM_START_ADDRESS;
8080
int max_len = K210_SRAM_SIZE - addr;
8181

82-
if ((self->elem_size > 0) && (self->elem_size < 8)) val_len = self->elem_size * 8;
82+
if ((self->elem_size > 0) && (self->elem_size <= 8)) val_len = self->elem_size * 8;
8383
else if (self->elem_size > 8) {
8484
// membytes
8585
memcpy(strval, (uint8_t*)ram_addr, (MYCROPY_SYS_RAMBUF_SIZE > max_len) ? max_len : MYCROPY_SYS_RAMBUF_SIZE);
@@ -111,7 +111,7 @@ STATIC mp_obj_t machine_mem_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t va
111111
uint64_t val = 0;
112112
size_t val_len = 0;
113113
const char *strval = NULL;
114-
if ((self->elem_size > 0) && (self->elem_size < 8)) {
114+
if ((self->elem_size > 0) && (self->elem_size <= 8)) {
115115
val = mp_obj_get_int_truncated(value);
116116
val_len = self->elem_size* 8;
117117
}

0 commit comments

Comments
 (0)