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

AP: Added Block-request source in esp message struct

Browse Source
This commit is contained in:
jjwbruijn
2023-04-23 22:17:17 +02:00
parent 9a824b87ef
commit 9d29ffff68
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
binaries/AP_FW_1.54.bin
View File

Binary file not shown.

BIN
binaries/AP_FW_Nodisplay.bin
View File

Binary file not shown.

BIN
binaries/AP_FW_Segmented_UK.bin
View File

Binary file not shown.

8
zbs243_AP_FW/main.c
View File

@@ -33,6 +33,7 @@ struct espBlockRequest {
uint8_t checksum;
uint64_t ver;
uint8_t blockId;
uint8_t src[8];
} __packed;
struct espXferComplete {
@@ -47,7 +48,7 @@ struct espAvailDataReq {
} __packed;
// #define TIMER_TICKS_PER_MS 1333UL
uint16_t __xdata version = 0x0011;
uint16_t __xdata version = 0x0012;
#define RAW_PKT_PADDING 2
@@ -321,7 +322,7 @@ void processSerial(uint8_t lastchar) {
}
// sending data to the ESP
void espBlockRequest(const struct blockRequest *br) {
void espBlockRequest(const struct blockRequest *br, uint8_t* src) {
struct espBlockRequest *__xdata ebr = (struct espBlockRequest *)blockbuffer;
uartTx('R');
uartTx('Q');
@@ -329,6 +330,7 @@ void espBlockRequest(const struct blockRequest *br) {
uartTx('>');
// u64_copy(ebr->ver, br->ver);
xMemCopy8(&(ebr->ver), &(br->ver));
xMemCopy8(&(ebr->src), src);
ebr->blockId = br->blockId;
addCRC(ebr, sizeof(struct espBlockRequest));
for (uint8_t c = 0; c < sizeof(struct espBlockRequest); c++) {
@@ -467,7 +469,7 @@ void processBlockRequest(const uint8_t *buffer, uint8_t forceBlockDownload) {
if (requestDataDownload) {
serialBypassActive = false;
espBlockRequest(&requestedData);
espBlockRequest(&requestedData, rxHeader->src);
nextBlockAttempt = timerGet();
}