Skip to content

Commit

Permalink
eMMC backup/restore
Browse files Browse the repository at this point in the history
  • Loading branch information
@marchingband
marchingband committed Jul 15, 2021
1 parent a05bfc3 commit 1b9686f
Show file tree
Hide file tree
Showing 4 changed files with 156 additions and 31 deletions.
66 changes: 63 additions & 3 deletions src/file_system.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@
#define FILE_STORAGE_START_BLOCK (RACK_DIRECTORY_START_BLOCK + RACK_DIRECTORY_BLOCKS)
#define FILE_STORAGE_END_BLOCK (RECOVERY_FIRMWARE_START_BLOCK - 1)


// char waver_tag[METADATA_TAG_LENGTH] = "wvr_magic_10";
char waver_tag[METADATA_TAG_LENGTH] = "wvr_magic_12";
// july 10 / 2021
char waver_tag[METADATA_TAG_LENGTH] = "wvr_magic_13";
static const char* TAG = "file_system";

// declare prototypes from emmc.c
Expand Down Expand Up @@ -1010,6 +1009,17 @@ void close_recovery_firmware_to_emmc(size_t recovery_firmware_size){
write_metadata(metadata);
}

void restore_emmc(uint8_t* source, size_t size)
{
size_t block = 0;
write_wav_to_emmc((char *)source, block, size);
}

void close_restore_emmc()
{
close_wav_to_emmc();
}

struct website_t *get_website_slot(char index){
return(&website_lut[index]);
}
Expand Down Expand Up @@ -1183,6 +1193,56 @@ void updateMetadata(cJSON *config){
cJSON_Delete(json);
}

size_t getNumSectorsInEmmc(void)
{
size_t last_block_start = 0;
size_t last_file_size = 0;
// TODO add rack LUT
for(int i=0;i<NUM_VOICES;i++)
{
for(int j=0;j<NUM_NOTES;j++)
{
struct wav_lu_t file = wav_lut[i][j];
size_t start = file.start_block;
if(start > last_block_start)
{
last_block_start = start;
last_file_size = file.length;
// log_i("start: %d, length: %d", last_block_start, last_file_size);
}
}
}
for(int i=0;i<NUM_RACK_DIRECTORY_ENTRIES;i++)
{
struct rack_lu_t rack = rack_lut[i];
if(rack.free == 1)
{
continue;
}
for(int j=0;j<rack.num_layers;j++)
{
struct wav_lu_t layer = rack.layers[j];
size_t start = layer.start_block;
if(start > last_block_start)
{
last_block_start = start;
last_file_size = layer.length;
}
}
}
size_t last_file_num_blocks = ( last_file_size / SECTOR_SIZE ) + 1;
size_t total = last_block_start + last_file_num_blocks;
log_i("eMMC total num sectors: %d", total);
return total;
}

void getSector(size_t i, uint8_t *buf)
{
// uint8_t *sector = (uint8_t*)ps_malloc(SECTOR_SIZE);
emmc_read(buf, i, 1);
// return sector;
}

/**
* file system starts empty.
* when browser starts up, it receives JSON of the file system.
Expand Down
4 changes: 4 additions & 0 deletions src/file_system.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,10 @@ void current_bank_up(void);
void current_bank_down(void);
struct metadata_t *get_metadata(void);
void log_pin_config(void);
size_t getNumSectorsInEmmc(void);
void getSector(size_t i, uint8_t *buf);
void restore_emmc(uint8_t* source, size_t size);
void close_restore_emmc();

#ifdef __cplusplus
}
Expand Down
115 changes: 88 additions & 27 deletions src/server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,14 @@ int loop_num = 0;

void handleUpdate(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
if(!index){
wav_player_pause();
//wav_player_pause();
loop_num = 0;
Update.begin(total);
Serial.println("starting update");
}
feedLoopWDT();
size_t written = Update.write(data,len);
feedLoopWDT();
if(written != len){
Serial.println("write failed");
request->send(500);
Expand Down Expand Up @@ -143,7 +144,7 @@ void handleUpdate(AsyncWebServerRequest *request, uint8_t *data, size_t len, siz
Serial.println("failed");
}
request->send(204);
wav_player_resume();
//wav_player_resume();
}
}

Expand All @@ -152,7 +153,7 @@ uint8_t *voice_config_json = NULL;
void handleUpdateVoiceConfig(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
if(index==0){
//start
wav_player_pause();
//wav_player_pause();
voice_config_json = (uint8_t*)ps_malloc(total + 1);
if(!voice_config_json){
wlog_i("failed to malloc for json");
Expand All @@ -169,7 +170,7 @@ void handleUpdateVoiceConfig(AsyncWebServerRequest *request, uint8_t *data, size
updateVoiceConfig((char *)voice_config_json);
free(voice_config_json);
request->send(200, "text/plain", "all done voice config update");
wav_player_resume();
//wav_player_resume();
}
}

Expand All @@ -178,7 +179,7 @@ uint8_t *pin_config_json = NULL;
void handleUpdatePinConfig(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
if(index==0){
//start
wav_player_pause();
//wav_player_pause();
pin_config_json = (uint8_t*)ps_malloc(total);
if(!pin_config_json){
wlog_i("failed to malloc for json");
Expand All @@ -194,7 +195,7 @@ void handleUpdatePinConfig(AsyncWebServerRequest *request, uint8_t *data, size_t
updatePinConfig((char *)pin_config_json);
free(pin_config_json);
request->send(200, "text/plain", "all done pin config update");
wav_player_resume();
//wav_player_resume();
}
}

Expand All @@ -203,7 +204,7 @@ uint8_t *metadata_json = NULL;
void handleUpdateMetadata(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
if(index==0){
//start
wav_player_pause();
//wav_player_pause();
metadata_json = (uint8_t*)ps_malloc(total);
if(!metadata_json){
wlog_i("failed to malloc for metadata json");
Expand All @@ -219,7 +220,7 @@ void handleUpdateMetadata(AsyncWebServerRequest *request, uint8_t *data, size_t
updateMetadata((char *)metadata_json);
free(metadata_json);
request->send(200, "text/plain", "all done pin config update");
wav_player_resume();
//wav_player_resume();
}
}

Expand All @@ -233,7 +234,7 @@ size_t w_start_block;
void handleWav(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
if(index==0){
//start
wav_player_pause();
//wav_player_pause();
AsyncWebHeader* size_string = request->getHeader("size");
sscanf(size_string->value().c_str(), "%d", &w_size);
AsyncWebHeader* name = request->getHeader("name");
Expand All @@ -253,7 +254,7 @@ void handleWav(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t
close_wav_to_emmc();
add_wav_to_file_system(&w_name[0],w_voice,w_note,w_start_block,total);
request->send(200, "text/plain", "done upload wav");
wav_player_resume();
//wav_player_resume();
}
}

Expand All @@ -267,7 +268,7 @@ size_t r_start_block;
void handleRack(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
if(index==0){
//start
wav_player_pause();
//wav_player_pause();
strcpy(&r_name[0], request->getHeader("name")->value().c_str());
sscanf(request->getHeader("voice")->value().c_str(), "%d", &r_voice);
sscanf(request->getHeader("note")->value().c_str(), "%d", &r_note);
Expand All @@ -285,7 +286,7 @@ void handleRack(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_
close_wav_to_emmc();
add_rack_to_file_system(&r_name[0],r_voice,r_note,r_start_block,total,r_layer,r_rack_json);
free(r_rack_json);
wav_player_resume();
//wav_player_resume();
}
}

Expand All @@ -300,7 +301,7 @@ char f_firmware_name[24];
void handleNewFirmware(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
//once
if(index==0){
wav_player_pause();
//wav_player_pause();
AsyncWebHeader* firmware_slot_string = request->getHeader("slot-index");
sscanf(firmware_slot_string->value().c_str(), "%d", &f_firmware_slot);
AsyncWebHeader* firmware_size_string = request->getHeader("firmware-size");
Expand Down Expand Up @@ -332,7 +333,7 @@ void handleNewFirmware(AsyncWebServerRequest *request, uint8_t *data, size_t len
log_i("wrote %u bytes",f_bytes_read);
f_bytes_read = 0;
request->send(200, "text/plain", "all done firmware");
wav_player_resume();
//wav_player_resume();
}
}

Expand All @@ -347,7 +348,7 @@ size_t rf_firmware_size;
void handleNewRecoveryFirmware(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
//once
if(index==0){
wav_player_pause();
//wav_player_pause();
AsyncWebHeader* firmware_size_string = request->getHeader("firmware-size");
sscanf(firmware_size_string->value().c_str(), "%d", &rf_firmware_size);
}
Expand All @@ -370,7 +371,7 @@ void handleNewRecoveryFirmware(AsyncWebServerRequest *request, uint8_t *data, si
log_i("wrote %u bytes",rf_bytes_read);
rf_bytes_read = 0;
request->send(200, "text/plain", "all done recovery firmware");
wav_player_resume();
//wav_player_resume();
}
}

Expand Down Expand Up @@ -415,7 +416,7 @@ void handleNewGUI(AsyncWebServerRequest *request, uint8_t *data, size_t len, siz
}

void handleFsjson(AsyncWebServerRequest *request){
// wav_player_pause();
// //wav_player_pause();
char *json = print_fs_json();
size_t size = strlen(json);
// wlog_e("fs size is %d",size);
Expand All @@ -430,15 +431,61 @@ void handleFsjson(AsyncWebServerRequest *request){
});
response->addHeader("size",String(size));
request->send(response);
// wav_player_resume();
// request->send("text/html", size, [size,json](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
// size_t toWrite = min(size - index, maxLen);
// memcpy(buffer, json + index, toWrite);
// if(index + toWrite == size){
// free(json);
// }
// return toWrite;
// });
}

void handleBackupEMMC(AsyncWebServerRequest *request){
uint8_t *buf = (uint8_t*)ps_malloc(SECTOR_SIZE);
size_t numSectors = getNumSectorsInEmmc();
size_t numBytes = numSectors * SECTOR_SIZE;
size_t i = 0;
size_t written = SECTOR_SIZE;
AsyncWebServerResponse *response = request->beginResponse("text/html", numBytes, [i,written,numSectors,buf,numBytes](uint8_t *buffer, size_t maxLen, size_t index) mutable -> size_t {
feedLoopWDT();
size_t toWrite;
if(written < SECTOR_SIZE) // there is some leftover
{
size_t remains = SECTOR_SIZE - written;
toWrite = min(remains, maxLen);
memcpy(buffer, buf + written, toWrite);
written += toWrite;
feedLoopWDT();
log_v("did partial sector of %d bytes, %d left", toWrite, SECTOR_SIZE - written);
feedLoopWDT();
}
else // there is no leftover
{
toWrite = min((size_t)SECTOR_SIZE, maxLen);
getSector(i++, buf);
memcpy(buffer, buf, toWrite);
written = toWrite;
if(written != SECTOR_SIZE)
{
feedLoopWDT();
log_v("read a full sector, wrote %d", written);
feedLoopWDT();
}
}
feedLoopWDT();
if(index + toWrite == numBytes){ // done
free(buf);
feedLoopWDT();
}
return toWrite;
});
response->addHeader("size",String(numBytes));
request->send(response);
}

void handleRestoreEMMC(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
feedLoopWDT();
restore_emmc(data, len);
feedLoopWDT();
if(index + len == total){
//done
feedLoopWDT();
close_restore_emmc();
request->send(200, "text/plain", "done upload wav");
}
}

void handleEmmcGUI(AsyncWebServerRequest *request){
Expand Down Expand Up @@ -471,7 +518,7 @@ void handleRPC(AsyncWebServerRequest *request){
}

void handleBootFromEmmc(AsyncWebServerRequest *request){
wav_player_pause();
//wav_player_pause();
char index = 0;
AsyncWebHeader* firmware_slot_string = request->getHeader("index");
sscanf(firmware_slot_string->value().c_str(), "%d", &index);
Expand Down Expand Up @@ -542,6 +589,20 @@ void server_begin() {
handleFsjson
);

server.on(
"/backupEMMC",
HTTP_GET,
handleBackupEMMC
);

server.on(
"/restoreEMMC",
HTTP_POST,
[](AsyncWebServerRequest * request){request->send(204);},
NULL,
handleRestoreEMMC
);

server.on(
"/update",
HTTP_POST,
Expand Down
2 changes: 1 addition & 1 deletion src/wvr_ui.h
View file

Large diffs are not rendered by default.

0 comments on commit 1b9686f

Please sign in to comment.