diff --git a/ESP32_AP-Flasher/include/commstructs.h b/ESP32_AP-Flasher/include/commstructs.h index d3753a64..c6c1cb1a 100644 --- a/ESP32_AP-Flasher/include/commstructs.h +++ b/ESP32_AP-Flasher/include/commstructs.h @@ -5,6 +5,7 @@ struct espBlockRequest { uint8_t checksum; uint64_t ver; uint8_t blockId; + uint8_t src[8]; } __packed; struct espXferComplete { diff --git a/ESP32_AP-Flasher/src/newproto.cpp b/ESP32_AP-Flasher/src/newproto.cpp index 7d4813e6..ba6d6499 100644 --- a/ESP32_AP-Flasher/src/newproto.cpp +++ b/ESP32_AP-Flasher/src/newproto.cpp @@ -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) { diff --git a/ESP32_AP-Flasher/src/serial.cpp b/ESP32_AP-Flasher/src/serial.cpp index b24071fb..26e9c15e 100644 --- a/ESP32_AP-Flasher/src/serial.cpp +++ b/ESP32_AP-Flasher/src/serial.cpp @@ -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?");