Merge branch 'master' of github.com:jjwbruijn/OpenEPaperLink

This commit is contained in:
jjwbruijn
2023-04-23 22:24:35 +02:00
3 changed files with 7 additions and 2 deletions

View File

@@ -5,6 +5,7 @@ struct espBlockRequest {
uint8_t checksum;
uint64_t ver;
uint8_t blockId;
uint8_t src[8];
} __packed;
struct espXferComplete {

View File

@@ -216,7 +216,8 @@ void processBlockRequest(struct espBlockRequest* br) {
char buffer[150];
sprintf(buffer, "< Block Request received for file %s block %d, len %d checksum %u\0", pd->filename.c_str(), br->blockId, len, checksum);
wsLog((String)buffer);
Serial.printf("< Block Request received for MD5 %llu, file %s block %d, len %d checksum %u\n", br->ver, pd->filename.c_str(), br->blockId, len, checksum);
Serial.printf("< Block Request received for MD5 %llu, file %s block %d, len %d checksum %u", br->ver, pd->filename.c_str(), br->blockId, len, checksum);
Serial.printf(" from mac %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n", br->src[7],br->src[6],br->src[5],br->src[4],br->src[3],br->src[2],br->src[1],br->src[0]);
}
void processXferComplete(struct espXferComplete* xfc) {

View File

@@ -335,6 +335,7 @@ void zbsRxTask(void* parameter) {
AP_SERIAL_PORT.begin(115200, SERIAL_8N1, FLASHER_AP_RXD, FLASHER_AP_TXD);
pinMode(FLASHER_AP_RESET, OUTPUT);
digitalWrite(FLASHER_AP_RESET, LOW);
vTaskDelay(10 / portTICK_PERIOD_MS);
@@ -343,7 +344,9 @@ void zbsRxTask(void* parameter) {
rampTagPower(FLASHER_AP_POWER, true);
vTaskDelay(10 / portTICK_PERIOD_MS);
digitalWrite(FLASHER_AP_RESET, HIGH);
rampTagPower(FLASHER_AP_POWER, true);
vTaskDelay(10 / portTICK_PERIOD_MS);
//}
bool firstrun = true;
AP_SERIAL_PORT.print("VER?");