mirror
/
pimoroni-pico
kopia lustrzana https://github.com/pimoroni/pimoroni-pico
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Reorder of variables to make MP happy

pull/144/head
ZodiusInfuser 2021-05-11 20:08:04 +01:00 zatwierdzone przez Phil Howard
rodzic f527b25fed
commit eb95bb0ffe
2 zmienionych plików z 16 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
drivers/ioexpander/ioexpander.cpp
Wyświetl plik

@ -297,9 +297,17 @@ namespace pimoroni {
this->mode = mode;
}
IOExpander::IOExpander(i2c_inst_t *i2c, uint8_t sda, uint8_t scl, uint8_t interrupt, uint8_t address, uint32_t timeout, bool debug) :
i2c(i2c), sda(sda), scl(scl), interrupt(interrupt),
address(address), timeout(timeout), debug(debug), vref(3.3f),
IOExpander::IOExpander() :
IOExpander(i2c0, DEFAULT_I2C_ADDRESS, DEFAULT_SDA_PIN, DEFAULT_SCL_PIN, DEFAULT_INT_PIN) {
}
IOExpander::IOExpander(uint8_t address, uint32_t timeout, bool debug) :
IOExpander(i2c0, address, DEFAULT_SDA_PIN, DEFAULT_SCL_PIN, DEFAULT_INT_PIN, timeout, debug) {
}
IOExpander::IOExpander(i2c_inst_t *i2c, uint8_t address, uint8_t sda, uint8_t scl, uint8_t interrupt, uint32_t timeout, bool debug) :
i2c(i2c), address(address), sda(sda), scl(scl), interrupt(interrupt),
timeout(timeout), debug(debug), vref(3.3f),
encoder_offset{0,0,0,0},
encoder_last{0,0,0,0},
pins{ Pin::pwm(1, 5, 5, reg::PIOCON1),
@ -318,10 +326,6 @@ namespace pimoroni {
Pin::adc(1, 7, 0)} {
}
IOExpander::IOExpander(uint8_t address, uint32_t timeout, bool debug) :
IOExpander(i2c0, DEFAULT_SDA_PIN, DEFAULT_SCL_PIN, DEFAULT_INT_PIN, address, timeout, debug) {
}
bool IOExpander::init(bool skipChipIdCheck) {
bool succeeded = true;

8
drivers/ioexpander/ioexpander.hpp
Wyświetl plik

@ -29,6 +29,7 @@ namespace pimoroni {
static const uint8_t DEFAULT_SDA_PIN = 20;
static const uint8_t DEFAULT_SCL_PIN = 21;
static const uint8_t DEFAULT_INT_PIN = 22;
static const uint8_t PIN_UNUSED = UINT8_MAX;
static const uint16_t CHIP_ID = 0xE26A;
static const uint8_t CHIP_VERSION = 2;
@ -151,7 +152,7 @@ namespace pimoroni {
uint32_t timeout;
bool debug;
float vref;
int16_t encoder_offset[4];;
int16_t encoder_offset[4];
int16_t encoder_last[4];
Pin pins[NUM_PINS];
@ -160,8 +161,9 @@ namespace pimoroni {
// Constructors/Destructor
//--------------------------------------------------
public:
IOExpander(i2c_inst_t *i2c, uint8_t sda, uint8_t scl, uint8_t interrupt, uint8_t address = DEFAULT_I2C_ADDRESS, uint32_t timeout = 1, bool debug = false);
IOExpander(uint8_t address = DEFAULT_I2C_ADDRESS, uint32_t timeout = 1, bool debug = false);
IOExpander();
IOExpander(uint8_t address, uint32_t timeout = 1, bool debug = false);
IOExpander(i2c_inst_t *i2c, uint8_t address, uint8_t sda, uint8_t scl, uint8_t interrupt = PIN_UNUSED, uint32_t timeout = 1, bool debug = false);
//--------------------------------------------------