djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1546 from tannewt/fix_safe_mode 

A safe mode fix and displayio fixes
This commit is contained in:
Dan Halbert 2019-02-13 21:15:14 -05:00 committed by GitHub
parent a1a4959071 473bdf48f6
commit f99b9ddcf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main.c
View File

@ -229,6 +229,7 @@ bool run_code_py(safe_mode_t safe_mode) {
MICROPY_VM_HOOK_LOOP
#endif
if (reload_requested) {
reload_requested = false;
return true;
}

14
ports/atmel-samd/supervisor/port.c
View File

@ -248,14 +248,20 @@ void reset_cpu(void) {
reset();
}
extern uint32_t _ebss;
// Place the word to save just after our BSS section that gets blanked.
// Place the word to save 8k from the end of RAM so we and the bootloader don't clobber it.
#ifdef SAMD21
uint32_t* safe_word = (uint32_t*) (HMCRAMC0_ADDR + HMCRAMC0_SIZE - 0x2000);
#endif
#ifdef SAMD51
uint32_t* safe_word = (uint32_t*) (HSRAM_ADDR + HSRAM_SIZE - 0x2000);
#endif
void port_set_saved_word(uint32_t value) {
_ebss = value;
*safe_word = value;
}
uint32_t port_get_saved_word(void) {
return _ebss;
return *safe_word;
}
/**

2
shared-bindings/displayio/Group.c
View File

@ -256,7 +256,7 @@ STATIC mp_obj_t group_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t valu
if (value == MP_OBJ_SENTINEL) {
// load
return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_group_get(self, index));
return common_hal_displayio_group_get(self, index);
} else if (value == mp_const_none) {
common_hal_displayio_group_pop(self, index);
} else {

2
shared-module/displayio/Group.c
View File

@ -98,7 +98,7 @@ size_t common_hal_displayio_group_get_len(displayio_group_t* self) {
}
mp_obj_t common_hal_displayio_group_get(displayio_group_t* self, size_t index) {
return self->children[index];
return MP_OBJ_FROM_PTR(self->children[index]);
}
void common_hal_displayio_group_set(displayio_group_t* self, size_t index, mp_obj_t layer) {

2
shared-module/displayio/TileGrid.c
View File

@ -72,9 +72,9 @@ void common_hal_displayio_tilegrid_get_position(displayio_tilegrid_t *self, int1
}
void common_hal_displayio_tilegrid_set_position(displayio_tilegrid_t *self, int16_t x, int16_t y) {
self->needs_refresh = self->x != x || self->y != y;
self->x = x;
self->y = y;
self->needs_refresh = true;
}
mp_obj_t common_hal_displayio_tilegrid_get_pixel_shader(displayio_tilegrid_t *self) {