starred/OpenEPaperLink
1
0
Fork 0
mirror of https://github.com/OpenEPaperLink/OpenEPaperLink.git synced 2026-03-21 08:06:46 +01:00
Code Issues 944 Packages Projects Releases 10 Wiki Activity

added button

Browse Source 
Place a button switch between TEST pin (P1.0) and GND + capacitor in parallel).
Pressing button wakes up the tag and sends a request to the AP, including button state.
This commit is contained in:
Nic Limper
2023-01-27 15:38:59 +01:00
parent 08c1ab7106
commit 8b4a0a9892
5 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ap_fw/main.c
View File

@@ -60,6 +60,7 @@ struct AvailDataReq {
uint8_t softVer;
uint8_t hwType;
uint8_t protoVer;
//uint8_t buttonState;
} __packed;
#define DATATYPE_NOUPDATE 0

1
esp32_fw/include/commstructs.h
View File

@@ -27,6 +27,7 @@ struct AvailDataReq {
uint8_t softVer;
uint8_t hwType;
uint8_t protoVer;
//uint8_t buttonState;
} __packed;
struct espAvailDataReq {

2
esp32_fw/src/newproto.cpp
View File

@@ -147,7 +147,7 @@ void processDataReq(struct espAvailDataReq* eadr) {
uint8_t src[8];
// *((uint64_t*)src) = swap64(*((uint64_t*)adr->));
sprintf(buffer, "<ADR %02X%02X%02X%02X%02X%02X%02X%02X\n\0", eadr->src[7], eadr->src[6], eadr->src[5], eadr->src[4], eadr->src[3], eadr->src[2], eadr->src[1], eadr->src[0]);
// sprintf(buffer, "<DATA REQ - version=%d, voltage=%d\n", adr->softVer, adr->batteryMv);
sprintf(buffer, "<button: \n", eadr->adr->protoVer);
wsString((String)buffer);
Serial.print(buffer);
}

BIN
tag_fw/fw29.bin
View File

Binary file not shown.

37
tag_fw/syncedproto.c
View File

@@ -68,6 +68,7 @@ struct AvailDataReq {
uint8_t softVer;
uint8_t hwType;
uint8_t protoVer;
//uint8_t buttonState;
} __packed;
#define DATATYPE_NOUPDATE 0
@@ -252,8 +253,36 @@ void initAfterWake() {
void doSleep(uint32_t __xdata t) {
if(t>1000)pr("s=%lu\n ", t / 1000);
powerPortsDownForSleep();
//Button setup on TEST pin 1.0 (input pullup)
uint8_t tmp_P1FUNC = P1FUNC;
uint8_t tmp_P1DIR = P1DIR;
uint8_t tmp_P1PULL = P1PULL;
uint8_t tmp_P1LVLSEL = P1LVLSEL;
P1FUNC &=~ (1 << 0);
P1DIR |= (1 << 0);
P1PULL |= (1 << 0);
P1LVLSEL |= (1 << 0);
P1CHSTA &=~ (1 << 0);
P0INTEN = 0;
P1INTEN = (1 << 0);
P2INTEN = 0;
P1CHSTA &=~ (1 << 0);
// sleepy
sleepForMsec(t);
P0INTEN = 0;
P1INTEN = 0;
P2INTEN = 0;
P1FUNC = tmp_P1FUNC;
P1DIR = tmp_P1DIR;
P1PULL = tmp_P1PULL;
P1LVLSEL = tmp_P1LVLSEL;
initAfterWake();
}
uint16_t getNextSleep() {
@@ -295,6 +324,11 @@ void sendAvailDataReq() {
txframe->srcPan = 0x4447;
// TODO: send some meaningful data
availreq->softVer = 1;
if (P1CHSTA && (1 << 0)) {
availreq->protoVer = 1; //buttonState
pr("button pressed\n");
P1CHSTA &=~ (1 << 0);
}
addCRC(availreq, sizeof(struct AvailDataReq));
commsTxNoCpy(outBuffer);
}
@@ -897,6 +931,9 @@ void mainProtocolLoop(void) {
screenSleep();
eepromDeepPowerDown();
initRadio();
P1CHSTA &=~ (1 << 0);
// drawPartial();
// i2ctest();
// doSleep(10000);