diff options
Diffstat (limited to 'boards/addons')
22 files changed, 66 insertions, 187 deletions
diff --git a/boards/addons/gdisp/board_ED060SC4_example.h b/boards/addons/gdisp/board_ED060SC4_example.h index 4c25ba55..58d7ed3e 100644 --- a/boards/addons/gdisp/board_ED060SC4_example.h +++ b/boards/addons/gdisp/board_ED060SC4_example.h @@ -76,44 +76,44 @@ static void eink_delay(int us) { } /* Turn the E-ink panel Vdd supply (+3.3V) on or off. */ -static GFXINLINE void setpower_vdd(GDisplay *g, bool_t on) { +static GFXINLINE void setpower_vdd(GDisplay *g, gBool on) { (void) g; palWritePad(GPIOB, GPIOB_SMPS_CTRL, !on); palWritePad(GPIOA, GPIOA_EINK_VDD, on); } /* Turn the E-ink panel negative supplies (-15V, -20V) on or off. */ -static GFXINLINE void setpower_vneg(GDisplay *g, bool_t on) { +static GFXINLINE void setpower_vneg(GDisplay *g, gBool on) { (void) g; palWritePad(GPIOA, GPIOA_VNEG_CTRL, on); } /* Turn the E-ink panel positive supplies (-15V, -20V) on or off. */ -static GFXINLINE void setpower_vpos(GDisplay *g, bool_t on) { +static GFXINLINE void setpower_vpos(GDisplay *g, gBool on) { (void) g; palWritePad(GPIOA, GPIOA_VPOS_CTRL, on); } /* Set the state of the LE (source driver Latch Enable) pin. */ -static GFXINLINE void setpin_le(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_le(GDisplay *g, gBool on) { (void) g; palWritePad(GPIOB, GPIOB_EINK_LE, on); } /* Set the state of the OE (source driver Output Enable) pin. */ -static GFXINLINE void setpin_oe(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_oe(GDisplay *g, gBool on) { (void) g; palWritePad(GPIOB, GPIOB_EINK_OE, on); } /* Set the state of the CL (source driver Clock) pin. */ -static GFXINLINE void setpin_cl(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_cl(GDisplay *g, gBool on) { (void) g; palWritePad(GPIOB, GPIOB_EINK_CL, on); } /* Set the state of the SPH (source driver Start Pulse Horizontal) pin. */ -static GFXINLINE void setpin_sph(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_sph(GDisplay *g, gBool on) { (void) g; palWritePad(GPIOB, GPIOB_EINK_SPH, on); } @@ -125,19 +125,19 @@ static GFXINLINE void setpins_data(GDisplay *g, uint8_t value) { } /* Set the state of the CKV (gate driver Clock Vertical) pin. */ -static GFXINLINE void setpin_ckv(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_ckv(GDisplay *g, gBool on) { (void) g; palWritePad(GPIOB, GPIOB_EINK_CKV, on); } /* Set the state of the GMODE (gate driver Gate Mode) pin. */ -static GFXINLINE void setpin_gmode(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_gmode(GDisplay *g, gBool on) { (void) g; palWritePad(GPIOC, GPIOC_EINK_GMODE, on); } /* Set the state of the SPV (gate driver Start Pulse Vertical) pin. */ -static GFXINLINE void setpin_spv(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_spv(GDisplay *g, gBool on) { (void) g; palWritePad(GPIOB, GPIOB_EINK_SPV, on); } diff --git a/boards/addons/gdisp/board_HX8347D_stm32f4discovery.h b/boards/addons/gdisp/board_HX8347D_stm32f4discovery.h index bece729d..f727614d 100644 --- a/boards/addons/gdisp/board_HX8347D_stm32f4discovery.h +++ b/boards/addons/gdisp/board_HX8347D_stm32f4discovery.h @@ -103,7 +103,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; if (state) { CLR_RST; diff --git a/boards/addons/gdisp/board_ILI9320_olimex_pic32mx_lcd.h b/boards/addons/gdisp/board_ILI9320_olimex_pic32mx_lcd.h index 8ae7715f..aaafdf81 100644 --- a/boards/addons/gdisp/board_ILI9320_olimex_pic32mx_lcd.h +++ b/boards/addons/gdisp/board_ILI9320_olimex_pic32mx_lcd.h @@ -68,7 +68,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static noinline void setpin_reset(GDisplay *g, bool_t state) { +static noinline void setpin_reset(GDisplay *g, gBool state) { (void) g; if (state) palClearPad(IOPORTA, 7); diff --git a/boards/addons/gdisp/board_ILI9325_hy_stm32_100p.h b/boards/addons/gdisp/board_ILI9325_hy_stm32_100p.h index 51090f5d..afe5a887 100644 --- a/boards/addons/gdisp/board_ILI9325_hy_stm32_100p.h +++ b/boards/addons/gdisp/board_ILI9325_hy_stm32_100p.h @@ -68,7 +68,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; if(state) palClearPad(GPIOE, GPIOE_TFT_RST); diff --git a/boards/addons/gdisp/board_ILI9341_spi.h b/boards/addons/gdisp/board_ILI9341_spi.h index fbb710b0..c6bb2e56 100644 --- a/boards/addons/gdisp/board_ILI9341_spi.h +++ b/boards/addons/gdisp/board_ILI9341_spi.h @@ -83,14 +83,14 @@ static GFXINLINE void post_init_board(GDisplay *g) { * @brief Set or clear the lcd reset pin. * * @param[in] g The GDisplay structure - * @param[in] state TRUE = lcd in reset, FALSE = normal operation + * @param[in] state gTrue = lcd in reset, gFalse = normal operation * * @notapi */ -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; - if (state == TRUE) { + if (state) { palClearPad(LCD_PORT, LCD_RES); } else { palSetPad(LCD_PORT, LCD_RES); diff --git a/boards/addons/gdisp/board_ILI9481_firebullstm32f103.h b/boards/addons/gdisp/board_ILI9481_firebullstm32f103.h index fb57fb62..8169bbfc 100644 --- a/boards/addons/gdisp/board_ILI9481_firebullstm32f103.h +++ b/boards/addons/gdisp/board_ILI9481_firebullstm32f103.h @@ -53,7 +53,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/boards/addons/gdisp/board_ILI9488_stm32f4cube_hal.h b/boards/addons/gdisp/board_ILI9488_stm32f4cube_hal.h index d8379488..f1099c9b 100644 --- a/boards/addons/gdisp/board_ILI9488_stm32f4cube_hal.h +++ b/boards/addons/gdisp/board_ILI9488_stm32f4cube_hal.h @@ -97,7 +97,7 @@ static GFXINLINE void post_init_board(GDisplay* g) (void) g; } -static GFXINLINE void setpin_reset(GDisplay* g, bool_t state) +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; diff --git a/boards/addons/gdisp/board_S6D1121_olimex_e407.h b/boards/addons/gdisp/board_S6D1121_olimex_e407.h index fd924e7f..063495c6 100644 --- a/boards/addons/gdisp/board_S6D1121_olimex_e407.h +++ b/boards/addons/gdisp/board_S6D1121_olimex_e407.h @@ -50,7 +50,7 @@ static GFXINLINE void init_board(GDisplay *g) { } } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/boards/addons/gdisp/board_SPFD54124B_stm32f3.h b/boards/addons/gdisp/board_SPFD54124B_stm32f3.h index 9bc40367..f5413ce7 100644 --- a/boards/addons/gdisp/board_SPFD54124B_stm32f3.h +++ b/boards/addons/gdisp/board_SPFD54124B_stm32f3.h @@ -81,7 +81,7 @@ static GFXINLINE void soft_spi_write_9bit(uint16_t data){ } #endif -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; if(state) { CLR_RST; @@ -100,7 +100,7 @@ static GFXINLINE void init_board(GDisplay *g) { * SPI1 I/O pins setup. */ palSetPadMode(SPFD54124B_PIN_PORT, SPFD54124B_PIN_RST, PAL_MODE_OUTPUT_PUSHPULL); /* RESET */ - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); #if USE_HARD_SPI palSetPadMode(SPFD54124B_SPI_PORT, SPFD54124B_SPI_SCK, PAL_MODE_ALTERNATE(5) | PAL_STM32_OSPEED_HIGHEST); /* SCK. */ diff --git a/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h b/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h index 834cbcac..d7767d30 100644 --- a/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h +++ b/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h @@ -109,7 +109,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/boards/addons/gdisp/board_SSD1306_chibios_16.1.3_stm32f4.h b/boards/addons/gdisp/board_SSD1306_chibios_16.1.3_stm32f4.h index 361562fa..c13878fc 100644 --- a/boards/addons/gdisp/board_SSD1306_chibios_16.1.3_stm32f4.h +++ b/boards/addons/gdisp/board_SSD1306_chibios_16.1.3_stm32f4.h @@ -49,7 +49,7 @@ static GFXINLINE void post_init_board(GDisplay* g) } -static GFXINLINE void setpin_reset(GDisplay* g, bool_t state) +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void)g; diff --git a/boards/addons/gdisp/board_SSD1306_i2c.h b/boards/addons/gdisp/board_SSD1306_i2c.h index ee92ded6..768e4572 100644 --- a/boards/addons/gdisp/board_SSD1306_i2c.h +++ b/boards/addons/gdisp/board_SSD1306_i2c.h @@ -82,7 +82,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; if(state) CLR_RST diff --git a/boards/addons/gdisp/board_SSD1331_tinyscreen_arduino.cpp b/boards/addons/gdisp/board_SSD1331_tinyscreen_arduino.cpp deleted file mode 100644 index 5065c34d..00000000 --- a/boards/addons/gdisp/board_SSD1331_tinyscreen_arduino.cpp +++ /dev/null @@ -1,88 +0,0 @@ -#include <Arduino.h> -#include <SPI.h> -#include <Wire.h> - -#include "board_SSD1331.h" - -#define LCD_BOARD_ID 0 // 0 or 1 - set by the position of a resistor near SX1505 (see schematic and board design) - -// GPIO Pins -#define GPIO_DC 0x01 -#define GPIO_CS 0x02 -#define GPIO_RES 0x08 -#define GPIO_BTN1 0x10 -#define GPIO_BTN2 0x20 -#define GPIO_BTN3 0x40 -#define GPIO_BTN4 0x80 -#define GPIO_CMD_START ~(GPIO_CS|GPIO_DC) -#define GPIO_DATA_START ~GPIO_CS -#define GPIO_TRANSFER_END GPIO_CS - -//GPIO Registers -#define GPIO_RegData 0x00 -#define GPIO_RegDir 0x01 -#define GPIO_RegPullUp 0x02 - -// Wire address of the SX1505 chip -#define GPIO_ADDR 0x20 - -static void writeGPIO(uint8_t regAddr, uint8_t regData) -{ - uint8_t oldTWBR=TWBR; - TWBR=0; - Wire.beginTransmission(GPIO_ADDR + LCD_BOARD_ID); - Wire.write(regAddr); - Wire.write(regData); - Wire.endTransmission(); - TWBR=oldTWBR; -} - -static bool isDataMode = false; -static bool isCmdMode = false; - -void SSD1331_init_board(void) { - //setup GPIO, reset SSD1331 - writeGPIO(GPIO_RegData,~GPIO_RES);//reset low, CS/other pins high - writeGPIO(GPIO_RegDir,~GPIO_RES);//set reset to output - delay(5); - writeGPIO(GPIO_RegDir,~(GPIO_CS|GPIO_DC));//reset to input, CS/DC output - writeGPIO(GPIO_RegPullUp,GPIO_BTN1|GPIO_BTN2|GPIO_BTN3|GPIO_BTN4);//button pullup enable - //init SPI - SPI.begin(); - SPI.setDataMode(SPI_MODE0);//wrong mode, works because we're only writing. this mode is compatible with SD cards. - SPI.setClockDivider(SPI_CLOCK_DIV2); - - isDataMode = isCmdMode = false; -} - -void SSD1331_setpin_reset(int state) { - // Ignore this as we did it in the init_board -} - -void SSD1331_aquirebus(void) { - // Do nothing as we do it in the data transfer -} - -void SSD1331_releasebus(void) { - if (!isDataMode && !isCmdMode) return; - writeGPIO(GPIO_RegData,GPIO_TRANSFER_END); - isDataMode = isCmdMode = false; -} - -void SSD1331_write_cmd(uint8_t cmd) { - if (!isCmdMode) { - writeGPIO(GPIO_RegData,GPIO_CMD_START); - isDataMode = false; - isCmdMode = true; - } - SPI.transfer(cmd); -} - -void SSD1331_write_data(uint8_t data) { - if (!isDataMode) { - writeGPIO(GPIO_RegData,GPIO_DATA_START); - isDataMode = true; - isCmdMode = false; - } - SPI.transfer(data); -} diff --git a/boards/addons/gdisp/board_SSD1331_tinyscreen_arduino.h b/boards/addons/gdisp/board_SSD1331_tinyscreen_arduino.h deleted file mode 100644 index 17b125c8..00000000 --- a/boards/addons/gdisp/board_SSD1331_tinyscreen_arduino.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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 - */ - -#ifndef _GDISP_LLD_BOARD_H -#define _GDISP_LLD_BOARD_H - -#define init_board(g) SSD1331_init_board() -#define post_init_board(g) -#define setpin_reset(g, state) SSD1331_setpin_reset(state) -#define acquire_bus(g) SSD1331_aquirebus() -#define release_bus(g) SSD1331_releasebus() -#define write_cmd(g, cmd) SSD1331_write_cmd(cmd) -#define write_data(g, data) SSD1331_write_data(data) - -#ifdef __cplusplus -extern "C" { -#endif - -void SSD1331_init_board(void); -void SSD1331_setpin_reset(int state); -void SSD1331_aquirebus(void); -void SSD1331_releasebus(void); -void SSD1331_write_cmd(uint8_t cmd); -void SSD1331_write_data(uint8_t data); - -#ifdef __cplusplus -} -#endif - -#endif /* _GDISP_LLD_BOARD_H */ diff --git a/boards/addons/gdisp/board_SSD1351_teensy.h b/boards/addons/gdisp/board_SSD1351_teensy.h index 92a8ba4f..3273effb 100644 --- a/boards/addons/gdisp/board_SSD1351_teensy.h +++ b/boards/addons/gdisp/board_SSD1351_teensy.h @@ -8,17 +8,6 @@ #ifndef _GDISP_LLD_BOARD_H #define _GDISP_LLD_BOARD_H -#ifdef __cplusplus -extern "C" { -#endif // __cplusplus - -extern void ssd1351_init_board(void); -extern void ssd1351_setpin_reset(int state); -extern void ssd1351_acquire_bus(void); -extern void ssd1351_release_bus(void); -extern void ssd1351_write_cmd(unsigned char index); -extern void ssd1351_write_data(unsigned char data); - #define init_board(g) ssd1351_init_board() #define post_init_board(g) #define setpin_reset(g, s) ssd1351_setpin_reset(s) @@ -28,8 +17,20 @@ extern void ssd1351_write_data(unsigned char data); #define write_cmd(g, i) ssd1351_write_cmd(i) #define write_data(g, d) ssd1351_write_cmd(d) +/* This test is needed as this file is also included in the .cpp file providing the below functions */ +#ifdef __cplusplus +extern "C" { +#endif + +void ssd1351_init_board(void); +void ssd1351_setpin_reset(int state); +void ssd1351_acquire_bus(void); +void ssd1351_release_bus(void); +void ssd1351_write_cmd(unsigned char index); +void ssd1351_write_data(unsigned char data); + #ifdef __cplusplus } -#endif // __cplusplus +#endif #endif /* _GDISP_LLD_BOARD_H */ diff --git a/boards/addons/gdisp/board_SSD1963_fsmc.h b/boards/addons/gdisp/board_SSD1963_fsmc.h index 1bccac71..06fb2c9a 100644 --- a/boards/addons/gdisp/board_SSD1963_fsmc.h +++ b/boards/addons/gdisp/board_SSD1963_fsmc.h @@ -81,7 +81,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { FSMC_Bank1->BTCR[0] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/boards/addons/gdisp/board_SSD1963_gpio.h b/boards/addons/gdisp/board_SSD1963_gpio.h index e3b80917..20e5787e 100644 --- a/boards/addons/gdisp/board_SSD1963_gpio.h +++ b/boards/addons/gdisp/board_SSD1963_gpio.h @@ -72,7 +72,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/boards/addons/gdisp/board_UC8173_nordic_nrf52_sdk11.h b/boards/addons/gdisp/board_UC8173_nordic_nrf52_sdk11.h index a487ef20..7a4fb8ce 100644 --- a/boards/addons/gdisp/board_UC8173_nordic_nrf52_sdk11.h +++ b/boards/addons/gdisp/board_UC8173_nordic_nrf52_sdk11.h @@ -16,7 +16,7 @@ static const nrf_drv_spi_t spi = NRF_DRV_SPI_INSTANCE(SPI_INSTANCE); -static GFXINLINE bool_t init_board(GDisplay* g) +static GFXINLINE gBool init_board(GDisplay* g) { nrf_drv_spi_config_t spi_config; ret_code_t err = NRF_SUCCESS; @@ -47,10 +47,10 @@ static GFXINLINE bool_t init_board(GDisplay* g) spi_config.bit_order = NRF_DRV_SPI_BIT_ORDER_MSB_FIRST; err = nrf_drv_spi_init(&spi, &spi_config, 0); if (err != NRF_SUCCESS) { - return FALSE; + return gFalse; } - return TRUE; + return gTrue; } static GFXINLINE void post_init_board(GDisplay* g) @@ -58,7 +58,7 @@ static GFXINLINE void post_init_board(GDisplay* g) (void)g; } -static GFXINLINE void setpin_reset(GDisplay* g, bool_t state) +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void)g; @@ -69,14 +69,14 @@ static GFXINLINE void setpin_reset(GDisplay* g, bool_t state) } } -static GFXINLINE bool_t getpin_busy(GDisplay* g) +static GFXINLINE gBool getpin_busy(GDisplay* g) { (void)g; if (nrf_gpio_pin_read(PIN_BUSY) == 1) { - return TRUE; + return gTrue; } else { - return FALSE; + return gFalse; } } diff --git a/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h b/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h index 94f393b5..6611d5bc 100644 --- a/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h +++ b/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h @@ -34,17 +34,17 @@ static const SPIConfig spicfg = { // How much extra data to allocate at the end of the GMouse structure for the board's use #define GMOUSE_ADS7843_BOARD_DATA_SIZE 0 -static bool_t init_board(GMouse* m, unsigned driverinstance) { +static gBool init_board(GMouse* m, unsigned driverinstance) { (void) m; if (driverinstance) - return FALSE; + return gFalse; spiStart(&SPID2, &spicfg); - return TRUE; + return gTrue; } -static GFXINLINE bool_t getpin_pressed(GMouse* m) { +static GFXINLINE gBool getpin_pressed(GMouse* m) { (void) m; return (!palReadPad(GPIOG, 0)); diff --git a/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_st_stm32f4_discovery.h b/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_st_stm32f4_discovery.h index 83fb04fb..7916cc6f 100644 --- a/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_st_stm32f4_discovery.h +++ b/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_st_stm32f4_discovery.h @@ -45,11 +45,11 @@ static const SPIConfig spicfg = { // How much extra data to allocate at the end of the GMouse structure for the board's use #define GMOUSE_ADS7843_BOARD_DATA_SIZE 0 -static bool_t init_board(GMouse* m, unsigned driverinstance) { +static gBool init_board(GMouse* m, unsigned driverinstance) { (void) m; if (driverinstance) - return FALSE; + return gFalse; palSetPadMode(GPIOB, 13, PAL_MODE_ALTERNATE(5) ); /* SCK */ palSetPadMode(GPIOB, 14, PAL_MODE_ALTERNATE(5) ); /* MISO */ @@ -57,10 +57,10 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) { palSetPadMode(GPIOC, 4, PAL_MODE_OUTPUT_PUSHPULL); /* CS */ spiStart(&SPID2, &spicfg); - return TRUE; + return gTrue; } -static GFXINLINE bool_t getpin_pressed(GMouse* m) { +static GFXINLINE gBool getpin_pressed(GMouse* m) { (void) m; return (!palReadPad(GPIOC, 5)); diff --git a/boards/addons/ginput/touch/ADS7843/stm32f4cube_hal.h b/boards/addons/ginput/touch/ADS7843/stm32f4cube_hal.h index 6bce29e6..e34dee84 100644 --- a/boards/addons/ginput/touch/ADS7843/stm32f4cube_hal.h +++ b/boards/addons/ginput/touch/ADS7843/stm32f4cube_hal.h @@ -16,7 +16,7 @@ static SPI_HandleTypeDef _hspi; -static bool_t init_board(GMouse* m, unsigned driverinstance) +static gBool init_board(GMouse* m, unsigned driverinstance) { GPIO_InitTypeDef GPIO_InitStruct; @@ -93,20 +93,20 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) _hspi.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE; _hspi.Init.CRCPolynomial = 10; if (HAL_SPI_Init(&_hspi) != HAL_OK) { - return FALSE; + return gFalse; } - return TRUE; + return gTrue; } -static GFXINLINE bool_t getpin_pressed(GMouse* m) +static GFXINLINE gBool getpin_pressed(GMouse* m) { (void)m; if (HAL_GPIO_ReadPin(GPIOC, GPIO_PIN_4) == GPIO_PIN_RESET) - return TRUE; + return gTrue; - return FALSE; + return gFalse; } static GFXINLINE void aquire_bus(GMouse* m) 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 index 391eba9c..1b535473 100644 --- 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 @@ -59,18 +59,18 @@ static const ADCConversionGroup ADC_Y_CG = { .channels = 1 << YPOS, }; -static bool_t init_board(GMouse *m, unsigned driverinstance) { +static gBool init_board(GMouse *m, unsigned driverinstance) { (void) m; if (driverinstance) - return FALSE; + return gFalse; adcObjectInit(&ADCD); adcStart(&ADCD, &ADCC); - return TRUE; + return gTrue; } -static bool_t read_xyz(GMouse *m, GMouseReading *prd) { +static gBool read_xyz(GMouse *m, GMouseReading *prd) { adcsample_t samples[2]; prd->buttons = 0; @@ -89,7 +89,7 @@ static bool_t read_xyz(GMouse *m, GMouseReading *prd) { // Shortcut - no need to read X or Y if the touch is off. if (pdr->z < GMOUSE_MCU_Z_TOUCHON) - return TRUE; + return gTrue; // Read X palSetPadMode(IOPORTB, XPOS, PAL_MODE_OUTPUT); @@ -111,7 +111,7 @@ static bool_t read_xyz(GMouse *m, GMouseReading *prd) { adcConvert(&ADCD, &ADC_X_CG, &samples[0], 1); pdr->y = ADC_MAX - samples[0]; - return TRUE; + return gTrue; } #endif /* _GINPUT_LLD_MOUSE_BOARD_H */ |