Fix up STM

tannewt · tannewt · commit 01941c027b73 · 2020-04-08T14:41:57.000-07:00
Enable the Alarm IRQ earlier and correct bit clearing.
diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c
@@ -178,9 +178,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
     }
 
     //handle typedef selection, errors
-    if ( (self->sck != NULL && self->mosi != NULL && self->miso != NULL) ||
-        (self->sck != NULL && self->mosi != NULL && miso == NULL) ||
-        (self->sck != NULL && self->miso != NULL && mosi == NULL)) {
+    if (self->sck != NULL && (self->mosi != NULL || self->miso != NULL)) {
         SPIx = mcu_spi_banks[self->sck->spi_index - 1];
     } else {
         if (spi_taken) {
diff --git a/ports/stm/common-hal/pulseio/PulseIn.c b/ports/stm/common-hal/pulseio/PulseIn.c
@@ -117,7 +117,7 @@ void pulsein_reset(void) {
 void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t* self, const mcu_pin_obj_t* pin,
                                              uint16_t maxlen, bool idle_state) {
 #if !(HAS_BASIC_TIM)
-    mp_raise_NotImplementedError(translate("PulseOut not supported on this chip"));
+    mp_raise_NotImplementedError(translate("PulseIn not supported on this chip"));
 #else
     // STM32 has one shared EXTI for each pin number, 0-15
     uint8_t p_num = pin->number;
diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
@@ -79,6 +79,8 @@ safe_mode_t port_init(void) {
 
     HAL_RTC_Init(&_hrtc);
 
+    HAL_NVIC_EnableIRQ(RTC_Alarm_IRQn);
+
     return NO_SAFE_MODE;
 }
 
@@ -182,10 +184,12 @@ void RTC_WKUP_IRQHandler(void) {
     __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(&_hrtc, RTC_FLAG_WUTF);
     __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG();
 }
-
+volatile bool alarmed_already = false;
 void RTC_Alarm_IRQHandler(void) {
-    RTC->ISR = ~RTC_FLAG_ALRAF;
+    __HAL_RTC_ALARM_CLEAR_FLAG(&_hrtc, RTC_FLAG_ALRAF);
+    __HAL_RTC_ALARM_EXTI_CLEAR_FLAG();
     HAL_RTC_DeactivateAlarm(&_hrtc, RTC_ALARM_A);
+    alarmed_already = true;
 }
 
 // Enable 1/1024 second tick.
@@ -227,6 +231,7 @@ void port_interrupt_after_ticks(uint32_t ticks) {
     alarm.Alarm = RTC_ALARM_A;
 
     HAL_RTC_SetAlarm_IT(&_hrtc, &alarm, RTC_FORMAT_BIN);
+    alarmed_already = false;
 }
 
 void port_sleep_until_interrupt(void) {
@@ -235,6 +240,9 @@ void port_sleep_until_interrupt(void) {
         __set_FPSCR(__get_FPSCR()  & ~(0x9f));
         (void) __get_FPSCR();
     }
+    if (alarmed_already) {
+        return;
+    }
     __WFI();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ safe_mode_t port_init(void) {`
`79`	`79`
`80`	`80`	`HAL_RTC_Init(&_hrtc);`
`81`	`81`
	`82`	`+ HAL_NVIC_EnableIRQ(RTC_Alarm_IRQn);`
	`83`	`+`
`82`	`84`	`return NO_SAFE_MODE;`
`83`	`85`	`}`
`84`	`86`
`@@ -182,10 +184,12 @@ void RTC_WKUP_IRQHandler(void) {`
`182`	`184`	`__HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(&_hrtc, RTC_FLAG_WUTF);`
`183`	`185`	`__HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG();`
`184`	`186`	`}`
`185`		`-`
	`187`	`+volatile bool alarmed_already = false;`
`186`	`188`	`void RTC_Alarm_IRQHandler(void) {`
`187`		`- RTC->ISR = ~RTC_FLAG_ALRAF;`
	`189`	`+ __HAL_RTC_ALARM_CLEAR_FLAG(&_hrtc, RTC_FLAG_ALRAF);`
	`190`	`+ __HAL_RTC_ALARM_EXTI_CLEAR_FLAG();`
`188`	`191`	`HAL_RTC_DeactivateAlarm(&_hrtc, RTC_ALARM_A);`
	`192`	`+ alarmed_already = true;`
`189`	`193`	`}`
`190`	`194`
`191`	`195`	`// Enable 1/1024 second tick.`
`@@ -227,6 +231,7 @@ void port_interrupt_after_ticks(uint32_t ticks) {`
`227`	`231`	`alarm.Alarm = RTC_ALARM_A;`
`228`	`232`
`229`	`233`	`HAL_RTC_SetAlarm_IT(&_hrtc, &alarm, RTC_FORMAT_BIN);`
	`234`	`+ alarmed_already = false;`
`230`	`235`	`}`
`231`	`236`
`232`	`237`	`void port_sleep_until_interrupt(void) {`
`@@ -235,6 +240,9 @@ void port_sleep_until_interrupt(void) {`
`235`	`240`	`__set_FPSCR(__get_FPSCR() & ~(0x9f));`
`236`	`241`	`(void) __get_FPSCR();`
`237`	`242`	`}`
	`243`	`+ if (alarmed_already) {`
	`244`	`+ return;`
	`245`	`+ }`
`238`	`246`	`__WFI();`
`239`	`247`	`}`
`240`	`248`