pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 01:42:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

split query of paxcounter data from sending funcionality; don't cummulate (count mode != 1); use flag to signal changed count data

Browse Source
This commit is contained in:
Thomas Herrmann 2024-03-05 23:39:43 +01:00 committed by Thomas Göttgens
parent d1a25947e3
commit fb4faf790b
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/esp32/PaxcounterModule.cpp
View File

@ -7,8 +7,6 @@
PaxcounterModule *paxcounterModule; PaxcounterModule *paxcounterModule;
void NullFunc(){};
// paxcounterModule->sendInfo(NODENUM_BROADCAST); // paxcounterModule->sendInfo(NODENUM_BROADCAST);
PaxcounterModule::PaxcounterModule() PaxcounterModule::PaxcounterModule()
@ -19,10 +17,14 @@ PaxcounterModule::PaxcounterModule()
bool PaxcounterModule::sendInfo(NodeNum dest) bool PaxcounterModule::sendInfo(NodeNum dest)
{ {
libpax_counter_count(&count_from_libpax); if (paxcounterModule->reportedDataSent)
LOG_INFO("(Sending): pax: wifi=%d; ble=%d; uptime=%d\n", count_from_libpax.wifi_count, count_from_libpax.ble_count, return false;
LOG_INFO("(Sending): pax: wifi=%d; ble=%d; uptime=%lu\n", count_from_libpax.wifi_count, count_from_libpax.ble_count,
millis() / 1000); millis() / 1000);
paxcounterModule->reportedDataSent = true;
meshtastic_Paxcount pl = meshtastic_Paxcount_init_default; meshtastic_Paxcount pl = meshtastic_Paxcount_init_default;
pl.wifi = count_from_libpax.wifi_count; pl.wifi = count_from_libpax.wifi_count;
pl.ble = count_from_libpax.ble_count; pl.ble = count_from_libpax.ble_count;
@ -55,6 +57,14 @@ meshtastic_MeshPacket *PaxcounterModule::allocReply()
return allocDataProtobuf(pl); return allocDataProtobuf(pl);
} }
void PaxcounterModule::handlePaxCounterReportRequest()
{
// libpax_counter_count(&paxcounterModule->count_from_libpax);
LOG_INFO("(Reading): libPax reported new data: wifi=%d; ble=%d; uptime=%lu\n", paxcounterModule->count_from_libpax.wifi_count,
paxcounterModule->count_from_libpax.ble_count, millis() / 1000);
paxcounterModule->reportedDataSent = false;
}
int32_t PaxcounterModule::runOnce() int32_t PaxcounterModule::runOnce()
{ {
if (isActive()) { if (isActive()) {
@ -76,12 +86,14 @@ int32_t PaxcounterModule::runOnce()
libpax_update_config(&configuration); libpax_update_config(&configuration);
// internal processing initialization // internal processing initialization
libpax_counter_init(NullFunc, &count_from_libpax, UINT16_MAX, 1); libpax_counter_init(handlePaxCounterReportRequest, &count_from_libpax,
moduleConfig.paxcounter.paxcounter_update_interval, 0);
libpax_counter_start(); libpax_counter_start();
} else { } else {
sendInfo(NODENUM_BROADCAST); sendInfo(NODENUM_BROADCAST);
} }
return getConfiguredOrDefaultMs(moduleConfig.paxcounter.paxcounter_update_interval, default_broadcast_interval_secs); // we check every second if the counter had new data to send
return 1000;
} else { } else {
return disable(); return disable();
} }

3
src/modules/esp32/PaxcounterModule.h
View File

@ -13,10 +13,13 @@
class PaxcounterModule : private concurrency::OSThread, public ProtobufModule<meshtastic_Paxcount> class PaxcounterModule : private concurrency::OSThread, public ProtobufModule<meshtastic_Paxcount>
{ {
bool firstTime = true; bool firstTime = true;
bool reportedDataSent = true;
public: public:
PaxcounterModule(); PaxcounterModule();
static void handlePaxCounterReportRequest();
protected: protected:
struct count_payload_t count_from_libpax = {0, 0, 0}; struct count_payload_t count_from_libpax = {0, 0, 0};
virtual int32_t runOnce() override; virtual int32_t runOnce() override;