Skip to content

Commit

Permalink
first attempt at getting trunk to do linting
Browse files Browse the repository at this point in the history
  • Loading branch information
garethhcoleman authored and caveman99 committed Apr 4, 2024
1 parent be88901 commit 4cdfae7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions src/graphics/TFTDisplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -410,10 +410,10 @@ class LGFX : public lgfx::LGFX_Device
{
lgfx::Panel_HX8357D _panel_instance;
lgfx::Bus_SPI _bus_instance;
#if defined(USE_XPT2046)
#if defined(USE_XPT2046)
lgfx::ITouch *_touch_instance;
// lgfx::Touch_XPT2046 _touch_instance;
#endif
// lgfx::Touch_XPT2046 _touch_instance;
#endif

public:
LGFX(void)
Expand Down Expand Up @@ -463,7 +463,7 @@ class LGFX : public lgfx::LGFX_Device

_panel_instance.config(cfg);
}
#if defined(USE_XPT2046)
#if defined(USE_XPT2046)
{
// Configure settings for touch control.
_touch_instance = new lgfx::Touch_XPT2046;
Expand All @@ -481,7 +481,7 @@ class LGFX : public lgfx::LGFX_Device
_touch_instance->config(touch_cfg);
//_panel_instance->setTouch(_touch_instance);
}
#endif
#endif
setPanel(&_panel_instance);
}
};
Expand Down
10 changes: 5 additions & 5 deletions variants/unphone/variant.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define TFT_WIDTH 320
#define TFT_OFFSET_X 0
#define TFT_OFFSET_Y 0
#define TFT_OFFSET_ROTATION 6 // the unPhone's screen is wired unusually, 0 is typical value here
#define TFT_OFFSET_ROTATION 6 // the unPhone's screen is wired unusually, 0 is typical value here
#define TFT_INVERT false
#define SCREEN_ROTATE true
#define SCREEN_TRANSITION_FRAMERATE 5
Expand All @@ -37,20 +37,20 @@
#define USE_XPT2046 1
#define TOUCH_CS 38

#define HAS_GPS 0 // the unphone doesn't have a gps module
#define HAS_GPS 0 // the unphone doesn't have a gps module
#undef GPS_RX_PIN
#undef GPS_TX_PIN

#define HAS_SDCARD 1
#define SDCARD_CS 43

#define LED_PIN 13 // the red part of the RGB LED
#define LED_PIN 13 // the red part of the RGB LED
#define LED_INVERTED 1

#define BUTTON_PIN 21 // Button 3 - square - top button in landscape mode
#define BUTTON_PIN 21 // Button 3 - square - top button in landscape mode
#define BUTTON_NEED_PULLUP // we do need a helping hand up

#define I2C_SDA 3 // I2C pins for this board
#define I2C_SDA 3 // I2C pins for this board
#define I2C_SCL 4

// ratio of voltage divider = 3.20 (R1=100k, R2=220k)
Expand Down

0 comments on commit 4cdfae7

Please sign in to comment.