starred/OpenEPaperLink
1
0
Fork 0
mirror of https://github.com/OpenEPaperLink/OpenEPaperLink.git synced 2026-03-21 10:06:07 +01:00
Code Issues 1.0k Packages Projects Releases 10 Wiki Activity

Merge branch 'master' of https://github.com/jjwbruijn/solum-esl-alternative-proto

Browse Source
This commit is contained in:
Jelmer
2023-01-15 13:10:11 +01:00
parent 5ee9cea68b ae8d074052
commit 20a240d904
5 changed files with 19 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
esp32_fw/include/commstructs.h
View File

@@ -12,17 +12,6 @@ struct espXferComplete {
uint8_t src[8];
} __packed;
struct espJoinNetwork {
uint8_t checksum;
uint8_t src[8];
} __packed;
struct espSaveUpdateBlock {
uint8_t checksum;
uint8_t blockId;
uint16_t blockChecksum;
} __packed;
struct blockData {
uint16_t size;
uint16_t checksum;
@@ -40,6 +29,12 @@ struct AvailDataReq {
uint8_t protoVer;
} __packed;
struct espAvailDataReq {
uint8_t checksum;
uint8_t src[8];
struct AvailDataReq adr;
} __packed;
#define DATATYPE_NOUPDATE 0
#define DATATYPE_IMG 1
#define DATATYPE_IMGRAW 2
@@ -56,7 +51,6 @@ struct pendingData {
struct AvailDataInfo availdatainfo;
uint8_t attemptsLeft;
uint8_t targetMac[8];
uint8_t includedThisBurst : 1;
} __packed;

2
esp32_fw/include/newproto.h
View File

@@ -7,4 +7,4 @@ extern void processBlockRequest(struct espBlockRequest* br);
extern bool prepareDataAvail(String* filename, uint8_t dataType, uint8_t* dst);
extern void processJoinNetwork(struct espJoinNetwork* xjn);
extern void processXferComplete(struct espXferComplete* xfc);
extern void processDataReq(struct AvailDataReq* adr);
extern void processDataReq(struct espAvailDataReq* adr);

1
esp32_fw/include/settings.h
View File

@@ -34,6 +34,7 @@
#define RXD1 13 // 1st
#define TXD1 12 // 2nd
#define ZBS_SS 21
#define ZBS_CLK 18
#define ZBS_MoSi 22

15
esp32_fw/src/newproto.cpp
View File

@@ -125,15 +125,6 @@ void processBlockRequest(struct espBlockRequest* br) {
Serial.printf("<BlockId=%d\n", br->blockId);
}
void processJoinNetwork(struct espJoinNetwork* xjn) {
char buffer[64];
uint8_t src[8];
*((uint64_t*)src) = swap64(*((uint64_t*)xjn->src));
sprintf(buffer, "< %02X%02X%02X%02X%02X%02X joined the network\n\0", src[2], src[3], src[4], src[5], src[6], src[7]);
wsString((String)buffer);
Serial.print(buffer);
}
void processXferComplete(struct espXferComplete* xfc) {
char buffer[64];
uint8_t src[8];
@@ -143,12 +134,12 @@ void processXferComplete(struct espXferComplete* xfc) {
Serial.print(buffer);
}
void processDataReq(struct AvailDataReq* adr) {
void processDataReq(struct espAvailDataReq* eadr) {
char buffer[64];
uint8_t src[8];
// *((uint64_t*)src) = swap64(*((uint64_t*)adr->));
// sprintf(buffer, "< %02X%02X%02X%02X%02X%02X reports xfer complete\n\0", src[2], src[3], src[4], src[5], src[6], src[7]);
sprintf(buffer, "<DATA REQ - version=%d, voltage=%d\n", adr->softVer, adr->batteryMv);
sprintf(buffer, "<ADR %02X%02X%02X%02X%02X%02X%02X%02X\n\0", eadr->src[7], eadr->src[6], eadr->src[5], eadr->src[4], eadr->src[3], eadr->src[2], eadr->src[1], eadr->src[0]);
//sprintf(buffer, "<DATA REQ - version=%d, voltage=%d\n", adr->softVer, adr->batteryMv);
wsString((String)buffer);
Serial.print(buffer);
}

149
esp32_fw/src/serial.cpp
View File

@@ -118,30 +118,11 @@ void SerialRXLoop() {
memset(cmdbuffer, 0x00, 4);
restartBlockRequest = 0;
}
if (strncmp(cmdbuffer, "RQQ>", 4) == 0) {
/*
Serial.print("BYTES REQUESTED!\n");
for (uint8_t c = 0; c < 50; c++) {
Serial1.write(0x00);
}
restartBlockRequest++;
if (restartBlockRequest > 10) {
restartBlockRequest = 0;
for (uint8_t c = 0; c < 200; c++) {
Serial1.write(0x00);
Serial1.write(0x00);
Serial1.write(0x00);
Serial1.write(0x00);
}
}
RXState = ZBS_RX_WAIT_HEADER;
*/
}
if (strncmp(cmdbuffer, "ADR>", 4) == 0) {
RXState = ZBS_RX_WAIT_DATA_REQ;
charindex = 0;
pktindex = 0;
packetp = (uint8_t*)calloc(sizeof(struct espBlockRequest) + 8, 1);
packetp = (uint8_t*)calloc(sizeof(struct espAvailDataReq) + 8, 1);
memset(cmdbuffer, 0x00, 4);
}
if (strncmp(cmdbuffer, "BST>", 4) == 0) {
@@ -155,13 +136,6 @@ void SerialRXLoop() {
packetp = (uint8_t*)calloc(sizeof(struct espXferComplete) + 8, 1);
memset(cmdbuffer, 0x00, 4);
}
if (strncmp(cmdbuffer, "TJN>", 4) == 0) {
RXState = ZBS_RX_WAIT_JOINNETWORK;
pktindex = 0;
packetp = (uint8_t*)calloc(sizeof(struct espJoinNetwork) + 8, 1);
memset(cmdbuffer, 0x00, 4);
}
break;
case ZBS_RX_BLOCK_REQUEST:
packetp[pktindex] = lastchar;
@@ -182,21 +156,11 @@ void SerialRXLoop() {
RXState = ZBS_RX_WAIT_HEADER;
}
break;
case ZBS_RX_WAIT_JOINNETWORK:
packetp[pktindex] = lastchar;
pktindex++;
if (pktindex == sizeof(struct espJoinNetwork)) {
struct espJoinNetwork* ejn = (struct espJoinNetwork*)packetp;
processJoinNetwork(ejn);
free(packetp);
RXState = ZBS_RX_WAIT_HEADER;
}
break;
case ZBS_RX_WAIT_DATA_REQ:
packetp[pktindex] = lastchar;
pktindex++;
if (pktindex == sizeof(struct AvailDataReq)) {
struct AvailDataReq* adr = (struct AvailDataReq*)packetp;
if (pktindex == sizeof(struct espAvailDataReq)) {
struct espAvailDataReq* adr = (struct espAvailDataReq*)packetp;
processDataReq(adr);
free(packetp);
RXState = ZBS_RX_WAIT_HEADER;
@@ -227,111 +191,13 @@ void SerialRXLoop() {
}
}
void sendSaveUpdateBlock(struct espSaveUpdateBlock* esub) {
addCRC(esub, sizeof(struct espSaveUpdateBlock));
Serial1.print("SUBL");
for (uint8_t c = 0; c < sizeof(struct espSaveUpdateBlock); c++) {
Serial1.write(((uint8_t*)esub)[c]);
}
Serial1.write(0x00);
Serial1.write(0x00);
Serial1.write(0x00);
Serial1.write(0x00);
}
extern uint8_t* getDataForFile(File* file);
#define STATE_TIMEOUT 0
#define STATE_PASS 1
#define STATE_FAIL 2
void doAPUpdate() {
uint8_t curBlockId = 0;
uint8_t maxBlocks = 16;
uint16_t len = 0;
uint16_t lenRemaining = 65535;
uint8_t state = true;
uint8_t* updateData = nullptr;
// open firmware file
// do AP update block erase
// 1
// TODO: some other source for the updates
File file = LittleFS.open("/main.bin");
lenRemaining = file.size();
updateData = getDataForFile(&file);
// determine how many blocks we're gonna use for this update
maxBlocks = lenRemaining / BLOCK_DATA_SIZE;
if (lenRemaining % BLOCK_DATA_SIZE) maxBlocks++;
uint32_t masterTimeout = millis();
uint32_t timeout = millis();
// begin with the process by erasing the update block on the AP's EEPROM
state = STATE_TIMEOUT;
Serial1.print("ERAS\n");
while (millis() - timeout < 5000UL) {
ShortRXWaitLoop();
// wait for 'erase okay'
if (strncmp(cmdbuffer, "EROK", 4) == 0) {
state = STATE_PASS;
break;
}
}
if (state == STATE_TIMEOUT) {
// Tag didn't respond properly to the 'erase' command, bail out
Serial.print("Failed to erase AP EEPROM data in preparation of FW update, bailing\n");
return;
}
// Begin transmitting AP update block data
state = STATE_TIMEOUT;
while (curBlockId < maxBlocks && (millis() - masterTimeout < 30000UL)) {
Serial.printf("Now doing block %d\n", curBlockId);
len = lenRemaining;
if (len > BLOCK_DATA_SIZE) len = BLOCK_DATA_SIZE;
struct espSaveUpdateBlock esub;
esub.blockId = curBlockId;
// send the block data (to the raw buffer)
esub.blockChecksum = sendBlock(updateData + (curBlockId * BLOCK_DATA_SIZE), len);
// send the update block-struct; This tells the AP which block it is and double-checks the checksum.
sendSaveUpdateBlock(&esub);
uint32_t timeout = millis();
state = STATE_TIMEOUT;
// we told the AP to save the block in a specific spot, now wait for the reply
while (millis() - timeout < 5000UL) {
ShortRXWaitLoop();
if (strncmp(cmdbuffer, "BLOK", 4) == 0) {
// all good, next block please
state = STATE_PASS;
curBlockId++;
lenRemaining -= BLOCK_DATA_SIZE;
break;
}
if (strncmp(cmdbuffer, "BLFL", 4) == 0) {
state = STATE_FAIL;
break;
}
}
}
if (curBlockId == maxBlocks) {
// update complete! (in theory) - Kick the tag to start the update process
Serial1.print("UPDA\n");
Serial1.print("UPDA\n");
Serial1.print("UPDA\n");
}
// parts left?
}
void zbsRxTask(void* parameter) {
Serial1.begin(230400, SERIAL_8N1, RXD1, TXD1);
simplePowerOn();
Serial1.print("VER?");
while (1) {
SerialRXLoop();
@@ -342,10 +208,11 @@ void zbsRxTask(void* parameter) {
if (waitingForVersion) {
if (millis() > 30000) {
waitingForVersion = false;
Serial.printf("We've been waiting for communication from the tag, but got nothing. This is expected if this tag hasn't been flashed yet. We'll try to flash it.\n");
performDeviceFlash();
// Serial.printf("We've been waiting for communication from the tag, but got nothing. This is expected if this tag hasn't been flashed yet. We'll try to flash it.\n");
// doAPUpdate();
// performDeviceFlash();
// SDAtest();
//performDeviceFlash();
// SDAtest();
}
}
}