folkert/KEK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ESP32 fixes

Browse source
This commit is contained in:
folkert van heusden 2024-05-14 21:19:33 +02:00
parent 0f4d574c4f
commit 3c4fb7c49c
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
5 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ESP32/disk_backend_esp32.cpp
View file

@ -24,6 +24,27 @@ disk_backend_esp32::~disk_backend_esp32()
delete fh; delete fh;
} }
JsonVariant disk_backend_esp32::serialize() const
{
JsonVariant j;
j["disk-backend-type"] = "esp32";
j["overlay"] = serialize_overlay();
// TODO store checksum of backend
j["filename"] = filename;
return j;
}
disk_backend_esp32 *disk_backend_esp32::deserialize(const JsonVariantConst j)
{
// TODO verify checksum of backend
return new disk_backend_esp32(j["file"].as<std::string>());
}
void disk_backend_esp32::emit_error() void disk_backend_esp32::emit_error()
{ {
DOLOG(ll_error, true, "SdFat error: %d/%d", sd.sdErrorCode(), sd.sdErrorData()); DOLOG(ll_error, true, "SdFat error: %d/%d", sd.sdErrorCode(), sd.sdErrorData());

3
ESP32/disk_backend_esp32.h
View file

@ -23,6 +23,9 @@ public:
disk_backend_esp32(const std::string & filename); disk_backend_esp32(const std::string & filename);
virtual ~disk_backend_esp32(); virtual ~disk_backend_esp32();
JsonVariant serialize() const override;
static disk_backend_esp32 *deserialize(const JsonVariantConst j);
std::string get_identifier() const { return filename; } std::string get_identifier() const { return filename; }
bool begin(const bool dummy) override; bool begin(const bool dummy) override;

4
bus.cpp
View file

@ -45,9 +45,9 @@ bus::~bus()
delete dc11_; delete dc11_;
} }
JsonDocument bus::serialize() const JsonVariant bus::serialize() const
{ {
JsonDocument j_out; JsonVariant j_out;
if (m) if (m)
j_out["memory"] = m->serialize(); j_out["memory"] = m->serialize();

4
bus.h
View file

@ -80,10 +80,8 @@ public:
bus(); bus();
~bus(); ~bus();
#if IS_POSIX JsonVariant serialize() const;
JsonDocument serialize() const;
static bus *deserialize(const JsonDocument j, console *const cnsl, std::atomic_uint32_t *const event); static bus *deserialize(const JsonDocument j, console *const cnsl, std::atomic_uint32_t *const event);
#endif
void reset() override; void reset() override;
void init(); // invoked by 'RESET' command void init(); // invoked by 'RESET' command

18
disk_backend.cpp
View file

@ -5,10 +5,13 @@
#include "disk_backend.h" #include "disk_backend.h"
#include "gen.h" #include "gen.h"
#include "utils.h"
#if IS_POSIX #if IS_POSIX
#include "disk_backend_file.h" #include "disk_backend_file.h"
#include "disk_backend_nbd.h" #else
#include "disk_backend_esp32.h"
#endif #endif
#include "disk_backend_nbd.h"
disk_backend::disk_backend() disk_backend::disk_backend()
@ -96,12 +99,17 @@ disk_backend *disk_backend::deserialize(const JsonVariantConst j)
disk_backend *d = nullptr; disk_backend *d = nullptr;
if (type == "file") if (type == "nbd")
d = disk_backend_file::deserialize(j);
else if (type == "nbd")
d = disk_backend_nbd::deserialize(j); d = disk_backend_nbd::deserialize(j);
#if IS_POSIX
else if (type == "file")
d = disk_backend_file::deserialize(j);
#else
else if (type == "esp32")
d = disk_backend_esp32::deserialize(j);
#endif
// should not be triggered // should not be triggered
assert(d); assert(d);