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

added dma-ish handling

Browse Source
This commit is contained in:
Jelmer
2023-03-27 17:24:48 +02:00
parent d92681ef02
commit 2cdb2b8a6f
3 changed files with 12 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zbs243_AP_FW/main.c
View File

@@ -38,8 +38,8 @@ struct espAvailDataReq {
struct AvailDataReq adr;
} __packed;
#define TIMER_TICKS_PER_MS 1333UL
uint16_t __xdata version = 0x0007;
//#define TIMER_TICKS_PER_MS 1333UL
uint16_t __xdata version = 0x000E;
#define RAW_PKT_PADDING 2
static uint8_t __xdata mRxBuf[COMMS_MAX_PACKET_SZ];
@@ -64,10 +64,9 @@ uint8_t __xdata dstMac[8]; // target for the block transfer
uint16_t __xdata dstPan; //
static uint32_t __xdata blockStartTimer = 0; // reference that holds when the AP sends the next block
extern bool __idata serialBypassActive; // if the serial bypass is disabled, saves bytes straight to the block buffer
uint32_t __xdata nextBlockAttempt = 0; // reference time for when the AP can request a new block from the ESP32
uint8_t seq = 0; // holds current sequence number for transmission
uint8_t __xdata blockbuffer[BLOCK_XFER_BUFFER_SIZE]; // block transfer buffer
uint8_t __xdata blockbuffer[BLOCK_XFER_BUFFER_SIZE+5]; // block transfer buffer
uint8_t lastAckMac[8] = {0};
// these variables hold the current mac were talking to
@@ -184,6 +183,8 @@ void deleteAllPendingDataForVer(const uint8_t *ver) {
#define ZBS_RX_WAIT_HEADER 0
#define ZBS_RX_WAIT_SDA 1
#define ZBS_RX_WAIT_CANCEL 2
extern uint8_t *__idata blockp;
void processSerial(uint8_t lastchar) {
// uartTx(lastchar); echo
switch (RXState) {
@@ -205,6 +206,11 @@ void processSerial(uint8_t lastchar) {
serialbufferp = serialbuffer;
break;
}
if (strncmp(cmdbuffer+1, ">D>", 3) == 0) {
blockp = blockbuffer;
pr("ACK>\n");
}
if (strncmp(cmdbuffer, "VER?", 4) == 0) {
pr("VER>%04X\n", version);
}
@@ -404,7 +410,6 @@ void processBlockRequest(const uint8_t *buffer, uint8_t forceBlockDownload) {
dstPan = rxHeader->pan;
if (requestDataDownload) {
serialBypassActive = false;
espBlockRequest(&requestedData);
nextBlockAttempt = timerGet();
}

20
zbs243_AP_FW/soc/zbs243/uart.c
View File

@@ -28,7 +28,6 @@ void uartTx(uint8_t val) {
UARTBUF = val;
}
#else
extern uint8_t __xdata blockbuffer[];
volatile uint8_t txtail = 0;
volatile uint8_t txhead = 0;
@@ -63,32 +62,15 @@ uint8_t uartBytesAvail() {
}
uint8_t* __idata blockp;
uint8_t __idata cmd[3];
volatile bool __idata serialBypassActive = false;
void checkcommand(uint8_t rx) {
for (uint8_t c = 0; c < 2; c++) {
cmd[c] = cmd[c + 1];
}
cmd[2] = rx;
if (strncmp(cmd, ">D>", 3) == 0) {
blockp = blockbuffer;
serialBypassActive = true;
}
}
void UART_IRQ1(void) __interrupt(0) {
if (UARTSTA & 1) { // RXC
UARTSTA &= 0xfe;
if (serialBypassActive) {
if (P0_2) {
*blockp++ = UARTBUF;
if (blockp == (blockbuffer + 4100)) {
serialBypassActive = false;
}
} else {
rxbuf[rxhead] = UARTBUF;
rxhead++;
checkcommand(UARTBUF);
}
}
if (UARTSTA & 2) { // TXC

20
zbs243_shared/soc/zbs243/uart.c
View File

@@ -28,7 +28,6 @@ void uartTx(uint8_t val) {
UARTBUF = val;
}
#else
extern uint8_t __xdata blockbuffer[];
volatile uint8_t txtail = 0;
volatile uint8_t txhead = 0;
@@ -63,32 +62,15 @@ uint8_t uartBytesAvail() {
}
uint8_t* __idata blockp;
uint8_t __idata cmd[3];
volatile bool __idata serialBypassActive = false;
void checkcommand(uint8_t rx) {
for (uint8_t c = 0; c < 2; c++) {
cmd[c] = cmd[c + 1];
}
cmd[2] = rx;
if (strncmp(cmd, ">D>", 3) == 0) {
blockp = blockbuffer;
serialBypassActive = true;
}
}
void UART_IRQ1(void) __interrupt(0) {
if (UARTSTA & 1) { // RXC
UARTSTA &= 0xfe;
if (serialBypassActive) {
if (P0_2) {
*blockp++ = UARTBUF;
if (blockp == (blockbuffer + 4100)) {
serialBypassActive = false;
}
} else {
rxbuf[rxhead] = UARTBUF;
rxhead++;
checkcommand(UARTBUF);
}
}
if (UARTSTA & 2) { // TXC