* Migrate esp32 families to pioarduino platform * ESP32c6 align text.handler_execute same as C3 * Use pioarduino `develop` The latest fixes and the latest bugs! * preliminary esp32p4.ini * pioarduino: Update LovyanGFX Includes Manuel's recent commit * pioarduino 3.3.6 * pioarduino 3.3.6 *release* chasing the release * pioarduino: Fix OG ESP32 duplicate libs * pioarduino: T-Beam 1W CDC mode * pioarduino: disable network provisioning (wifiprov) * pioarduino: use legacy esptoolpy naming (forward-compatible) * Update lovyangfx from `develop` commit to 1.2.19 * fix esp32p4.ini * check for esp32 w/ wifi * esp32-p4 specific adaptations * Switch to meshtastic/esp32_https_server fork (idf5 branch) * don't ignore esp_lcd * config for MUI * fix/workaround SDMMC * revert a6f6175, update to 3.3.8 * enable esp_hosted for esp32-p4 (experimental) * Pioarduino 55.03.38-1 * NimBLE-Arduino -> Arduino "BLE" (3.3.x) migration (#10164) * NimBLE-Arduino -> Arduino "BLE" (3.3.x) migration * More NimBLE * Fix Device Name in ATT Read Request (0x2A00). Device Name is exposed in two places: - Advertisement data: this is set properly in startAdvertising. - GATT attribute Device Name (0x2A00). This one is handled internally in NimBLE and comes from ble_svc_gap_device_name_set. This is set initially, but then BLEDevice::createServer calls ble_svc_gap_init which resets the device name. This causes the device to apparently "change name after pairing": < ACL Data TX:... flags 0x00 dlen 7 #113 [hci0] 14.241149 ATT: Read Request (0x0a) len 2 Handle: 0x0003 Type: Device Name (0x2a00) > ACL Data RX: Handle 2048 flags 0x02 dlen 11 #115 [hci0] 14.269050 ATT: Read Response (0x0b) len 6 Value[6]: 6e696d626c65 # "nimble" Workaround this by setting the device name once again after BLEDevice::createServer. * Temporarily lower CORE_DEBUG_LEVEL to INFO to avoid triggering an apparent ESP-IDF Bluetooth bug when re-connecting to Pixel 8 Android devices. Initial pairing works, but after ESP32 is rebooted, phone fails to reconnect. Meshtastic app shows it as disconnecting immediately. LightBlue shows a more detailed error "Peripheral Connection - Warning: onConnectionStatusChange: status 61" (0x3D - MIC Failure). Bug report to Espresssif: https://github.com/espressif/esp-idf/issues/18126#issuecomment-4286197744 * Temporarily disable ble_gap_set_data_len, causes crash with Pixel 8 Android reconnect. Crash looks like this: [ 11966][E][BLEAdvertising.cpp:341] setScanResponseData(): ble_gap_adv_rsp_set_data: 22 [ 11975][E][BLEAdvertising.cpp:1554] start(): Host reset, wait for sync. ERROR | ??:??:?? 11 BLE failed to start advertising Guru Meditation Error: Core 0 panic'ed (LoadProhibited). Exception was unhandled. Core 0 register dump: PC : 0x420e6190 PS : 0x00060730 A0 : 0x820e158b A1 : 0x3fce50c0 A2 : 0x00000000 A3 : 0x3fcb8600 A4 : 0x3fcb85cc A5 : 0x00000000 A6 : 0x00000000 A7 : 0x00000c03 A8 : 0x00000000 A9 : 0x3fce50b0 A10 : 0x0000000e A11 : 0x00000000 A12 : 0x00000010 A13 : 0x3fce50e0 A14 : 0x00000c03 A15 : 0x00000001 SAR : 0x0000001e EXCCAUSE: 0x0000001c EXCVADDR: 0x00000000 LBEG : 0x400570e8 LEND : 0x400570f3 LCOUNT : 0x00000000 Backtrace: 0x420e618d:0x3fce50c0 0x420e1588:0x3fce5110 0x420dfe87:0x3fce5200 0x420dfefb:0x3fce5220 0x420dff3f:0x3fce5240 0x4219602b:0x3fce5260 0x4037b0e5:0x3fce5280 0x4201edf3:0x3fce52a0 Connection seems fast enough even without this. We'll investigate the reason for the crash and re-enable once it's safe. --------- Co-authored-by: Catalin Patulea <cronos586@gmail.com> * Add extension from pioarduino nag "Jason2866.esp-decoder" * Cleanup after merge * ESP32: Disable classic bluetooth * Cleanup: Fix ADC channels on new variants * InkHUD: Fix type casting for message size in saveToFlash method inkhud compiles again! * update p4 esp_hosted for BT * I thought I fixed this * fix linker error using response file (p4 only) * fix infinite loop * Fix Power.cpp check warning Local variable 'config' shadows outer variable [shadowVariable] * Build ESP32 original with NimBLE ('custom_sdkconfig' approach). (#10235) * Re-enable littlefs json manifest This works locally again :) Not sure what changed * Re-add tool-mklittlefs * sensecap indicator fixes after upgrade arduino-esp & lovyanGFX libs * hackaday fix * robot tbeam cache error fix Co-authored-by: Copilot <copilot@github.com> * trunk fmt * ignore trunk * BLEDevice::deinit() added Co-authored-by: Copilot <copilot@github.com> * platformio-custom: Modify mtjson target dependency to prevent fake-success. (#10291) Co-authored-by: Copilot <copilot@github.com> * Fix ESP32-C6 linker errors. Align .text.handler_execute section to 4 bytes and update watchdog timer core mask configuration Co-authored-by: Copilot <copilot@github.com> * tlora-c6: Disable Screen MESHTASTIC_EXCLUDE_SCREEN=1 on tlora-c6. It doesn't have a screen, and this gets it compiling again (saving flash). * Use mverch's iram_memset hack for all OG-ESP32 * Refactor watchdog timer initialization and handling * use adc_channel_t in variant.h * Fix variant headers * More idiomatic default ethernet that doesn't break the build * Elecrows: Delete problematic variant.cpp Not needed after USE_ETHERNET_DEFAULT --------- Co-authored-by: mverch67 <manuel.verch@gmx.de> Co-authored-by: Manuel <71137295+mverch67@users.noreply.github.com> Co-authored-by: Catalin Patulea <cronos586@gmail.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com> Co-authored-by: Copilot <copilot@github.com> Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
156 lines
5.2 KiB
C++
156 lines
5.2 KiB
C++
#ifdef MESHTASTIC_INCLUDE_INKHUD
|
|
|
|
#include "./MessageStore.h"
|
|
|
|
#include "SafeFile.h"
|
|
|
|
using namespace NicheGraphics;
|
|
|
|
// Hard limits on how much message data to write to flash
|
|
// Avoid filling the storage if something goes wrong
|
|
// Normal usage should be well below this size
|
|
constexpr uint8_t MAX_MESSAGES_SAVED = 10;
|
|
constexpr uint32_t MAX_MESSAGE_SIZE = 250;
|
|
|
|
InkHUD::MessageStore::MessageStore(const std::string &label)
|
|
{
|
|
filename = "";
|
|
filename += "/NicheGraphics";
|
|
filename += "/";
|
|
filename += label;
|
|
filename += ".msgs";
|
|
}
|
|
|
|
// Write the contents of the MessageStore::messages object to flash
|
|
// Takes the firmware's SPI lock during FS operations. Implemented for consistency, but only relevant when using SD card.
|
|
// Need to lock and unlock around specific FS methods, as the SafeFile class takes the lock for itself internally
|
|
void InkHUD::MessageStore::saveToFlash()
|
|
{
|
|
assert(!filename.empty());
|
|
|
|
#ifdef FSCom
|
|
// Make the directory, if doesn't already exist
|
|
// This is the same directory accessed by NicheGraphics::FlashData
|
|
spiLock->lock();
|
|
FSCom.mkdir("/NicheGraphics");
|
|
spiLock->unlock();
|
|
|
|
// Open or create the file
|
|
// No "full atomic": don't save then rename
|
|
auto f = SafeFile(filename.c_str(), false);
|
|
|
|
LOG_INFO("Saving messages in %s", filename.c_str());
|
|
|
|
// Take firmware's SPI Lock while writing
|
|
spiLock->lock();
|
|
|
|
// 1st byte: how many messages will be written to store
|
|
f.write(messages.size());
|
|
|
|
// For each message
|
|
for (uint8_t i = 0; i < messages.size() && i < MAX_MESSAGES_SAVED; i++) {
|
|
Message &m = messages.at(i);
|
|
f.write(reinterpret_cast<const uint8_t *>(&m.timestamp), sizeof(m.timestamp)); // Write timestamp. 4 bytes
|
|
f.write(reinterpret_cast<const uint8_t *>(&m.sender), sizeof(m.sender)); // Write sender NodeId. 4 Bytes
|
|
f.write(reinterpret_cast<const uint8_t *>(&m.channelIndex), sizeof(m.channelIndex)); // Write channel index. 1 Byte
|
|
f.write(reinterpret_cast<const uint8_t *>(m.text.c_str()),
|
|
min((size_t)MAX_MESSAGE_SIZE, m.text.size())); // Write message text
|
|
f.write('\0'); // Append null term
|
|
LOG_DEBUG("Wrote message %u, length %u, text \"%s\"", static_cast<uint32_t>(i),
|
|
min((size_t)MAX_MESSAGE_SIZE, m.text.size()), m.text.c_str());
|
|
}
|
|
|
|
// Release firmware's SPI lock, because SafeFile::close needs it
|
|
spiLock->unlock();
|
|
|
|
bool writeSucceeded = f.close();
|
|
|
|
if (!writeSucceeded) {
|
|
LOG_ERROR("Can't write data!");
|
|
}
|
|
#else
|
|
LOG_ERROR("ERROR: Filesystem not implemented\n");
|
|
#endif
|
|
}
|
|
|
|
// Attempt to load the previous contents of the MessageStore:message deque from flash.
|
|
// Filename is controlled by the "label" parameter
|
|
// Takes the firmware's SPI lock during FS operations. Implemented for consistency, but only relevant when using SD card.
|
|
void InkHUD::MessageStore::loadFromFlash()
|
|
{
|
|
// Hopefully redundant. Initial intention is to only load / save once per boot.
|
|
messages.clear();
|
|
|
|
#ifdef FSCom
|
|
|
|
// Take the firmware's SPI Lock, in case filesystem is on SD card
|
|
concurrency::LockGuard guard(spiLock);
|
|
|
|
// Check that the file *does* actually exist
|
|
if (!FSCom.exists(filename.c_str())) {
|
|
LOG_WARN("'%s' not found. Using default values", filename.c_str());
|
|
return;
|
|
}
|
|
|
|
// Check that the file *does* actually exist
|
|
if (!FSCom.exists(filename.c_str())) {
|
|
LOG_INFO("'%s' not found.", filename.c_str());
|
|
return;
|
|
}
|
|
|
|
// Open the file
|
|
auto f = FSCom.open(filename.c_str(), FILE_O_READ);
|
|
|
|
if (f.size() == 0) {
|
|
LOG_INFO("%s is empty", filename.c_str());
|
|
f.close();
|
|
return;
|
|
}
|
|
|
|
// If opened, start reading
|
|
if (f) {
|
|
LOG_INFO("Loading threaded messages '%s'", filename.c_str());
|
|
|
|
// First byte: how many messages are in the flash store
|
|
uint8_t flashMessageCount = 0;
|
|
f.readBytes(reinterpret_cast<char *>(&flashMessageCount), 1);
|
|
LOG_DEBUG("Messages available: %u", static_cast<uint32_t>(flashMessageCount));
|
|
|
|
// For each message
|
|
for (uint8_t i = 0; i < flashMessageCount && i < MAX_MESSAGES_SAVED; i++) {
|
|
Message m;
|
|
|
|
// Read meta data (fixed width)
|
|
f.readBytes(reinterpret_cast<char *>(&m.timestamp), sizeof(m.timestamp));
|
|
f.readBytes(reinterpret_cast<char *>(&m.sender), sizeof(m.sender));
|
|
f.readBytes(reinterpret_cast<char *>(&m.channelIndex), sizeof(m.channelIndex));
|
|
|
|
// Read characters until we find a null term
|
|
char c;
|
|
while (m.text.size() < MAX_MESSAGE_SIZE) {
|
|
f.readBytes(&c, 1);
|
|
if (c != '\0')
|
|
m.text += c;
|
|
else
|
|
break;
|
|
}
|
|
|
|
// Store in RAM
|
|
messages.push_back(m);
|
|
|
|
LOG_DEBUG("#%u, timestamp=%u, sender(num)=%u, text=\"%s\"", static_cast<uint32_t>(i), m.timestamp, m.sender,
|
|
m.text.c_str());
|
|
}
|
|
|
|
f.close();
|
|
} else {
|
|
LOG_ERROR("Could not open / read %s", filename.c_str());
|
|
}
|
|
#else
|
|
LOG_ERROR("Filesystem not implemented");
|
|
state = LoadFileState::NO_FILESYSTEM;
|
|
#endif
|
|
return;
|
|
}
|
|
|
|
#endif |