Restructure

Create global include file called gfx.h which knows about sub-system
dependancies.
Deprecate Touchscreen (GINPUT touch is now working properly)
Merge Graph into GWIN
Change directory structure to reflect sub-system structure
Many small bugs fixed
Split Nokia6610 gdisp driver into GE8 and GE12 controller versions
Fixed broken demos.
GFX sub-systems are now clearly defined and new ones should be much
easier to add.

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h
index fa3dca7e..2fa6fe44 100644
--- a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h
+++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h
@@ -105,7 +105,7 @@ static __inline void release_bus(void) {
  *

  * @notapi

  */

-static uint16_t read_x_value(void) {

+static __inline uint16_t read_x_value(void) {

 	uint16_t val1, val2;

     adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];

 

@@ -113,7 +113,7 @@ static uint16_t read_x_value(void) {
     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); 

     chThdSleepMilliseconds(1);

@@ -135,7 +135,7 @@ static uint16_t read_x_value(void) {
  *

  * @notapi

  */

-static uint16_t read_y_value(void) {

+static __inline uint16_t read_y_value(void) {

 	uint16_t val1, val2;

     adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];

 

@@ -143,8 +143,8 @@ static uint16_t read_y_value(void) {
     palSetPadMode(GPIOC, 3, PAL_MODE_INPUT_ANALOG);

     palSetPadMode(GPIOC, 0, PAL_MODE_OUTPUT_PUSHPULL);

     palSetPadMode(GPIOC, 1, PAL_MODE_OUTPUT_PUSHPULL);

-    

-	palSetPad(GPIOC, 1);

+

+    palSetPad(GPIOC, 1);

     palClearPad(GPIOC, 0);

     chThdSleepMilliseconds(1);

     adcConvert(&ADCD1, &adc_y_config, samples, ADC_BUF_DEPTH);