commit
79a6146d44
@ -1,7 +1,7 @@
|
||||
#ifndef _BUTTON_H
|
||||
#define _BUTTON_H
|
||||
|
||||
#include <SimpleButton.h>
|
||||
#include <OneButton.h>
|
||||
#include "irqhandler.h"
|
||||
#include "senddata.h"
|
||||
#include "display.h"
|
||||
@ -11,7 +11,13 @@
|
||||
#define BUTTON_ACTIVEHIGH 0
|
||||
#endif
|
||||
|
||||
void button_init(int pin);
|
||||
void readButton();
|
||||
#ifndef BUTTON_PULLUP
|
||||
#define BUTTON_PULLUP 0
|
||||
#endif
|
||||
|
||||
extern TaskHandle_t buttonLoopTask;
|
||||
|
||||
void button_init(void);
|
||||
void IRAM_ATTR readButton(void);
|
||||
|
||||
#endif
|
@ -13,6 +13,7 @@
|
||||
#include "reset.h"
|
||||
#include "led.h"
|
||||
#include "power.h"
|
||||
#include "button.h"
|
||||
|
||||
extern Ticker cyclicTimer;
|
||||
|
||||
|
@ -36,12 +36,4 @@ void IRAM_ATTR DisplayIRQ();
|
||||
void IRAM_ATTR MatrixDisplayIRQ();
|
||||
#endif
|
||||
|
||||
#ifdef HAS_BUTTON
|
||||
void IRAM_ATTR ButtonIRQ();
|
||||
#endif
|
||||
|
||||
#ifdef HAS_PMU
|
||||
void IRAM_ATTR PMUIRQ();
|
||||
#endif
|
||||
|
||||
#endif
|
@ -23,5 +23,6 @@
|
||||
#include "boot.h"
|
||||
#include "power.h"
|
||||
#include "antenna.h"
|
||||
#include "button.h"
|
||||
|
||||
#endif
|
@ -100,6 +100,5 @@ private:
|
||||
};
|
||||
|
||||
extern PayloadConvert payload;
|
||||
extern int8_t batt_level;
|
||||
|
||||
#endif // _PAYLOAD_H_
|
||||
|
@ -53,11 +53,13 @@ typedef uint8_t (*mapFn_t)(uint16_t, uint16_t, uint16_t);
|
||||
uint16_t read_voltage(void);
|
||||
void calibrate_voltage(void);
|
||||
bool batt_sufficient(void);
|
||||
extern int8_t batt_level;
|
||||
|
||||
#ifdef HAS_PMU
|
||||
#include <XPowersLib.h>
|
||||
extern XPowersPMU pmu;
|
||||
enum pmu_power_t { pmu_power_on, pmu_power_off, pmu_power_sleep };
|
||||
void IRAM_ATTR PMUIRQ();
|
||||
void AXP192_powerevent_IRQ(void);
|
||||
void AXP192_power(pmu_power_t powerlevel);
|
||||
void AXP192_init(void);
|
||||
|
@ -15,6 +15,7 @@
|
||||
#include "timesync.h"
|
||||
#include "power.h"
|
||||
#include "antenna.h"
|
||||
#include "payload.h"
|
||||
|
||||
// maximum number of elements in rcommand interpreter queue
|
||||
#define RCMD_QUEUE_SIZE 5
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include "lorawan.h"
|
||||
#include "display.h"
|
||||
#include "sdcard.h"
|
||||
#include "payload.h"
|
||||
|
||||
void SendPayload(uint8_t port);
|
||||
void sendData(void);
|
||||
|
@ -46,7 +46,7 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
|
||||
|
||||
[common]
|
||||
; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
|
||||
release_version = 3.4.0
|
||||
release_version = 3.4.1
|
||||
; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
|
||||
; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
|
||||
debug_level = 3
|
||||
@ -81,7 +81,7 @@ lib_deps_basic =
|
||||
https://github.com/SukkoPera/Arduino-Rokkit-Hash.git
|
||||
bblanchon/ArduinoJson @ ^6
|
||||
makuna/RTC @ ^2.3.5
|
||||
spacehuhn/SimpleButton
|
||||
mathertel/OneButton @ ^2.0.3
|
||||
lewisxhe/XPowersLib @ ^0.1.4
|
||||
256dpi/MQTT @ ^2.5.0
|
||||
lib_deps_all =
|
||||
|
@ -10,7 +10,7 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
|
||||
|
||||
[common]
|
||||
; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
|
||||
release_version = 3.4.0
|
||||
release_version = 3.4.1
|
||||
; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
|
||||
; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
|
||||
debug_level = 3
|
||||
@ -29,7 +29,7 @@ lib_deps_all =
|
||||
https://github.com/cyberman54/libpax.git
|
||||
https://github.com/SukkoPera/Arduino-Rokkit-Hash.git
|
||||
bblanchon/ArduinoJson @ ^6
|
||||
spacehuhn/SimpleButton
|
||||
mathertel/OneButton @ ^2.0.3
|
||||
256dpi/MQTT @ ^2.5.0
|
||||
ricmoo/QRCode @ ^0.0.1
|
||||
build_flags_basic =
|
||||
|
@ -3,42 +3,49 @@
|
||||
#include "globals.h"
|
||||
#include "button.h"
|
||||
|
||||
using namespace simplebutton;
|
||||
|
||||
// Local logging tag
|
||||
static const char TAG[] = __FILE__;
|
||||
|
||||
static Button *b = NULL;
|
||||
OneButton button(HAS_BUTTON, !BUTTON_ACTIVEHIGH, !!BUTTON_PULLUP);
|
||||
TaskHandle_t buttonLoopTask;
|
||||
|
||||
void button_init(int pin) {
|
||||
#ifdef BUTTON_PULLUP
|
||||
b = new ButtonPullup(pin);
|
||||
#else
|
||||
b = new Button(pin, !BUTTON_ACTIVEHIGH);
|
||||
#endif
|
||||
void IRAM_ATTR readButton(void) { button.tick(); }
|
||||
|
||||
// attach events to the button
|
||||
|
||||
b->setOnDoubleClicked([]() {});
|
||||
|
||||
b->setOnClicked([]() {
|
||||
void singleClick(void) {
|
||||
#ifdef HAS_DISPLAY
|
||||
dp_refresh(true); // switch to next display page
|
||||
#endif
|
||||
#ifdef HAS_MATRIX_DISPLAY
|
||||
refreshTheMatrixDisplay(true); // switch to next display page
|
||||
#endif
|
||||
});
|
||||
}
|
||||
|
||||
b->setOnHolding([]() {
|
||||
void longPressStart(void) {
|
||||
payload.reset();
|
||||
payload.addButton(0x01);
|
||||
SendPayload(BUTTONPORT);
|
||||
});
|
||||
|
||||
// attach interrupt to the button
|
||||
attachInterrupt(digitalPinToInterrupt(pin), ButtonIRQ, CHANGE);
|
||||
}
|
||||
|
||||
void readButton() { b->update(); }
|
||||
void buttonLoop(void *parameter) {
|
||||
while (1) {
|
||||
doIRQ(BUTTON_IRQ);
|
||||
delay(20);
|
||||
}
|
||||
}
|
||||
|
||||
void button_init(void) {
|
||||
ESP_LOGI(TAG, "Starting button Controller...");
|
||||
xTaskCreatePinnedToCore(buttonLoop, // task function
|
||||
"buttonloop", // name of task
|
||||
2048, // stack size of task
|
||||
(void *)1, // parameter of the task
|
||||
2, // priority of the task
|
||||
&buttonLoopTask, // task handle
|
||||
1); // CPU core
|
||||
|
||||
button.setPressTicks(1000);
|
||||
button.attachClick(singleClick);
|
||||
button.attachLongPressStart(longPressStart);
|
||||
};
|
||||
|
||||
#endif
|
@ -71,6 +71,13 @@ void doHousekeeping() {
|
||||
eTaskGetState(ledLoopTask));
|
||||
#endif
|
||||
|
||||
#ifdef HAS_BUTTON
|
||||
if (buttonLoopTask != NULL)
|
||||
ESP_LOGD(TAG, "Buttonloop %d bytes left | Taskstate = %d",
|
||||
uxTaskGetStackHighWaterMark(buttonLoopTask),
|
||||
eTaskGetState(buttonLoopTask));
|
||||
#endif
|
||||
|
||||
// read battery voltage into global variable
|
||||
#if (defined BAT_MEASURE_ADC || defined HAS_PMU || defined HAS_IP5306)
|
||||
batt_level = read_battlevel();
|
||||
|
@ -20,7 +20,6 @@
|
||||
|
||||
#define CFG_sx1276_radio 1
|
||||
#define HAS_LED NOT_A_PIN // LoPy4 has no on board mono LED, we use on board RGB LED
|
||||
#define RGB_LED_COUNT 1 // we have 1 LEDs
|
||||
#define RGB_LED_COUNT 1 // we have 1 LED
|
||||
#define HAS_RGB_LED FastLED.addLeds<WS2812, GPIO_NUM_0, GRB>(leds, RGB_LED_COUNT);
|
||||
#define BOARD_HAS_PSRAM // use extra 4MB extern RAM
|
||||
|
@ -102,14 +102,6 @@ void IRAM_ATTR DisplayIRQ() { doIRQ(DISPLAY_IRQ); }
|
||||
void IRAM_ATTR MatrixDisplayIRQ() { doIRQ(MATRIX_DISPLAY_IRQ); }
|
||||
#endif
|
||||
|
||||
#ifdef HAS_BUTTON
|
||||
void IRAM_ATTR ButtonIRQ() { doIRQ(BUTTON_IRQ); }
|
||||
#endif
|
||||
|
||||
#ifdef HAS_PMU
|
||||
void IRAM_ATTR PMUIRQ() { doIRQ(PMU_IRQ); }
|
||||
#endif
|
||||
|
||||
void mask_user_IRQ() { xTaskNotify(irqHandlerTask, MASK_IRQ, eSetBits); }
|
||||
|
||||
void unmask_user_IRQ() { xTaskNotify(irqHandlerTask, UNMASK_IRQ, eSetBits); }
|
@ -28,6 +28,7 @@ licenses. Refer to LICENSE.txt file in repository for more details.
|
||||
Task Core Prio Purpose
|
||||
-------------------------------------------------------------------------------
|
||||
ledloop* 1 1 blinks LEDs
|
||||
buttonloop* 1 2 reads button
|
||||
spiloop# 0 2 reads/writes data on spi interface
|
||||
lmictask* 1 2 MCCI LMiC LORAWAN stack
|
||||
clockloop# 1 6 generates realtime telegrams for external clock
|
||||
@ -468,7 +469,7 @@ void setup() {
|
||||
#else
|
||||
strcat_P(features, "PD");
|
||||
#endif // BUTTON_PULLUP
|
||||
button_init(HAS_BUTTON);
|
||||
button_init();
|
||||
#endif // HAS_BUTTON
|
||||
|
||||
// only if we have a timesource we do timesync
|
||||
|
@ -25,6 +25,8 @@ static const adc_unit_t unit = ADC_UNIT_1;
|
||||
#ifdef HAS_PMU
|
||||
XPowersPMU pmu;
|
||||
|
||||
void IRAM_ATTR PMUIRQ() { doIRQ(PMU_IRQ); }
|
||||
|
||||
void AXP192_powerevent_IRQ(void) {
|
||||
pmu.getIrqStatus();
|
||||
|
||||
|
@ -96,9 +96,8 @@ void sendData() {
|
||||
|
||||
#if !(PAYLOAD_OPENSENSEBOX)
|
||||
payload.addCount(count.wifi_count, MAC_SNIFF_WIFI);
|
||||
if (cfg.blescan) {
|
||||
if (cfg.blescan)
|
||||
payload.addCount(count.ble_count, MAC_SNIFF_BLE);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if (HAS_GPS)
|
||||
@ -114,7 +113,7 @@ void sendData() {
|
||||
|
||||
#if (PAYLOAD_OPENSENSEBOX)
|
||||
payload.addCount(count.wifi_count, MAC_SNIFF_WIFI);
|
||||
if (cfg.blescan) {
|
||||
if (cfg.blescan)
|
||||
payload.addCount(count.ble_count, MAC_SNIFF_BLE);
|
||||
#endif
|
||||
|
||||
@ -199,9 +198,9 @@ void sendData() {
|
||||
bitmask &= ~mask;
|
||||
mask <<= 1;
|
||||
} // while (bitmask)
|
||||
} // sendData()
|
||||
} // sendData()
|
||||
|
||||
void flushQueues(void) {
|
||||
void flushQueues(void) {
|
||||
rcmd_queuereset();
|
||||
#if (HAS_LORA)
|
||||
lora_queuereset();
|
||||
@ -212,9 +211,9 @@ void sendData() {
|
||||
#ifdef HAS_MQTT
|
||||
mqtt_queuereset();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
bool allQueuesEmtpy(void) {
|
||||
bool allQueuesEmtpy(void) {
|
||||
uint32_t rc = rcmd_queuewaiting();
|
||||
#if (HAS_LORA)
|
||||
rc += lora_queuewaiting();
|
||||
@ -226,4 +225,4 @@ void sendData() {
|
||||
rc += mqtt_queuewaiting();
|
||||
#endif
|
||||
return (rc == 0) ? true : false;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user