DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #913 from cyberman54/development

Browse Source 
v3.4.1
This commit is contained in:
Verkehrsrot 2022-11-06 15:32:38 +01:00 committed by GitHub
commit 79a6146d44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 134 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/button.h
View File

@ -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

1
include/cyclic.h
View File

@ -13,6 +13,7 @@
#include "reset.h"
#include "led.h"
#include "power.h"
#include "button.h"
extern Ticker cyclicTimer;

8
include/irqhandler.h
View File

@ -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

1
include/main.h
View File

@ -23,5 +23,6 @@
#include "boot.h"
#include "power.h"
#include "antenna.h"
#include "button.h"
#endif

1
include/payload.h
View File

@ -100,6 +100,5 @@ private:
};
extern PayloadConvert payload;
extern int8_t batt_level;
#endif // _PAYLOAD_H_

2
include/power.h
View File

@ -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);

1
include/rcommand.h
View File

@ -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

1
include/senddata.h
View File

@ -8,6 +8,7 @@
#include "lorawan.h"
#include "display.h"
#include "sdcard.h"
#include "payload.h"
void SendPayload(uint8_t port);
void sendData(void);

4
platformio_orig.ini
View File

@ -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 =

4
platformio_orig_s3.ini
View File

@ -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 =

61
src/button.cpp
View File

@ -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
dp_refresh(true); // switch to next display page
#endif
#ifdef HAS_MATRIX_DISPLAY
refreshTheMatrixDisplay(true); // switch to next display page
refreshTheMatrixDisplay(true); // switch to next display page
#endif
});
b->setOnHolding([]() {
payload.reset();
payload.addButton(0x01);
SendPayload(BUTTONPORT);
});
// attach interrupt to the button
attachInterrupt(digitalPinToInterrupt(pin), ButtonIRQ, CHANGE);
}
void readButton() { b->update(); }
void longPressStart(void) {
payload.reset();
payload.addButton(0x01);
SendPayload(BUTTONPORT);
}
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

7
src/cyclic.cpp
View File

@ -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();

1
src/hal/lopy4.h
View File

@ -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

16
src/irqhandler.cpp
View File

@ -13,10 +13,10 @@ void irqHandler(void *pvParameters) {
// task remains in blocked state until it is notified by an irq
for (;;) {
xTaskNotifyWait(0x00, // Don't clear any bits on entry
ULONG_MAX, // Clear all bits on exit
&irqSource, // Receives the notification value
portMAX_DELAY); // wait forever
xTaskNotifyWait(0x00, // Don't clear any bits on entry
ULONG_MAX, // Clear all bits on exit
&irqSource, // Receives the notification value
portMAX_DELAY); // wait forever
if (irqSource & UNMASK_IRQ) // interrupt handler to be enabled?
irqSource &= ~MASK_IRQ; // then clear irq mask flag
@ -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); }

3
src/main.cpp
View File

@ -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

2
src/power.cpp
View File

@ -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();

133
src/senddata.cpp
View File

@ -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,116 +113,116 @@ 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_SDS011)
sds011_store(&sds_status);
payload.addSDS(sds_status);
sds011_store(&sds_status);
payload.addSDS(sds_status);
#endif
#ifdef HAS_DISPLAY
dp_plotCurve(count.pax, true);
dp_plotCurve(count.pax, true);
#endif
#if (HAS_SDCARD)
sdcardWriteData(count.wifi_count, count.ble_count
sdcardWriteData(count.wifi_count, count.ble_count
#if (defined BAT_MEASURE_ADC || defined HAS_PMU)
,
read_voltage()
,
read_voltage()
#endif
);
);
#endif // HAS_SDCARD
SendPayload(COUNTERPORT);
break; // case COUNTDATA
SendPayload(COUNTERPORT);
break; // case COUNTDATA
#endif // ((WIFICOUNTER) || (BLECOUNTER))
#if (HAS_BME)
case MEMS_DATA:
payload.reset();
payload.addBME(bme_status);
SendPayload(BMEPORT);
break;
case MEMS_DATA:
payload.reset();
payload.addBME(bme_status);
SendPayload(BMEPORT);
break;
#endif
#if (HAS_GPS)
case GPS_DATA:
if (GPSPORT != COUNTERPORT) {
// send GPS position only if we have a fix
if (gps_hasfix()) {
gps_storelocation(&gps_status);
payload.reset();
payload.addGPS(gps_status);
SendPayload(GPSPORT);
} else
ESP_LOGD(TAG, "No valid GPS position");
}
break;
case GPS_DATA:
if (GPSPORT != COUNTERPORT) {
// send GPS position only if we have a fix
if (gps_hasfix()) {
gps_storelocation(&gps_status);
payload.reset();
payload.addGPS(gps_status);
SendPayload(GPSPORT);
} else
ESP_LOGD(TAG, "No valid GPS position");
}
break;
#endif
#if (HAS_SENSORS)
#if (HAS_SENSOR_1)
case SENSOR1_DATA:
payload.reset();
payload.addSensor(sensor_read(1));
SendPayload(SENSOR1PORT);
break;
case SENSOR1_DATA:
payload.reset();
payload.addSensor(sensor_read(1));
SendPayload(SENSOR1PORT);
break;
#endif
#if (HAS_SENSOR_2)
case SENSOR2_DATA:
payload.reset();
payload.addSensor(sensor_read(2));
SendPayload(SENSOR2PORT);
break;
case SENSOR2_DATA:
payload.reset();
payload.addSensor(sensor_read(2));
SendPayload(SENSOR2PORT);
break;
#endif
#if (HAS_SENSOR_3)
case SENSOR3_DATA:
payload.reset();
payload.addSensor(sensor_read(3));
SendPayload(SENSOR3PORT);
break;
case SENSOR3_DATA:
payload.reset();
payload.addSensor(sensor_read(3));
SendPayload(SENSOR3PORT);
break;
#endif
#endif
#if (defined BAT_MEASURE_ADC || defined HAS_PMU)
case BATT_DATA:
payload.reset();
payload.addVoltage(read_voltage());
SendPayload(BATTPORT);
break;
case BATT_DATA:
payload.reset();
payload.addVoltage(read_voltage());
SendPayload(BATTPORT);
break;
#endif
} // switch
bitmask &= ~mask;
mask <<= 1;
} // while (bitmask)
} // sendData()
} // switch
bitmask &= ~mask;
mask <<= 1;
} // while (bitmask)
} // sendData()
void flushQueues(void) {
rcmd_queuereset();
void flushQueues(void) {
rcmd_queuereset();
#if (HAS_LORA)
lora_queuereset();
lora_queuereset();
#endif
#ifdef HAS_SPI
spi_queuereset();
spi_queuereset();
#endif
#ifdef HAS_MQTT
mqtt_queuereset();
mqtt_queuereset();
#endif
}
}
bool allQueuesEmtpy(void) {
uint32_t rc = rcmd_queuewaiting();
bool allQueuesEmtpy(void) {
uint32_t rc = rcmd_queuewaiting();
#if (HAS_LORA)
rc += lora_queuewaiting();
rc += lora_queuewaiting();
#endif
#ifdef HAS_SPI
rc += spi_queuewaiting();
rc += spi_queuewaiting();
#endif
#ifdef HAS_MQTT
rc += mqtt_queuewaiting();
rc += mqtt_queuewaiting();
#endif
return (rc == 0) ? true : false;
}
return (rc == 0) ? true : false;
}