uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Merge pull request #6 from Tectu/master

Browse source 
Update from Tectu
This commit is contained in:
Andrew Hannam 2012-09-09 20:20:58 -07:00
commit 967f37dffe
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gdisp/SSD1963/gdisp_lld.c
View file

@ -320,7 +320,7 @@ bool_t GDISP_LLD(init)(void) {
GDISP_LLD(writeindex)(SSD1963_SET_DISPLAY_ON); GDISP_LLD(writeindex)(SSD1963_SET_DISPLAY_ON);
#if defined(LCD_USE_FSMC) #if defined(LCD_USE_FSMC)
/* FSMC delay reduced as the controller now runs at full speed */ /* FSMC delay reduced as the controller now runs at full speed */
FSMC_Bank1->BTCR[FSMC_Bank+1] = FSMC_BTR1_ADDSET_0 | FSMC_BTR1_DATAST_1 | FSMC_BTR1_BUSTURN_0 ; FSMC_Bank1->BTCR[FSMC_Bank+1] = FSMC_BTR1_ADDSET_0 | FSMC_BTR1_DATAST_2 | FSMC_BTR1_BUSTURN_0 ;
FSMC_Bank1->BTCR[FSMC_Bank] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN; FSMC_Bank1->BTCR[FSMC_Bank] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN;
#endif #endif

1
include/touchpad.h
View file

@ -73,6 +73,7 @@ extern "C" {
void tpInit(const TOUCHPADDriver *tp); void tpInit(const TOUCHPADDriver *tp);
uint16_t tpReadX(void); uint16_t tpReadX(void);
uint16_t tpReadY(void); uint16_t tpReadY(void);
void tpCalibrate(void);
#if TOUCHPAD_HAS_IRQ #if TOUCHPAD_HAS_IRQ
uint8_t tpIRQ(void); uint8_t tpIRQ(void);

5
src/touchpad.c
View file

@ -196,11 +196,12 @@ uint16_t tpReadY(void) {
} }
void tpCalibrate(void) { void tpCalibrate(void) {
uint16_t cross[2][2] = {{40,50}, {200, 280}}; const uint16_t h = gdispGetHeight();
const uint16_t w = gdispGetWidth();
const uint16_t cross[2][2] = {{(w/8), (h/8)}, {(w-(w/8)) , (h-(h/8))}};
uint16_t points[2][2]; uint16_t points[2][2];
uint8_t i; uint8_t i;
//gdispSetOrientation(portrait);
gdispClear(Red); gdispClear(Red);
gdispFillStringBox(0, 10, gdispGetWidth(), 30, "Calibration", &fontUI2Double, White, Red, justifyCenter); gdispFillStringBox(0, 10, gdispGetWidth(), 30, "Calibration", &fontUI2Double, White, Red, justifyCenter);