Fix -fpermissive errors

custom
jacqueline 3 years ago
parent b429f0ddec
commit 490b5d6994
  1. 6
      main/gay-ipod-fw.cpp
  2. 6
      main/gpio-expander.cpp
  3. 1
      main/gpio-expander.h

@ -28,7 +28,7 @@
static const char* TAG = "MAIN";
esp_err_t init_i2c(void) {
int i2c_port = 0;
i2c_port_t port = I2C_NUM_0;
i2c_config_t config = {
.mode = I2C_MODE_MASTER,
.sda_io_num = I2C_SDA_IO,
@ -42,8 +42,8 @@ esp_err_t init_i2c(void) {
.clk_flags = 0,
};
ESP_ERROR_CHECK(i2c_param_config(i2c_port, &config));
ESP_ERROR_CHECK(i2c_driver_install(i2c_port, config.mode, 0, 0, 0));
ESP_ERROR_CHECK(i2c_param_config(port, &config));
ESP_ERROR_CHECK(i2c_driver_install(port, config.mode, 0, 0, 0));
// TODO: INT line
// TODO: add devices to the bus (DAC and GPIO expander)

@ -22,8 +22,7 @@ esp_err_t GpioExpander::Write() {
i2c_master_write_byte(handle, port_b_, true);
i2c_master_stop(handle);
// TODO: timeout
esp_err_t ret = i2c_master_cmd_begin(0, handle, 0);
esp_err_t ret = i2c_master_cmd_begin(I2C_NUM_0, handle, PCA8575_TIMEOUT);
i2c_cmd_link_delete(handle);
return ret;
@ -43,8 +42,7 @@ esp_err_t GpioExpander::Read() {
i2c_master_read_byte(handle, &input_b_, I2C_MASTER_LAST_NACK);
i2c_master_stop(handle);
// TODO: timeout
esp_err_t ret = i2c_master_cmd_begin(0, handle, 0);
esp_err_t ret = i2c_master_cmd_begin(I2C_NUM_0, handle, PCA8575_TIMEOUT);
i2c_cmd_link_delete(handle);
return ret;

@ -8,6 +8,7 @@
#include "driver/i2c.h"
#define PCA8575_ADDRESS (0x20)
#define PCA8575_TIMEOUT (5)
namespace gay_ipod {

Loading…
Cancel
Save