ADS7843 fix

3 files changed, 9 insertions, 5 deletions

diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c b/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c
index 5e390399..9c1a582b 100644
--- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c
+++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c
@@ -119,7 +119,7 @@ void ginput_lld_mouse_get_reading(MouseReading *pt) {
 		sampleBuf[i] = read_value(0xD1);

 	read_value(0xD0);

 	filter();

-	lastx = 42;//(coord_t)sampleBuf[3];

+	lastx = (coord_t)sampleBuf[3];

 

 	/* Get the Y value using the same process as above */

 	read_value(0x91);

@@ -127,7 +127,7 @@ void ginput_lld_mouse_get_reading(MouseReading *pt) {
 		sampleBuf[i] = read_value(0x91);

 	read_value(0x90);

 	filter();

-	lasty = 42;//(coord_t)sampleBuf[3];

+	lasty = (coord_t)sampleBuf[3];

 

 	// Release the bus

 	release_bus();

diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h
index d213cd17..9df301a4 100644
--- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h
+++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h
@@ -61,6 +61,8 @@ static __inline bool_t getpin_pressed(void) {
  */

 static __inline void aquire_bus(void) {

 	spiAcquireBus(&SPID1);

+    //TOUCHSCREEN_SPI_PROLOGUE();

+    palClearPad(GPIOC, 6);

 }

 

 /**

@@ -69,7 +71,9 @@ static __inline void aquire_bus(void) {
  * @notapi

  */

 static __inline void release_bus(void) {

+	palSetPad(GPIOC, 6);

 	spiReleaseBus(&SPID1);

+    //TOUCHSCREEN_SPI_EPILOGUE();

 }

 

 /**

@@ -90,8 +94,8 @@ static __inline uint16_t read_value(uint16_t port) {
     spiExchange(&SPID1, 3, txbuf, rxbuf);

 

     ret = (rxbuf[1] << 5) | (rxbuf[2] >> 3); 

-return 42;

-    return ret;

+    

+	return ret;

 }

 

 #endif /* _GINPUT_LLD_MOUSE_BOARD_H */

diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h
index de04e1f0..7462b9f2 100644
--- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h
+++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h
@@ -28,7 +28,7 @@
 #define _LLD_GINPUT_MOUSE_CONFIG_H

 

 #define GINPUT_MOUSE_EVENT_TYPE					GEVENT_TOUCH

-#define GINPUT_MOUSE_NEED_CALIBRATION			FALSE

+#define GINPUT_MOUSE_NEED_CALIBRATION			TRUE

 #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	FALSE

 #define GINPUT_MOUSE_MAX_CALIBRATION_ERROR		4

 #define GINPUT_MOUSE_READ_CYCLES				4