StackRduino
diff --git a/‎main.c‎
Lines changed: 1 addition & 0 deletions b/‎main.c‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎ports/atmel-samd/supervisor/port.c‎
Lines changed: 10 additions & 4 deletions b/‎ports/atmel-samd/supervisor/port.c‎
Lines changed: 10 additions & 4 deletions
diff --git a/‎shared-bindings/displayio/Group.c‎
Lines changed: 1 addition & 1 deletion b/‎shared-bindings/displayio/Group.c‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎shared-module/displayio/Group.c‎
Lines changed: 1 addition & 1 deletion b/‎shared-module/displayio/Group.c‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎shared-module/displayio/TileGrid.c‎
Lines changed: 1 addition & 1 deletion b/‎shared-module/displayio/TileGrid.c‎
Lines changed: 1 addition & 1 deletion
@@ -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;
         }
 
 
@@ -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;
 }
 
 /**
 
@@ -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 {
 
@@ -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) {
 
@@ -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) {
Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,7 @@ bool run_code_py(safe_mode_t safe_mode) {`
`229`	`229`	`MICROPY_VM_HOOK_LOOP`
`230`	`230`	`#endif`
`231`	`231`	`if (reload_requested) {`
	`232`	`+ reload_requested = false;`
`232`	`233`	`return true;`
`233`	`234`	`}`
`234`	`235`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ size_t common_hal_displayio_group_get_len(displayio_group_t* self) {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`mp_obj_t common_hal_displayio_group_get(displayio_group_t* self, size_t index) {`
`101`		`- return self->children[index];`
	`101`	`+ return MP_OBJ_FROM_PTR(self->children[index]);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`void common_hal_displayio_group_set(displayio_group_t* self, size_t index, mp_obj_t layer) {`
Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,9 @@ void common_hal_displayio_tilegrid_get_position(displayio_tilegrid_t *self, int1`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`void common_hal_displayio_tilegrid_set_position(displayio_tilegrid_t *self, int16_t x, int16_t y) {`
	`75`	`+ self->needs_refresh = self->x != x \|\| self->y != y;`
`75`	`76`	`self->x = x;`
`76`	`77`	`self->y = y;`
`77`		`- self->needs_refresh = true;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`mp_obj_t common_hal_displayio_tilegrid_get_pixel_shader(displayio_tilegrid_t *self) {`