SAMD21 input on change Arduino adapted macros

Author: Paciente8159

docs/mcumap_gen.xlsx

@@ -4,29 +4,38 @@
 
 [common_samd21]
 platform = atmelsam
+; platform_packages = platformio/toolchain-gccarmnoneeabi
 board = zeroUSB
 build_flags = ${env.build_flags} -std=gnu99 -Wall -fdata-sections -ffunction-sections -fno-exceptions -Wl,--gc-sections -nostdlib -fno-exceptions
 lib_deps = 
     ${env.lib_deps}
 		https://github.com/Paciente8159/uCNC-tinyusb.git#v0.15.4
-; platform_packages = platformio/tool-openocd
-; debug_build_flags = -Og -g3 -ggdb3 -gdwarf-2
-; debug_tool = cmsis-dap
-; debug_server =
-;   $PLATFORMIO_CORE_DIR/packages/tool-openocd/bin/openocd
-;   -f
-;   arduino_zero_debug.cfg
-; debug_init_cmds =
-;   target extended-remote $DEBUG_PORT
-;   load
-;   monitor reset init
+platform_packages = platformio/tool-openocd
+build_type = debug
+debug_build_flags = -Og -g3 -ggdb3 -gdwarf-2
+debug_tool = custom
+debug_server =
+    ${platformio.packages_dir}/tool-openocd/bin/openocd
+  -s ${platformio.packages_dir}/tool-openocd/scripts
+  -f interface/cmsis-dap.cfg
+  -c "transport select swd"
+  -c "set CHIPNAME at91samd21g18"
+  -c "set ENDIAN little"
+  -c "set telnet_port 0"
+  -f target/at91samdXX.cfg
+  -c "reset_config none"
+debug_init_cmds =
+  target extended-remote $DEBUG_PORT
+  load
+  monitor reset init
 
 [env:SAMD21-Wemos-M0]
 extends = common_samd21
 build_flags = ${common_samd21.build_flags} -D BOARDMAP=\"src/hal/boards/samd21/boardmap_mzero.h\"
 board_build.offset  = 0x2000
 board_upload.offset_address = 0x00002000
 
+
 [env:SAMD21-Arduino-Zero]
 extends = common_samd21
 build_flags = ${common_samd21.build_flags} -D BOARDMAP=\"src/hal/boards/samd21/boardmap_zero.h\"

uCNC/src/hal/boards/samd21/samd21.ini

@@ -37,8 +37,8 @@ build_flags = ${common_stm32.build_flags} -D F_CPU=72000000UL -D BOARDMAP=\"src/
 ; uncomment if it's a bluepill clone
 upload_flags = -c set CPUTAPID 0x2ba01477
 debug_server =
-  $PLATFORMIO_CORE_DIR\packages\tool-openocd\bin\openocd
-  -s $PLATFORMIO_CORE_DIR\packages\tool-openocd\scripts
+  ${platformio.packages_dir}/tool-openocd/bin/openocd
+  -s ${platformio.packages_dir}/tool-openocd/scripts
   -f interface\stlink.cfg
   -c "transport select hla_swd"
   -c "set CPUTAPID 0x2ba01477"

uCNC/src/hal/boards/stm32/stm32.ini

@@ -51,7 +51,7 @@ static void mcu_setup_clocks(void)
 	PM->APBBSEL.reg = 0;
 	PM->APBCSEL.reg = 0;
 	PM->AHBMASK.reg |= (PM_AHBMASK_NVMCTRL);
-	PM->APBAMASK.reg |= (PM_APBAMASK_PM | PM_APBAMASK_SYSCTRL | PM_APBAMASK_GCLK | PM_APBAMASK_RTC);
+	PM->APBAMASK.reg |= (PM_APBAMASK_PM | PM_APBAMASK_SYSCTRL | PM_APBAMASK_GCLK | PM_APBAMASK_RTC | PM_APBAMASK_EIC);
 	PM->APBBMASK.reg |= (PM_APBBMASK_NVMCTRL | PM_APBBMASK_PORT | PM_APBBMASK_USB);
 	PM->APBCMASK.reg |= (PM_APBCMASK_TCC0 | PM_APBCMASK_TCC1 | PM_APBCMASK_TCC2 | PM_APBCMASK_TC3 | PM_APBCMASK_TC4 | PM_APBCMASK_TC5 | PM_APBCMASK_TC6 | PM_APBCMASK_TC7);
 	PM->APBCMASK.reg |= PM_APBCMASK_ADC;
@@ -86,20 +86,31 @@ static void mcu_setup_clocks(void)
 	while (GCLK->STATUS.bit.SYNCBUSY)
 		;
 
-#if (SAMD21_EIC_MASK != 0)
+#if (SAMD21_EIC_MASK != 0) && !defined(ARDUINO)
+	// EIC->CTRL.bit.SWRST = 1;
+	// while (EIC->STATUS.bit.SYNCBUSY || EIC->CTRL.bit.SWRST)
+	// 	;
+
+	NVIC_DisableIRQ(EIC_IRQn);
+	NVIC_ClearPendingIRQ(EIC_IRQn);
+	NVIC_SetPriority(EIC_IRQn, NVIC_INPUT_IRQ_Pri);
+	NVIC_EnableIRQ(EIC_IRQn);
+
 	GCLK->CLKCTRL.reg = (uint16_t)(GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID_EIC);
+
 	EIC->CTRL.bit.ENABLE = 1;
 	while (EIC->STATUS.bit.SYNCBUSY)
 		;
+
+	EIC->WAKEUP.reg = SAMD21_EIC_MASK;
+
 	/*all external interrupts will be on pin change with filter*/
-	EIC->CONFIG[0].reg = 0xbbbbbbbb;
-	EIC->CONFIG[1].reg = 0xbbbbbbbb;
-	NVIC_SetPriority(EIC_IRQn, NVIC_INPUT_IRQ_Pri);
-	NVIC_ClearPendingIRQ(EIC_IRQn);
-	NVIC_EnableIRQ(EIC_IRQn);
+	EIC->CONFIG[0].reg = 0x33333333;
+	EIC->CONFIG[1].reg = 0x33333333;
 	EIC->EVCTRL.reg = 0;
 	EIC->INTFLAG.reg = SAMD21_EIC_MASK;
 	EIC->INTENSET.reg = SAMD21_EIC_MASK;
+
 #endif
 	// ADC clock
 	GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK4 | GCLK_CLKCTRL_ID_ADC;
@@ -147,37 +158,55 @@ static void mcu_setup_clocks(void)
 static bool mcu_probe_isr_enabled;
 #endif
 
+#ifndef ARDUINO
 void EIC_Handler(void)
 {
+	uint32_t status = EIC->INTFLAG.reg;
+
 #if (LIMITS_EICMASK != 0)
-	if (EIC->INTFLAG.reg & LIMITS_EICMASK)
+	if (status & LIMITS_EICMASK)
 	{
 		mcu_limits_changed_cb();
 	}
 #endif
 #if (CONTROLS_EICMASK != 0)
-	if (EIC->INTFLAG.reg & CONTROLS_EICMASK)
+	if (status & CONTROLS_EICMASK)
 	{
 		mcu_controls_changed_cb();
 	}
 #endif
 #if (PROBE_EICMASK != 0)
-	if (EIC->INTFLAG.reg & PROBE_EICMASK && mcu_probe_isr_enabled)
+	if (status & PROBE_EICMASK && mcu_probe_isr_enabled)
 	{
 		mcu_probe_changed_cb();
 	}
 #endif
 #if (DIN_IO_EICMASK != 0)
-	if (EIC->INTFLAG.reg & DIN_IO_EICMASK)
+	if (status & DIN_IO_EICMASK)
 	{
 		mcu_inputs_changed_cb();
 	}
+#endif
+	EIC->INTFLAG.reg = status;
+}
 #endif
 
-	EIC->INTFLAG.reg = SAMD21_EIC_MASK;
+#ifdef ARDUINO
+uint32_t findPin(EPortType port, uint32_t pin)
+{
+	for (unsigned int i = 0; i < PINCOUNT_fn(); i++)
+	{
+		if (g_APinDescription[i].ulPort == port && g_APinDescription[i].ulPin == pin)
+		{
+			return i;
+		}
+	}
+	return -1;
 }
 #endif
 
+#endif
+
 void MCU_ITP_ISR(void)
 {
 	static bool resetstep = false;