Clean up the driver directory structure by moving all board specific files into the boards sub-structure.

2 files changed, 303 insertions, 0 deletions

diff --git a/boards/addons/ginput/touch/MCU/ginput_lld_mouse_board_olimex_pic32mx_lcd.h b/boards/addons/ginput/touch/MCU/ginput_lld_mouse_board_olimex_pic32mx_lcd.h
new file mode 100644
index 00000000..a7435c95
--- /dev/null
+++ b/boards/addons/ginput/touch/MCU/ginput_lld_mouse_board_olimex_pic32mx_lcd.h
@@ -0,0 +1,151 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+/**
+ * @file    drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h
+ * @brief   GINPUT Touch low level driver source for the MCU on the example board.
+ *
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
+ *
+ * @{
+ */
+
+#ifndef _GINPUT_LLD_MOUSE_BOARD_H
+#define _GINPUT_LLD_MOUSE_BOARD_H
+
+static const ADCConfig ADCC = {
+  .vref = ADC_VREF_CFG_AVDD_AVSS,
+  .stime = 15,
+  .irq = EIC_IRQ_ADC,
+  .base = _ADC10_BASE_ADDRESS,
+};
+static struct ADCDriver ADCD;
+
+#define YNEG 13 // U
+#define XNEG 15 // R
+#define XPOS 12 // L
+#define YPOS 11 // D
+
+#define ADC_MAX 1023
+
+#define TOUCH_THRESHOULD 50
+
+static const ADCConversionGroup ADC_X_CG = {
+  .circular = FALSE,
+  .num_channels = 1,
+  .channels = 1 << XNEG,
+};
+
+static const ADCConversionGroup ADC_Y_CG = {
+  .circular = FALSE,
+  .num_channels = 1,
+  .channels = 1 << YPOS,
+};
+
+/**
+ * @brief   Initialise the board for the touch.
+ *
+ * @notapi
+ */
+static inline void init_board(void) {
+  adcObjectInit(&ADCD);
+  adcStart(&ADCD, &ADCC);
+}
+
+/**
+ * @brief   Check whether the surface is currently touched
+ * @return	TRUE if the surface is currently touched
+ *
+ * @notapi
+ */
+static inline bool_t getpin_pressed(void) {
+  adcsample_t samples[2] = {0, };
+
+  // Set X+ to ground
+  palSetPadMode(IOPORTB, XPOS, PAL_MODE_OUTPUT);
+  palClearPad(IOPORTB, XPOS);
+
+  // Set Y- to VCC
+  palSetPadMode(IOPORTB, YNEG, PAL_MODE_OUTPUT);
+  palSetPad(IOPORTB, YNEG);
+
+  palSetPadMode(IOPORTB, XNEG, PAL_MODE_INPUT_ANALOG);
+  palSetPadMode(IOPORTB, YPOS, PAL_MODE_INPUT_ANALOG);
+
+  adcConvert(&ADCD, &ADC_X_CG, &samples[0], 1);
+  adcConvert(&ADCD, &ADC_Y_CG, &samples[1], 1);
+
+  return (ADC_MAX - (samples[1] - samples[0])) > TOUCH_THRESHOULD;
+}
+
+/**
+ * @brief   Aquire the bus ready for readings
+ *
+ * @notapi
+ */
+static inline void aquire_bus(void) {
+}
+
+/**
+ * @brief   Release the bus after readings
+ *
+ * @notapi
+ */
+static inline void release_bus(void) {
+}
+
+/**
+ * @brief   Read an x value from touch controller
+ * @return	The value read from the controller
+ *
+ * @notapi
+ */
+static inline uint16_t read_x_value(void) {
+  adcsample_t sample;
+
+  palSetPadMode(IOPORTB, XPOS, PAL_MODE_OUTPUT);
+  palSetPad(IOPORTB, XPOS);
+
+  palSetPadMode(IOPORTB, XNEG, PAL_MODE_OUTPUT);
+  palClearPad(IOPORTB, XNEG);
+
+  palSetPadMode(IOPORTB, YNEG, PAL_MODE_INPUT);
+
+  palSetPadMode(IOPORTB, YPOS, PAL_MODE_INPUT_ANALOG);
+
+  adcConvert(&ADCD, &ADC_Y_CG, &sample, 1);
+
+  return ADC_MAX - sample;
+}
+
+/**
+ * @brief   Read an y value from touch controller
+ * @return	The value read from the controller
+ *
+ * @notapi
+ */
+static inline uint16_t read_y_value(void) {
+  adcsample_t sample;
+
+  palSetPadMode(IOPORTB, YNEG, PAL_MODE_OUTPUT);
+  palClearPad(IOPORTB, YNEG);
+
+  palSetPadMode(IOPORTB, YPOS, PAL_MODE_OUTPUT);
+  palSetPad(IOPORTB, YPOS);
+
+  palSetPadMode(IOPORTB, XPOS, PAL_MODE_INPUT);
+
+  palSetPadMode(IOPORTB, XNEG, PAL_MODE_INPUT_ANALOG);
+
+  adcConvert(&ADCD, &ADC_X_CG, &sample, 1);
+
+  return ADC_MAX - sample;
+}
+
+#endif /* _GINPUT_LLD_MOUSE_BOARD_H */
+/** @} */
diff --git a/boards/addons/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h b/boards/addons/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h
new file mode 100644
index 00000000..ca177a89
--- /dev/null
+++ b/boards/addons/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h
@@ -0,0 +1,152 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+/**
+ * @file    drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h
+ * @brief   GINPUT Touch low level driver source for the MCU on the example board.
+ *
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
+ *
+ * @{
+ */
+
+#ifndef _GINPUT_LLD_MOUSE_BOARD_H
+#define _GINPUT_LLD_MOUSE_BOARD_H
+
+#define ADC_NUM_CHANNELS   2
+#define ADC_BUF_DEPTH      1
+
+static const ADCConversionGroup adc_y_config = { 
+    FALSE,
+    ADC_NUM_CHANNELS,
+    NULL,
+    NULL,
+    0, 0,    
+    0, 0,    
+    ADC_SQR1_NUM_CH(ADC_NUM_CHANNELS),
+    0,    
+    ADC_SQR3_SQ2_N(ADC_CHANNEL_IN12) | ADC_SQR3_SQ1_N(ADC_CHANNEL_IN13)
+};
+
+static const ADCConversionGroup adc_x_config = { 
+    FALSE,
+    ADC_NUM_CHANNELS,
+    NULL,
+    NULL,
+    0, 0,
+    0, 0,
+    ADC_SQR1_NUM_CH(ADC_NUM_CHANNELS),
+    0,  
+    ADC_SQR3_SQ2_N(ADC_CHANNEL_IN10) | ADC_SQR3_SQ1_N(ADC_CHANNEL_IN11)
+};
+
+/**
+ * @brief   Initialise the board for the touch.
+ *
+ * @notapi
+ */
+static inline void init_board(void) {
+	adcStart(&ADCD1, NULL);
+}
+
+/**
+ * @brief   Check whether the surface is currently touched
+ * @return	TRUE if the surface is currently touched
+ *
+ * @notapi
+ */
+static inline bool_t getpin_pressed(void) {
+    palSetPadMode(GPIOC, 0, PAL_MODE_INPUT_PULLDOWN);
+    palSetPadMode(GPIOC, 1, PAL_MODE_INPUT);
+    palSetPadMode(GPIOC, 2, PAL_MODE_INPUT);
+    palSetPadMode(GPIOC, 3, PAL_MODE_OUTPUT_PUSHPULL);
+    palSetPad(GPIOC, 3);
+	
+	return palReadPad(GPIOC, 0);
+}
+
+/**
+ * @brief   Aquire the bus ready for readings
+ *
+ * @notapi
+ */
+static inline void aquire_bus(void) {
+
+}
+
+/**
+ * @brief   Release the bus after readings
+ *
+ * @notapi
+ */
+static inline void release_bus(void) {
+
+}
+
+/**
+ * @brief   Read an x value from touch controller
+ * @return	The value read from the controller
+ *
+ * @notapi
+ */
+static inline uint16_t read_x_value(void) {
+	uint16_t val1, val2;
+    adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
+
+    palSetPadMode(GPIOC, 0, PAL_MODE_INPUT_ANALOG);
+    palSetPadMode(GPIOC, 1, PAL_MODE_INPUT_ANALOG);
+    palSetPadMode(GPIOC, 2, PAL_MODE_OUTPUT_PUSHPULL);
+    palSetPadMode(GPIOC, 3, PAL_MODE_OUTPUT_PUSHPULL);
+    
+	palSetPad(GPIOC, 2);
+    palClearPad(GPIOC, 3); 
+    gfxSleepMilliseconds(1);
+    adcConvert(&ADCD1, &adc_x_config, samples, ADC_BUF_DEPTH);  
+    val1 = ((samples[0] + samples[1])/2);
+    
+	palClearPad(GPIOC, 2);
+    palSetPad(GPIOC, 3);
+    gfxSleepMilliseconds(1);
+    adcConvert(&ADCD1, &adc_x_config, samples, ADC_BUF_DEPTH);
+    val2 = ((samples[0] + samples[1])/2);
+    
+	return ((val1+((1<<12)-val2))/4);
+}
+
+/**
+ * @brief   Read an y value from touch controller
+ * @return	The value read from the controller
+ *
+ * @notapi
+ */
+static inline uint16_t read_y_value(void) {
+	uint16_t val1, val2;
+    adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
+
+    palSetPadMode(GPIOC, 2, PAL_MODE_INPUT_ANALOG);
+    palSetPadMode(GPIOC, 3, PAL_MODE_INPUT_ANALOG);
+    palSetPadMode(GPIOC, 0, PAL_MODE_OUTPUT_PUSHPULL);
+    palSetPadMode(GPIOC, 1, PAL_MODE_OUTPUT_PUSHPULL);
+
+    palSetPad(GPIOC, 1);
+    palClearPad(GPIOC, 0);
+    gfxSleepMilliseconds(1);
+    adcConvert(&ADCD1, &adc_y_config, samples, ADC_BUF_DEPTH);
+    val1 = ((samples[0] + samples[1])/2);
+
+    palClearPad(GPIOC, 1);
+    palSetPad(GPIOC, 0);
+    gfxSleepMilliseconds(1);
+    adcConvert(&ADCD1, &adc_y_config, samples, ADC_BUF_DEPTH);
+    val2 = ((samples[0] + samples[1])/2);
+    
+	return ((val1+((1<<12)-val2))/4);
+}
+
+#endif /* _GINPUT_LLD_MOUSE_BOARD_H */
+/** @} */