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

button fixes

Browse Source 
added buttonState in struct, #define HAS_BUTTON to enable listening to the button state.
This commit is contained in:
Nic Limper
2023-01-27 23:19:53 +01:00
parent f07240e3c3
commit 62fc61652e
4 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ap_fw/main.c
View File

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

2
esp32_fw/include/commstructs.h
View File

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

2
esp32_fw/src/newproto.cpp
View File

@@ -145,7 +145,7 @@ void processXferComplete(struct espXferComplete* xfc) {
void processDataReq(struct espAvailDataReq* eadr) {
char buffer[64];
uint8_t src[8];
sprintf(buffer, "<ADR %02X%02X%02X%02X%02X%02X%02X%02X button: %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], eadr->adr.protoVer);
sprintf(buffer, "<ADR %02X%02X%02X%02X%02X%02X%02X%02X button: %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], eadr->adr.buttonState);
wsString((String)buffer);
Serial.print(buffer);
}

27
tag_fw/syncedproto.c
View File

@@ -68,7 +68,7 @@ struct AvailDataReq {
uint8_t softVer;
uint8_t hwType;
uint8_t protoVer;
//uint8_t buttonState;
uint8_t buttonState;
} __packed;
#define DATATYPE_NOUPDATE 0
@@ -160,6 +160,9 @@ uint8_t __xdata seq = 0;
#define DATA_REQ_MAX_ATTEMPTS 14 // How many attempts (at most) we should do to get something back from the AP
#define POWER_SAVING_SMOOTHING 8 // How many samples we should use to smooth the data request interval
#define MINIMUM_INTERVAL 45 // IMPORTANT: Minimum interval for check-in; this determines overal battery life!
#define HAS_BUTTON // uncomment to enable reading a push button (connect between 'TEST' en 'GND' on the tag, along with a 100nF capacitor in parallel).
uint16_t __xdata dataReqAttemptArr[POWER_SAVING_SMOOTHING] = {0}; // Holds the amount of attempts required per data_req/check-in
uint8_t __xdata dataReqAttemptArrayIndex = 0;
uint8_t __xdata dataReqLastAttempt = 0;
@@ -254,34 +257,22 @@ void doSleep(uint32_t __xdata t) {
if(t>1000)pr("s=%lu\n ", t / 1000);
powerPortsDownForSleep();
#ifdef HAS_BUTTON
//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);
#endif
// sleepy
sleepForMsec(t);
P0INTEN = 0;
#ifdef HAS_BUTTON
P1INTEN = 0;
P2INTEN = 0;
P1FUNC = tmp_P1FUNC;
P1DIR = tmp_P1DIR;
P1PULL = tmp_P1PULL;
P1LVLSEL = tmp_P1LVLSEL;
#endif
initAfterWake();
}
@@ -325,7 +316,7 @@ void sendAvailDataReq() {
// TODO: send some meaningful data
availreq->softVer = 1;
if (P1CHSTA && (1 << 0)) {
availreq->protoVer = 1; //buttonState
availreq->buttonState = 1;
pr("button pressed\n");
P1CHSTA &=~ (1 << 0);
}