rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-31 15:10:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

no need to pass in scl & sda into screen constructor

Browse Source
This commit is contained in:
geeksville
2020-04-23 13:53:51 -07:00
parent 3e4ccef992
commit ffe95f62ab
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.cpp
View File

@@ -52,7 +52,7 @@ bool pmu_irq = false;
meshtastic::Screen screen(SSD1306_ADDRESS, I2C_SDA, I2C_SCL);
#else
// Fake values for pins to keep build happy, we won't ever initialize it.
meshtastic::Screen screen(SSD1306_ADDRESS, 0, 0);
meshtastic::Screen screen(SSD1306_ADDRESS);
#endif
// Global power status singleton
@@ -248,8 +248,11 @@ void setup()
#ifdef I2C_SDA
Wire.begin(I2C_SDA, I2C_SCL);
scanI2Cdevice();
#else
Wire.begin();
#endif
scanI2Cdevice();
// Buttons & LED
#ifdef BUTTON_PIN

2
src/screen.h
View File

@@ -89,7 +89,7 @@ class DebugInfo
class Screen : public PeriodicTask
{
public:
Screen(uint8_t address, uint8_t sda, uint8_t scl);
Screen(uint8_t address, uint8_t sda = 0, uint8_t scl = 0);
Screen(const Screen &) = delete;
Screen &operator=(const Screen &) = delete;