diff --git a/libraries/EEPROM/EEPROM.cpp b/libraries/EEPROM/EEPROM.cpp index 62e15af174d..bc83dbcbd20 100644 --- a/libraries/EEPROM/EEPROM.cpp +++ b/libraries/EEPROM/EEPROM.cpp @@ -29,14 +29,14 @@ #include -static const char* TAG = "eeprom"; - EEPROMClass::EEPROMClass(uint32_t sector) : _sector(sector) , _data(0) , _size(0) , _dirty(false) + , _mypart(NULL) , _name("eeprom") + , _user_defined_size(0) { } @@ -45,6 +45,7 @@ EEPROMClass::EEPROMClass(const char* name, uint32_t user_defined_size) , _data(0) , _size(0) , _dirty(false) + , _mypart(NULL) , _name(name) , _user_defined_size(user_defined_size) { @@ -55,7 +56,9 @@ EEPROMClass::EEPROMClass(void) , _data(0) , _size(0) , _dirty(false) + , _mypart(NULL) , _name("eeprom") + , _user_defined_size(0) { } @@ -178,85 +181,85 @@ uint16_t EEPROMClass::length () */ uint8_t EEPROMClass::readByte (int address) { - uint8_t value; + uint8_t value = 0; return EEPROMClass::readAll (address, value); } int8_t EEPROMClass::readChar (int address) { - int8_t value; + int8_t value = 0; return EEPROMClass::readAll (address, value); } uint8_t EEPROMClass::readUChar (int address) { - uint8_t value; + uint8_t value = 0; return EEPROMClass::readAll (address, value); } int16_t EEPROMClass::readShort (int address) { - int16_t value; + int16_t value = 0; return EEPROMClass::readAll (address, value); } uint16_t EEPROMClass::readUShort (int address) { - uint16_t value; + uint16_t value = 0; return EEPROMClass::readAll (address, value); } int32_t EEPROMClass::readInt (int address) { - int32_t value; + int32_t value = 0; return EEPROMClass::readAll (address, value); } uint32_t EEPROMClass::readUInt (int address) { - uint32_t value; + uint32_t value = 0; return EEPROMClass::readAll (address, value); } int32_t EEPROMClass::readLong (int address) { - int32_t value; + int32_t value = 0; return EEPROMClass::readAll (address, value); } uint32_t EEPROMClass::readULong (int address) { - uint32_t value; + uint32_t value = 0; return EEPROMClass::readAll (address, value); } int64_t EEPROMClass::readLong64 (int address) { - int64_t value; + int64_t value = 0; return EEPROMClass::readAll (address, value); } uint64_t EEPROMClass::readULong64 (int address) { - uint64_t value; + uint64_t value = 0; return EEPROMClass::readAll (address, value); } float_t EEPROMClass::readFloat (int address) { - float_t value; + float_t value = 0; return EEPROMClass::readAll (address, value); } double_t EEPROMClass::readDouble (int address) { - double_t value; + double_t value = 0; return EEPROMClass::readAll (address, value); } bool EEPROMClass::readBool (int address) { - int8_t value; + int8_t value = 0; return EEPROMClass::readAll (address, value) ? 1 : 0; } diff --git a/libraries/SD_MMC/src/SD_MMC.cpp b/libraries/SD_MMC/src/SD_MMC.cpp index 104769693ad..2f36eee7e42 100644 --- a/libraries/SD_MMC/src/SD_MMC.cpp +++ b/libraries/SD_MMC/src/SD_MMC.cpp @@ -42,7 +42,21 @@ bool SDMMCFS::begin(const char * mountpoint, bool mode1bit) } //mount sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT(); - sdmmc_host_t host = SDMMC_HOST_DEFAULT(); + sdmmc_host_t host = { + .flags = SDMMC_HOST_FLAG_4BIT, + .slot = SDMMC_HOST_SLOT_1, + .max_freq_khz = SDMMC_FREQ_DEFAULT, + .io_voltage = 3.3f, + .init = &sdmmc_host_init, + .set_bus_width = &sdmmc_host_set_bus_width, + .get_bus_width = &sdmmc_host_get_slot_width, + .set_card_clk = &sdmmc_host_set_card_clk, + .do_transaction = &sdmmc_host_do_transaction, + .deinit = &sdmmc_host_deinit, + .io_int_enable = sdmmc_host_io_int_enable, + .io_int_wait = sdmmc_host_io_int_wait, + .command_timeout_ms = 0, + }; host.max_freq_khz = SDMMC_FREQ_HIGHSPEED; #ifdef BOARD_HAS_1BIT_SDMMC mode1bit = true; @@ -53,7 +67,8 @@ bool SDMMCFS::begin(const char * mountpoint, bool mode1bit) esp_vfs_fat_sdmmc_mount_config_t mount_config = { .format_if_mount_failed = false, - .max_files = 5 + .max_files = 5, + .allocation_unit_size = 0 }; esp_err_t ret = esp_vfs_fat_sdmmc_mount(mountpoint, &host, &slot_config, &mount_config, &_card);