PIN input support (dial)

boards/STBEE_MINI/board.c

@@ -21,6 +21,7 @@ hwinit1 (void)
     ;				/* Wait for JTAG debugger connection */
   palWritePort(IOPORT2, 0xffff); /* All set */
 
+#if defined(PINPAD_CIR_SUPPORT)
   /* EXTI0 <= PB0 */
   AFIO->EXTICR[0] = AFIO_EXTICR1_EXTI0_PB;
   EXTI->IMR = 0;
@@ -46,6 +47,33 @@ hwinit1 (void)
   TIM3->ARR = 18000;		/* 18 ms */
   /* Generate UEV to upload PSC and ARR */
   TIM3->EGR = TIM_EGR_UG;	
+#elif defined(PINPAD_DIAL_SUPPORT)
+  /* EXTI2 <= PB2 */
+  AFIO->EXTICR[0] = AFIO_EXTICR1_EXTI2_PB;
+  EXTI->IMR = 0;
+  EXTI->FTSR = EXTI_FTSR_TR2;
+  NVICEnableVector(EXTI2_IRQn,
+		   CORTEX_PRIORITY_MASK(CORTEX_MINIMUM_PRIORITY));
+
+  /* TIM4 */
+  RCC->APB1ENR |= RCC_APB1ENR_TIM4EN;
+  RCC->APB1RSTR = RCC_APB1RSTR_TIM4RST;
+  RCC->APB1RSTR = 0;
+
+  TIM4->CR1 = TIM_CR1_URS |  TIM_CR1_ARPE | TIM_CR1_CKD_1;
+  TIM4->CR2 = 0;
+  TIM4->SMCR = TIM_SMCR_SMS_0;
+  TIM4->DIER = 0;		/* no interrupt */
+  TIM4->CCMR1 = TIM_CCMR1_CC1S_0 | TIM_CCMR1_CC2S_0
+    | TIM_CCMR1_IC1F_0 | TIM_CCMR1_IC1F_1 | TIM_CCMR1_IC1F_2 | TIM_CCMR1_IC1F_3
+    | TIM_CCMR1_IC2F_0 | TIM_CCMR1_IC2F_1 | TIM_CCMR1_IC2F_2 | TIM_CCMR1_IC2F_3;
+  TIM4->CCMR2 = 0;
+  TIM4->CCER = 0;
+  TIM4->PSC = 0;
+  TIM4->ARR = 31;
+  /* Generate UEV to upload PSC and ARR	 */
+  TIM4->EGR = TIM_EGR_UG;
+#endif
 #endif
   /*
    * Disable JTAG and SWD, done after hwinit1_common as HAL resets AFIO
@@ -74,6 +102,7 @@ set_led (int value)
 }
 
 #if defined(PINPAD_SUPPORT)
+#if defined(PINPAD_CIR_SUPPORT)
 void
 cir_ext_disable (void)
 {
@@ -111,4 +140,31 @@ CH_IRQ_HANDLER (TIM3_IRQHandler)
   chSysUnlockFromIsr();
   CH_IRQ_EPILOGUE();
 }
+#elif defined(PINPAD_DIAL_SUPPORT)
+void
+dial_sw_disable (void)
+{
+  EXTI->PR = EXTI_PR_PR2;
+  EXTI->IMR &= ~EXTI_IMR_MR2;
+}
+
+void
+dial_sw_enable (void)
+{
+  EXTI->IMR |= EXTI_IMR_MR2;
+}
+
+extern void dial_sw_interrupt (void);
+
+CH_IRQ_HANDLER (EXTI2_IRQHandler)
+{
+  CH_IRQ_PROLOGUE ();
+  chSysLockFromIsr ();
+
+  dial_sw_interrupt ();
+
+  chSysUnlockFromIsr ();
+  CH_IRQ_EPILOGUE ();
+}
+#endif
 #endif

boards/STBEE_MINI/board.h

@@ -107,8 +107,8 @@
 /* Port B setup. */
 #define GPIOB_CIR		0
 #define GPIOB_BUTTON            2
-#define GPIOB_ROT_A             3
-#define GPIOB_ROT_B             4
+#define GPIOB_ROT_A             6
+#define GPIOB_ROT_B             7
 
 #define GPIOB_7SEG_DP           15
 #define GPIOB_7SEG_A            14