epicardium/api/control.c

@@ -74,7 +74,7 @@ void __core1_init(void)
 	/*
 	 * Clear any pending API interrupts.
 	 */
-	TMR_IntClear(MXC_TMR5);
+	TMR_IntClear(MXC_TMR3);
 
 	/*
 	 * Disable the SysTick
@@ -181,8 +181,8 @@ void __core1_init(void)
 	/*
 	 * Clear any pending API interrupts.
 	 */
-	TMR_IntClear(MXC_TMR5);
-	NVIC_ClearPendingIRQ(TMR5_IRQn);
+	TMR_IntClear(MXC_TMR3);
+	NVIC_ClearPendingIRQ(TMR3_IRQn);
 
 	/*
 	 * Jump to payload's reset handler

epicardium/api/interrupt-receiver.c

@@ -6,9 +6,9 @@
 void __dispatch_isr(api_int_id_t);
 
 /* Timer Interrupt used for control char notification */
-void TMR5_IRQHandler(void)
+void TMR3_IRQHandler(void)
 {
-	TMR_IntClear(MXC_TMR5);
+	TMR_IntClear(MXC_TMR3);
 	__dispatch_isr(API_CALL_MEM->int_id);
 	API_CALL_MEM->int_id = (-1);
 }

epicardium/api/interrupt-sender.c

@@ -18,5 +18,5 @@ void api_interrupt_trigger(api_int_id_t id)
 	assert(API_CALL_MEM->int_id == (api_int_id_t)(-1));
 
 	API_CALL_MEM->int_id = id;
-	TMR_TO_Start(MXC_TMR5, 1, 0);
+	TMR_TO_Start(MXC_TMR3, 1, 0);
 }

epicardium/epicardium.h

@@ -496,6 +496,8 @@ enum gpio_pin {
     EPIC_GPIO_WRISTBAND_3 = 3,
     /** ``4``, Wristband connector 4 */
     EPIC_GPIO_WRISTBAND_4 = 4,
+    /** ``5``, IR LED */
+    EPIC_GPIO_IR_LED = 5,
 };
 
 /** GPIO pin modes */

epicardium/modules/gpio.c

@@ -28,6 +28,7 @@ gpio_cfg_t gpio_configs[] = {
 				    PIN_20,
 				    GPIO_FUNC_OUT,
 				    GPIO_PAD_NONE },
+	[EPIC_GPIO_IR_LED] = { PORT_0, PIN_23, GPIO_FUNC_OUT, GPIO_PAD_NONE },
 };
 
 static int s_adc_channels[] = {
@@ -39,11 +40,12 @@ static int s_adc_channels[] = {
 	 */
 	[EPIC_GPIO_WRISTBAND_3] = -1,
 	[EPIC_GPIO_WRISTBAND_4] = ADC_CH_4,
+	[EPIC_GPIO_IR_LED]      = ADC_CH_7,
 };
 
 int epic_gpio_set_pin_mode(uint8_t pin, uint8_t mode)
 {
-	if (pin < EPIC_GPIO_WRISTBAND_1 || pin > EPIC_GPIO_WRISTBAND_4)
+	if (pin < EPIC_GPIO_WRISTBAND_1 || pin > EPIC_GPIO_IR_LED)
 		return -EINVAL;
 
 	gpio_cfg_t *cfg = &gpio_configs[pin];
@@ -90,7 +92,7 @@ int epic_gpio_set_pin_mode(uint8_t pin, uint8_t mode)
 
 int epic_gpio_get_pin_mode(uint8_t pin)
 {
-	if (pin < EPIC_GPIO_WRISTBAND_1 || pin > EPIC_GPIO_WRISTBAND_4)
+	if (pin < EPIC_GPIO_WRISTBAND_1 || pin > EPIC_GPIO_IR_LED)
 		return -EINVAL;
 
 	gpio_cfg_t *cfg = &gpio_configs[pin];
@@ -111,7 +113,7 @@ int epic_gpio_get_pin_mode(uint8_t pin)
 
 int epic_gpio_write_pin(uint8_t pin, bool on)
 {
-	if (pin < EPIC_GPIO_WRISTBAND_1 || pin > EPIC_GPIO_WRISTBAND_4)
+	if (pin < EPIC_GPIO_WRISTBAND_1 || pin > EPIC_GPIO_IR_LED)
 		return -EINVAL;
 
 	gpio_cfg_t *cfg = &gpio_configs[pin];
@@ -128,7 +130,7 @@ int epic_gpio_write_pin(uint8_t pin, bool on)
 
 int epic_gpio_read_pin(uint8_t pin)
 {
-	if (pin < EPIC_GPIO_WRISTBAND_1 || pin > EPIC_GPIO_WRISTBAND_4)
+	if (pin < EPIC_GPIO_WRISTBAND_1 || pin > EPIC_GPIO_IR_LED)
 		return -EINVAL;
 
 	gpio_cfg_t *cfg = &gpio_configs[pin];

l0dables/lib/crt.s

@@ -207,8 +207,8 @@ DefaultHandler:
 		def_irq_handler    TMR0_IRQHandler
 		def_irq_handler    TMR1_IRQHandler
 		def_irq_handler    TMR2_IRQHandler
-		def_irq_handler    TMR3_IRQHandler
 		def_irq_handler    TMR4_IRQHandler
+		def_irq_handler    TMR5_IRQHandler
 		def_irq_handler    RSV11_IRQHandler
 		def_irq_handler    RSV12_IRQHandler
 		def_irq_handler    I2C0_IRQHandler

l0dables/lib/hardware.c

@@ -77,7 +77,7 @@ __weak void SystemInit()
 	SystemCoreClockUpdate();
 
 	// Enable API interrupt.
-	NVIC_EnableIRQ(TMR5_IRQn);
+	NVIC_EnableIRQ(TMR3_IRQn);
 }
 
 // newlib syscall to allow printf to work.

pycardium/modules/gpio.c

@@ -82,6 +82,7 @@ static const mp_rom_map_elem_t gpio_module_globals_table[] = {
 	  MP_OBJ_NEW_SMALL_INT(EPIC_GPIO_WRISTBAND_3) },
 	{ MP_ROM_QSTR(MP_QSTR_WRISTBAND_4),
 	  MP_OBJ_NEW_SMALL_INT(EPIC_GPIO_WRISTBAND_4) },
+	{ MP_ROM_QSTR(MP_QSTR_IR_LED), MP_OBJ_NEW_SMALL_INT(EPIC_GPIO_IR_LED) },
 	{ MP_ROM_QSTR(MP_QSTR_mode), MP_ROM_PTR(&gpio_module_modes) },
 };
 static MP_DEFINE_CONST_DICT(gpio_module_globals, gpio_module_globals_table);

pycardium/modules/qstrdefs.h

@@ -163,6 +163,7 @@ Q(WRISTBAND_1)
 Q(WRISTBAND_2)
 Q(WRISTBAND_3)
 Q(WRISTBAND_4)
+Q(IR_LED)
 Q(INPUT)
 Q(OUTPUT)
 Q(ADC)

pycardium/mphalport.c

@@ -23,8 +23,8 @@
 /* Initialize everything for MicroPython */
 void pycardium_hal_init(void)
 {
-	/* TMR5 is used for interrupts from Epicardium */
-	NVIC_EnableIRQ(TMR5_IRQn);
+	/* TMR3 is used for interrupts from Epicardium */
+	NVIC_EnableIRQ(TMR3_IRQn);
 
 	/*
 	 * Enable UART RX Interrupt so Pycardium can sleep until