Merge pull request adafruit#1331 from adafruit/tannewt-patch-4

dhalbert · web-flow · commit c63376c5fa41 · 2018-11-13T14:35:32.000-05:00
Switch SAMD51 back to -Os
diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
@@ -93,7 +93,7 @@ CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_SAMD21 -DCFG_TUD_CDC_RX_BUFSIZE=128 -DCFG_TUD_C
 endif
 
 ifeq ($(CHIP_FAMILY), samd51)
-CFLAGS += -O0 -DNDEBUG
+CFLAGS += -Os -DNDEBUG
 # TinyUSB defines
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_SAMD51 -DCFG_TUD_CDC_RX_BUFSIZE=256 -DCFG_TUD_CDC_TX_BUFSIZE=256 -DCFG_TUD_MSC_BUFSIZE=1024
 endif
diff --git a/ports/atmel-samd/common-hal/neopixel_write/__init__.c b/ports/atmel-samd/common-hal/neopixel_write/__init__.c
@@ -48,6 +48,11 @@
     }
 #endif
 
+// Ensure this code is compiled with -Os. Any other optimization level may change the timing of it
+// and break neopixels.
+#pragma GCC push_options
+#pragma GCC optimize ("Os")
+
 uint64_t next_start_tick_ms = 0;
 uint32_t next_start_tick_us = 1000;
 
@@ -183,3 +188,5 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t* digitalinout,
     mp_hal_enable_all_interrupts();
 
 }
+
+#pragma GCC pop_options

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,11 @@`
`48`	`48`	`}`
`49`	`49`	`#endif`
`50`	`50`
	`51`	`+// Ensure this code is compiled with -Os. Any other optimization level may change the timing of it`
	`52`	`+// and break neopixels.`
	`53`	`+#pragma GCC push_options`
	`54`	`+#pragma GCC optimize ("Os")`
	`55`	`+`
`51`	`56`	`uint64_t next_start_tick_ms = 0;`
`52`	`57`	`uint32_t next_start_tick_us = 1000;`
`53`	`58`
`@@ -183,3 +188,5 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t* digitalinout,`
`183`	`188`	`mp_hal_enable_all_interrupts();`
`184`	`189`
`185`	`190`	`}`
	`191`	`+`
	`192`	`+#pragma GCC pop_options`