sforkowany z mirror/meshtastic-firmware
no need to pass in scl & sda into screen constructor
rodzic
3e4ccef992
commit
ffe95f62ab
|
@ -0,0 +1,7 @@
|
||||||
|
|
||||||
|
* make a new boarddef with a variant.h file. Fix pins in that file. In particular:
|
||||||
|
#define PIN_SPI_MISO (46)
|
||||||
|
#define PIN_SPI_MOSI (45)
|
||||||
|
#define PIN_SPI_SCK (47)
|
||||||
|
#define PIN_WIRE_SDA (26)
|
||||||
|
#define PIN_WIRE_SCL (27)
|
|
@ -52,7 +52,7 @@ bool pmu_irq = false;
|
||||||
meshtastic::Screen screen(SSD1306_ADDRESS, I2C_SDA, I2C_SCL);
|
meshtastic::Screen screen(SSD1306_ADDRESS, I2C_SDA, I2C_SCL);
|
||||||
#else
|
#else
|
||||||
// Fake values for pins to keep build happy, we won't ever initialize it.
|
// 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
|
#endif
|
||||||
|
|
||||||
// Global power status singleton
|
// Global power status singleton
|
||||||
|
@ -248,8 +248,11 @@ void setup()
|
||||||
|
|
||||||
#ifdef I2C_SDA
|
#ifdef I2C_SDA
|
||||||
Wire.begin(I2C_SDA, I2C_SCL);
|
Wire.begin(I2C_SDA, I2C_SCL);
|
||||||
scanI2Cdevice();
|
#else
|
||||||
|
Wire.begin();
|
||||||
#endif
|
#endif
|
||||||
|
scanI2Cdevice();
|
||||||
|
|
||||||
|
|
||||||
// Buttons & LED
|
// Buttons & LED
|
||||||
#ifdef BUTTON_PIN
|
#ifdef BUTTON_PIN
|
||||||
|
|
|
@ -89,7 +89,7 @@ class DebugInfo
|
||||||
class Screen : public PeriodicTask
|
class Screen : public PeriodicTask
|
||||||
{
|
{
|
||||||
public:
|
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(const Screen &) = delete;
|
||||||
Screen &operator=(const Screen &) = delete;
|
Screen &operator=(const Screen &) = delete;
|
||||||
|
|
Ładowanie…
Reference in New Issue