StackRduino
diff --git a/‎stmhal/exti.c‎
Lines changed: 3 additions & 0 deletions b/‎stmhal/exti.c‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎stmhal/lcd.c‎
Lines changed: 8 additions & 3 deletions b/‎stmhal/lcd.c‎
Lines changed: 8 additions & 3 deletions
@@ -66,6 +66,8 @@
 // There is also a C API, so that drivers which require EXTI interrupt lines
 // can also use this code. See exti.h for the available functions and
 // usrsw.h for an example of using this.
+//
+// TODO Add python method to change callback object.
 
 #define EXTI_OFFSET	(EXTI_BASE - PERIPH_BASE)
 
@@ -302,6 +304,7 @@ void Handle_EXTI_Irq(uint32_t line) {
         if (line < EXTI_NUM_VECTORS) {
             exti_vector_t *v = &exti_vector[line];
             if (v->callback_obj != mp_const_none) {
+                // TODO need to wrap this in an nlr_buf; really need a general function for this
                 rt_call_function_1(v->callback_obj, MP_OBJ_NEW_SMALL_INT(line));
             }
         }
 
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <string.h>
 #include <stm32f4xx_hal.h>
 
@@ -59,8 +60,12 @@
 #define LCD_INSTR (0)
 #define LCD_DATA (1)
 
+static void lcd_delay(void) {
+    __asm volatile ("nop\nnop");
+}
+
 static void lcd_out(int instr_data, uint8_t i) {
-    HAL_Delay(0);
+    lcd_delay();
     PYB_LCD_PORT->BSRRH = PYB_LCD_CS1_PIN; // CS=0; enable
     if (instr_data == LCD_INSTR) {
         PYB_LCD_PORT->BSRRH = PYB_LCD_A0_PIN; // A0=0; select instr reg
@@ -69,15 +74,15 @@ static void lcd_out(int instr_data, uint8_t i) {
     }
     // send byte bigendian, latches on rising clock
     for (uint32_t n = 0; n < 8; n++) {
-        HAL_Delay(0);
+        lcd_delay();
         PYB_LCD_PORT->BSRRH = PYB_LCD_SCL_PIN; // SCL=0
         if ((i & 0x80) == 0) {
             PYB_LCD_PORT->BSRRH = PYB_LCD_SI_PIN; // SI=0
         } else {
             PYB_LCD_PORT->BSRRL = PYB_LCD_SI_PIN; // SI=1
         }
         i <<= 1;
-        HAL_Delay(0);
+        lcd_delay();
         PYB_LCD_PORT->BSRRL = PYB_LCD_SCL_PIN; // SCL=1
     }
     PYB_LCD_PORT->BSRRL = PYB_LCD_CS1_PIN; // CS=1; disable
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@`
`66`	`66`	`// There is also a C API, so that drivers which require EXTI interrupt lines`
`67`	`67`	`// can also use this code. See exti.h for the available functions and`
`68`	`68`	`// usrsw.h for an example of using this.`
	`69`	`+//`
	`70`	`+// TODO Add python method to change callback object.`
`69`	`71`
`70`	`72`	`#define EXTI_OFFSET (EXTI_BASE - PERIPH_BASE)`
`71`	`73`
`@@ -302,6 +304,7 @@ void Handle_EXTI_Irq(uint32_t line) {`
`302`	`304`	`if (line < EXTI_NUM_VECTORS) {`
`303`	`305`	`exti_vector_t *v = &exti_vector[line];`
`304`	`306`	`if (v->callback_obj != mp_const_none) {`
	`307`	`+ // TODO need to wrap this in an nlr_buf; really need a general function for this`
`305`	`308`	`rt_call_function_1(v->callback_obj, MP_OBJ_NEW_SMALL_INT(line));`
`306`	`309`	`}`
`307`	`310`	`}`