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

Better AP detection - AP Channel set - Updated virtual tag mac - mac used for cancelled request

Browse Source
This commit is contained in:
jjwbruijn
2023-04-27 02:00:12 +02:00
parent 013e6263a9
commit aec5cc07e7
10 changed files with 64 additions and 10 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.

BIN
binaries/Tag_FW_1.54.bin
View File

Binary file not shown.

BIN
binaries/Tag_FW_2.9-uc8151.bin
View File

Binary file not shown.

BIN
binaries/Tag_FW_2.9.bin
View File

Binary file not shown.

BIN
binaries/Tag_FW_4.2.bin
View File

Binary file not shown.

8
zbs243_AP_FW/emulateTag.c
View File

@@ -19,11 +19,13 @@
#include "uart.h"
#include "wdt.h"
extern uint8_t __xdata fakeTagMac[8] = {0x0, 0x00, 0x55, 0xCE, 0xAC, 0x00, 0x00};
uint8_t __xdata fakeTagMac[8] = {0x0, 0x00, 0x55, 0xCE, 0xAC, 0x00, 0x00};
extern uint8_t __xdata radiorxbuffer[];
extern uint8_t __xdata blockbuffer[];
extern void espNotifyAvailDataReq(const struct AvailDataReq *adr, const uint8_t *src);
extern void espBlockRequest(const struct blockRequest *br);
extern void espBlockRequest(const struct blockRequest *br, uint8_t *src);
extern void espNotifyXferComplete(const uint8_t *src);
extern void addCRC(void *p, uint8_t len);
@@ -64,7 +66,7 @@ void fakeTagGetData() {
struct blockRequest br;
br.blockId = blockCount;
br.ver = ad.dataVer;
espBlockRequest(&br);
espBlockRequest(&br, fakeTagMac);
dataRequested = true;
}
} else {

62
zbs243_AP_FW/main.c
View File

@@ -47,6 +47,12 @@ struct espAvailDataReq {
struct AvailDataReq adr;
} __packed;
struct espSetChannelPower {
uint8_t checksum;
uint8_t channel;
uint8_t power;
} __packed;
// #define TIMER_TICKS_PER_MS 1333UL
uint16_t __xdata version = 0x0012;
@@ -196,6 +202,14 @@ void deleteAllPendingDataForVer(const uint8_t *ver) {
if (slot != -1) pendingDataArr[slot].attemptsLeft = 0;
} while (slot != -1);
}
void deleteAllPendingDataForMac(const uint8_t *mac) {
int8_t slot = -1;
do {
slot = findSlotForMac(mac);
if (slot != -1) pendingDataArr[slot].attemptsLeft = 0;
} while (slot != -1);
}
void countSlots() {
curPendingData = 0;
curNoUpdate = 0;
@@ -212,8 +226,9 @@ void countSlots() {
// processing serial data
#define ZBS_RX_WAIT_HEADER 0
#define ZBS_RX_WAIT_SDA 1
#define ZBS_RX_WAIT_CANCEL 2
#define ZBS_RX_WAIT_SDA 1 // send data avail
#define ZBS_RX_WAIT_CANCEL 2 // cancel traffic for mac
#define ZBS_RX_WAIT_SCP 3 // set channel power
extern uint8_t *__idata blockp;
void processSerial(uint8_t lastchar) {
@@ -251,6 +266,12 @@ void processSerial(uint8_t lastchar) {
serialbufferp = serialbuffer;
break;
}
if (strncmp(cmdbuffer, "SCP>", 4) == 0) {
RXState = ZBS_RX_WAIT_SCP;
bytesRemain = sizeof(struct espSetChannelPower);
serialbufferp = serialbuffer;
break;
}
if (strncmp(cmdbuffer, "VER?", 4) == 0) {
pr("VER>%04X\n", version);
}
@@ -260,6 +281,7 @@ void processSerial(uint8_t lastchar) {
if (strncmp(cmdbuffer, "RSET", 4) == 0) {
wdtDeviceReset();
}
break;
case ZBS_RX_WAIT_SDA:
@@ -306,7 +328,8 @@ void processSerial(uint8_t lastchar) {
pr("ACK>\n");
} else {
#endif
deleteAllPendingDataForVer((uint8_t *)&pd->availdatainfo.dataVer);
// deleteAllPendingDataForVer((uint8_t *)&pd->availdatainfo.dataVer);
deleteAllPendingDataForMac((uint8_t *)&pd->targetMac);
pr("ACK>\n");
#if (AP_EMULATE_TAG == 1)
}
@@ -318,11 +341,35 @@ void processSerial(uint8_t lastchar) {
RXState = ZBS_RX_WAIT_HEADER;
}
break;
case ZBS_RX_WAIT_SCP:
*serialbufferp = lastchar;
serialbufferp++;
bytesRemain--;
if (bytesRemain == 0) {
if (checkCRC(serialbuffer, sizeof(struct espSetChannelPower))) {
struct espSetChannelPower *scp = (struct espSetChannelPower *)serialbuffer;
for (uint8_t c = 0; c < sizeof(channelList); c++) {
if (channelList[c] == scp->channel) goto SCPchannelFound;
}
goto SCPfailed;
SCPchannelFound:
curChannel = scp->channel;
radioSetChannel(scp->channel);
radioSetTxPower(scp->power);
radioRxEnable(true, true);
pr("ACK>\n");
} else {
SCPfailed:
pr("NOK>\n");
}
RXState = ZBS_RX_WAIT_HEADER;
}
break;
}
}
// sending data to the ESP
void espBlockRequest(const struct blockRequest *br, uint8_t* src) {
void espBlockRequest(const struct blockRequest *br, uint8_t *src) {
struct espBlockRequest *__xdata ebr = (struct espBlockRequest *)blockbuffer;
uartTx('R');
uartTx('Q');
@@ -609,7 +656,8 @@ void sendPong(void *__xdata buf) {
struct MacFrameBcast *rxframe = (struct MacFrameBcast *)buf;
struct MacFrameNormal *frameHeader = (struct MacFrameNormal *)(radiotxbuffer + 1);
radiotxbuffer[sizeof(struct MacFrameNormal) + 1] = PKT_PONG;
radiotxbuffer[0] = sizeof(struct MacFrameNormal) + 1 + RAW_PKT_PADDING;
radiotxbuffer[sizeof(struct MacFrameNormal) + 2] = curChannel;
radiotxbuffer[0] = sizeof(struct MacFrameNormal) + 1 + 1 + RAW_PKT_PADDING;
memcpy(frameHeader->src, mSelfMac, 8);
memcpy(frameHeader->dst, rxframe->src, 8);
radiotxbuffer[1] = 0x41; // fast way to set the appropriate bits
@@ -663,6 +711,10 @@ void main(void) {
}
}
#if (AP_EMULATE_TAG == 1)
xMemCopy8(fakeTagMac, mSelfMac); //
#endif
// clear the array with pending information
memset(pendingDataArr, 0, sizeof(pendingDataArr));

4
zbs243_Tag_FW/syncedproto.c
View File

@@ -142,7 +142,8 @@ uint8_t detectAP(const uint8_t channel) {
while (timerGet() < t) {
int8_t __xdata ret = commsRxUnencrypted(inBuffer);
if (ret > 1) {
if (getPacketType(inBuffer) == PKT_PONG) {
// dump(inBuffer+sizeof(struct MacFrameNormal),32);
if ((inBuffer[sizeof(struct MacFrameNormal) + 1] == channel) && (getPacketType(inBuffer) == PKT_PONG)) {
if (pktIsUnicast(inBuffer)) {
struct MacFrameNormal *__xdata f = (struct MacFrameNormal *)inBuffer;
memcpy(APmac, f->src, 8);
@@ -610,7 +611,6 @@ static bool downloadFWUpdate(const struct AvailDataInfo *__xdata avail) {
uint16_t __xdata imageSize = 0;
static bool downloadImageDataToEEPROM(const struct AvailDataInfo *__xdata avail) {
// check if we already started the transfer of this information & haven't completed it
if (xMemEqual((const void *__xdata) & avail->dataVer, (const void *__xdata) & curDataInfo.dataVer, 8) && curDataInfo.dataSize) {
// looks like we did. We'll carry on where we left off.