Commit Graph

1978 Commits

Author SHA1 Message Date
cyberman54
c62ba70567 fix timesync timesource debug output 2021-04-08 18:19:39 +02:00
cyberman54
0b85559358 reset.cpp: skip libpax_counter_stop() before sleep 2021-04-08 13:58:38 +02:00
cyberman54
e299444a89 change timesource symbol S to blank 2021-04-07 21:29:53 +02:00
cyberman54
3268824eb5 GPS time sync only if GPS time is valid 2021-04-07 21:21:06 +02:00
cyberman54
c2336397ce fix issue #786 2021-04-07 21:13:16 +02:00
cyberman54
c00612ad76 2nd fix issue #781 2021-04-07 20:20:31 +02:00
cyberman54
5c5752805b remove default argument for saveConfig() 2021-04-07 15:15:41 +02:00
cyberman54
f3a70c16c8 timekeeper.cpp: update comments time source 2021-04-06 23:37:51 +02:00
cyberman54
8a8128ed85 preserve time-of-day during deep sleep 2021-04-06 22:45:34 +02:00
cyberman54
4d7d92900e added Going-to-sleep display message 2021-04-06 21:35:25 +02:00
cyberman54
d098d6ada3 fix issue #781 2021-04-06 14:30:57 +02:00
cyberman54
0b271f95b3 libpax integration 6 (trigger sendcycle) 2021-04-01 12:17:46 +02:00
cyberman54
9335161676 code sanitization (decentralized several vars, 2) 2021-03-31 21:43:51 +02:00
cyberman54
e439d932b9 code sanitization (decentralized several vars) 2021-03-31 19:02:01 +02:00
cyberman54
03796c39af reset.cpp: bugfix compiler error sds011_sleep() 2021-03-31 18:59:00 +02:00
Verkehrsrot
5c98be2b96
Merge pull request #779 from cyberman54/master
sync dev to master
2021-03-31 16:25:25 +02:00
Verkehrsrot
39d7c7a24b
Merge pull request #777 from cyberman54/development
Development
2021-03-31 16:22:22 +02:00
cyberman54
dea92ced65 fix issue #773 (libpax counts display integration) 2021-03-31 16:20:48 +02:00
cyberman54
7d401697f6 issue #774 2021-03-31 09:44:23 +02:00
cyberman54
643d972da6 remove user sensors settings from paxcounter.conf 2021-03-31 09:06:52 +02:00
cyberman54
4bb93b3c10 libpax integration 4 (remove MAC_QUEUE_SIZE) 2021-03-27 23:25:54 +01:00
cyberman54
b2d6bb7dcc libpax integration 3 (remove macfilter) 2021-03-27 23:25:11 +01:00
cyberman54
29277af8af libpax integration 2 (work in progress) 2021-03-27 22:59:23 +01:00
Verkehrsrot
b483d0279d
Merge branch 'libpax-only' into development 2021-03-27 19:00:39 +01:00
cyberman54
295494bd81 change sleepcycle to 16bit * 10 2021-03-27 18:52:39 +01:00
cyberman54
b5314f1288 new rcommand 0x88 set_time 2021-03-27 18:07:30 +01:00
cyberman54
fcf2e4f59a MQTT timeserver: TTN scheduling first, not replace 2021-03-27 18:06:10 +01:00
Verkehrsrot
e25f2cacc7
Merge pull request #770 from cyberman54/master
sync dev to master
2021-03-27 17:24:55 +01:00
cyberman54
97ee6d653c removed rf_load var 2021-03-25 22:30:27 +01:00
cyberman54
d08914a219 libpax integration code sanitizations 2021-03-25 14:24:25 +01:00
cyberman54
5777df2c48 introduce global var device clientId 2021-03-25 14:03:13 +01:00
cyberman54
bad60592c3 don't count sleep wakeups as restarts 2021-03-25 11:42:39 +01:00
cyberman54
0badbeffd8 don't count sleep wakeups as restarts 2021-03-25 11:34:16 +01:00
Verkehrsrot
2b50318e99
Merge pull request #769 from paxexpress/libpax-version-update
libpax version update to v.0.1.2
2021-03-25 10:32:07 +01:00
cyberman54
cc7508aa41 libpax-only initial push 2021-03-25 10:30:38 +01:00
cyberman54
2854f2dd13 ota.cpp: stabilize and speedup wifi login 2021-03-23 23:09:52 +01:00
cyberman54
049048dd6e libpax integration 1 (work in progress) 2021-03-23 23:08:35 +01:00
Michael Solinski
0ef522cf1b Restated project defaults for BLECOUNTER 2021-03-23 15:52:20 +01:00
cyberman54
8c9325320a pax.express migration 2 (work in progress) 2021-03-22 23:10:07 +01:00
Verkehrsrot
14b5e7c495
Merge pull request #765 from paxexpress/libpax-integration
libpax integration
2021-03-22 21:45:49 +01:00
cyberman54
6b9d6b33b3 add reset after rcommand 09 02 2021-03-22 21:40:24 +01:00
Michael Solinski
3c4b2218e4 paxexpress integration 2021-03-22 16:11:05 +01:00
Michael Solinski
d9cdeddecf Reenable BLE Wifi switching for libpax 2021-03-22 15:44:41 +01:00
Michael Solinski
93dcace8bd Tryout for on demand switching between BLE and Wifi counting in libpax 2021-03-22 15:39:46 +01:00
Michael Solinski
3f3027aa69 libpax integration 2021-03-22 15:39:44 +01:00
Verkehrsrot
0e62683cdf
Merge pull request #764 from cyberman54/master
sync dev to master
2021-03-21 21:19:18 +01:00
cyberman54
385c5a1b9b restart counter added 2021-03-21 21:12:31 +01:00
cyberman54
cc4daa0954 reset logic fixed (initialize RTC vars after OTA) 2021-03-21 20:20:39 +01:00
cyberman54
b0864c45b9 reset logic fixed, restart counter addes 2021-03-21 18:41:02 +01:00
Verkehrsrot
bae079a93f
Merge pull request #763 from paxexpress/master
Migrate OTA source bintray -> paxexpress
2021-03-20 22:43:41 +01:00
cyberman54
79b96a75c7 bugfix reset loop after OTA update 2021-03-20 20:13:34 +01:00
cyberman54
4bb8cdf2ca comment edit in paxcounter_orig.conf 2021-03-19 18:13:28 +01:00
Michael Solinski
a03220dd1f Added new setInsecure call for PAX.express OTA 2021-03-17 12:01:32 +01:00
Michael Solinski
a6c631db24 paxexpress integration 2021-03-17 11:59:18 +01:00
Verkehrsrot
10ceb0ca4d
Merge branch 'master' into development 2021-03-12 23:35:31 +01:00
cyberman54
cabdb4da21 maintenance mode (timeout watchdog reworked) 2021-03-12 23:31:57 +01:00
cyberman54
da4fcc7ef1 maintenance mode (improved error handling) 2021-03-12 21:23:31 +01:00
cyberman54
0f945433f8 maintenance mode (http keep-alive) 2021-03-07 19:07:10 +01:00
cyberman54
1061ff2fd2 maintenance mode (final cleanups) 2021-03-07 18:34:52 +01:00
cyberman54
ad3567df45 configmanager.cpp: bugfix version compare 2021-03-06 21:26:35 +01:00
cyberman54
e54c386e9e maintenance mode (code sanitization) 2021-03-06 19:24:42 +01:00
cyberman54
6775faa87d wifiscan.cpp comment edit 2021-03-06 19:24:22 +01:00
cyberman54
e604db49d6 maintenance mode (fix display logic) 2021-03-06 16:32:10 +01:00
cyberman54
cd3195ec9b maintenance mode (display logic adjustment) 2021-03-06 16:24:39 +01:00
cyberman54
bc87dcb205 maintenance mode (set wifi hostname) 2021-03-06 16:23:28 +01:00
cyberman54
dceab074ca BT/WiFi coex fix needed for IDF4.1 2021-03-06 16:20:26 +01:00
cyberman54
6b3e8d00c2 maintenance mode (error handling improved) 2021-03-06 13:55:38 +01:00
cyberman54
7da22db833 maintenance mode adjustments 2021-03-05 20:09:35 +01:00
cyberman54
88774d13e9 maintenance mode (1st full version) 2021-03-05 17:00:28 +01:00
cyberman54
e864977b0d maintenance mode (experimental) 2021-03-04 21:24:00 +01:00
cyberman54
b1e08f0269 maintenance mode (experimental) 2021-03-04 21:22:49 +01:00
cyberman54
ad2c889889 maintenance mode adjustments 2021-03-03 19:16:14 +01:00
cyberman54
439ea0c057 maintenance mode adjustments 2021-03-03 18:46:41 +01:00
cyberman54
f5d5e7c6fc maintenance mode (experimental) 2021-03-03 16:20:21 +01:00
cyberman54
8dcac35ae1 lorawan.cpp small code sanitization 2021-03-03 10:21:49 +01:00
cyberman54
d74b236e74 fix issue #749 2021-02-25 19:04:55 +01:00
Verkehrsrot
08fa703275
Merge pull request #744 from cyberman54/development
Development
2021-02-20 17:10:43 +01:00
cyberman54
a2f94ee0bd enable battery monitoring on HeltecV2 2021-02-13 15:58:56 +01:00
cyberman54
c81af717bd sanitize ext_power_off 2021-02-13 14:04:03 +01:00
cyberman54
d3f5f4f60d new board hal file heltec21.h 2021-02-13 14:03:14 +01:00
Martin Loeschner
27be43f48f Adapt global settings for BLE and WiFi counters. 2021-02-10 20:39:32 +01:00
Verkehrsrot
48d8e3f7ad
Update heltecv2.h
Corrected link to arduino-esp32 issue
2021-02-10 15:27:33 +01:00
Florian Ludwig
05bd8a3581 treat http headers case insensitive in OTA 2021-02-06 16:09:43 +01:00
cyberman54
b2931c148d Merge branch 'master' of https://github.com/cyberman54/ESP32-Paxcounter 2021-02-02 23:23:25 +01:00
cyberman54
6dde1d4bf4 added TTNv3 converters (#issue 736) 2021-02-02 23:23:19 +01:00
cyberman54
105bd545f6 olimexpoeiso.h: add optional display 2021-02-02 23:18:05 +01:00
Verkehrsrot
f2d4c4fcde
Merge pull request #735 from cyberman54/development
v2.3.0
2021-01-31 20:51:16 +01:00
cyberman54
b5390d9e2c v2.3.0 2021-01-30 17:54:34 +01:00
Oliver Seiler
2176a30419 Fix PMU_CHARGE_CURRENT and PMU_CHARGE_CUTOFF defines 2021-01-29 11:17:39 +13:00
Antonio Vanegas
27e72fcb2d fixed ADC pin issue 2021-01-22 11:12:36 +01:00
Oliver Seiler
940d664778 Fix compile error when using CFG_LMIC_US_like Lora configuration (AU915, US915) 2021-01-21 18:11:25 +13:00
Verkehrsrot
532f633235
Merge pull request #680 from hpsaturn/av/ttgo-t-wristband
Av/ttgo t wristband
2021-01-20 11:58:10 +01:00
Antonio Vanegas
26f55baab4 added button and basic reference on README. 2021-01-19 16:02:09 +01:00
Antonio Vanegas
36641377d3 fixed display initialization issue 2021-01-19 12:30:07 +01:00
HouzuoGuo
66d9ef0f4d Enrich the debug-level log message with reading of timestamp at program
compilation as well as GPS time reading when the board time fails to
sync with GPS.

This helps user to debug time synchronisation failure stemmed from
a mismatch of developer's time zone and board's time zone.
2021-01-10 11:51:00 +02:00
cyberman54
241a19148b fix bitshift in payload + configmask 2021-01-09 23:52:08 +01:00
cyberman54
ecb94ab243 small patch display mask last row 2021-01-09 15:32:11 +01:00
cyberman54
dee4d825a0 bugfix i2c gps broken (issue #712) 2021-01-07 22:07:55 +01:00
cyberman54
3d6af69c0b repair broken rcommand processing 2021-01-07 10:37:55 +01:00
cyberman54
59e3876296 rcommand.cpp: code sanitization 2021-01-03 22:40:49 +01:00
cyberman54
2352d7d743 add ENS compile warning if no BLE 2021-01-03 21:52:55 +01:00
HouzuoGuo
cb0680b623 When GPZDA time-of-day is considered valid by TinyGps lib, the date is also valid, though not indicated by return value of isValid() 2021-01-03 19:25:11 +02:00
cyberman54
690c843ccf new rcmd load/save config 2021-01-03 18:00:51 +01:00
HouzuoGuo
e8cbc4c627 Avoid invoking ENS function in macsniff.cpp when ENS support is disabled 2021-01-03 17:25:09 +02:00
Verkehrsrot
42657329e3
Merge pull request #702 from HouzuoGuo/fix-gps-longitude
Fix incorrect prefix W/E that was displayed along with longitude
2021-01-03 13:47:25 +01:00
HouzuoGuo
11dddf459b Fix incorrect prefix W/E that was displayed along with longitude 2021-01-03 13:13:44 +02:00
cyberman54
399767e7ac add MQTT nodered example 2021-01-03 11:34:13 +01:00
cyberman54
41ab41566f MAC container using DRAM 2021-01-03 11:09:47 +01:00
cyberman54
d113c945b2 macsniff.cpp sanitizations 2021-01-03 11:09:13 +01:00
cyberman54
149bd7e05e rcommand.cpp: bugfix display queue size 2021-01-03 00:16:12 +01:00
cyberman54
2375489f92 blescan.cpp: bugfix #if (BLECOUNTER) 2021-01-03 00:15:36 +01:00
cyberman54
58a9e61ade main.cpp: corrections comments 2021-01-01 22:48:37 +01:00
cyberman54
f283758649 Code sanitization unneeded xTaskNotfiyFromISR 2021-01-01 22:48:16 +01:00
cyberman54
571de8b9ab make all queues static 2021-01-01 15:55:22 +01:00
cyberman54
61c7e4c12f process rcmd via queue 2021-01-01 15:25:56 +01:00
cyberman54
2d2a8abd79 mqttclient.cpp: unsubcribe & keepalive 2020-12-31 17:47:48 +01:00
cyberman54
98f83d9679 MQTT client rcommand completion 2020-12-30 22:25:37 +01:00
cyberman54
5d8cec547c lopy4.h: remove LORA_RST, now in pins_arduino.h 2020-12-30 22:09:06 +01:00
cyberman54
bf5a376926 fix issue #697 2020-12-30 22:07:50 +01:00
cyberman54
e882ad625e mqttclient.cpp: added base64 encoding 2020-12-29 20:48:32 +01:00
cyberman54
0209915877 macsniff.cpp code sanitization 2020-12-29 20:48:02 +01:00
cyberman54
df8083dba6 switch off DIO IRQs (MCCI LMIC PR #556) 2020-12-29 14:25:59 +01:00
cyberman54
d23bc3535e enter_deepsleep cleanup wait logic 2020-12-29 00:21:40 +01:00
cyberman54
a0f3d89295 sanitize BME sensor detection logic 2020-12-28 18:32:47 +01:00
cyberman54
a3249203d0 handle join during sleep 2020-12-28 18:31:31 +01:00
cyberman54
19045654e7 move mqtt settings to paxcounter_orig.conf 2020-12-28 16:41:07 +01:00
cyberman54
3cbaf240d9 hash&salt code simplified 2020-12-28 16:12:00 +01:00
cyberman54
70150fa606 repair convert mac to mqtt clientname 2020-12-28 00:03:37 +01:00
cyberman54
73263c3d04 externalize hash code to library 2020-12-27 23:43:45 +01:00
cyberman54
dd1ec2deed hash.cpp: fix typo 2020-12-27 13:17:06 +01:00
cyberman54
e48fc5ad3f hash.cpp: merge PR#3 in rokkithash code 2020-12-27 13:12:46 +01:00
cyberman54
310495e61c mqttclient.cpp bugfix hash MAC 2020-12-27 13:09:10 +01:00
cyberman54
1a2f9e0439 mqttclient.cpp: hash mqtt client name 2020-12-27 00:40:07 +01:00
cyberman54
a4daa772c3 generalize hash() function 2020-12-27 00:36:23 +01:00
cyberman54
9dc8e43f90 mqttclient.cpp code sanitizations 2020-12-26 23:36:56 +01:00
cyberman54
f74de6a27a move mqttloop from core0 to core1 2020-12-26 20:53:04 +01:00
cyberman54
0393fa3a45 repair OTA & deepsleep combination 2020-12-26 20:45:10 +01:00
cyberman54
866d0bd730 reset.cpp: repair OTA 2020-12-26 18:29:10 +01:00
cyberman54
ea24958b50 repair OTA for battery devices without battery 2020-12-26 18:15:56 +01:00
cyberman54
6b45669aeb remove useless pinMode from i2c_deinit() 2020-12-25 16:45:03 +01:00
cyberman54
81c444670e power.cpp code sanitizations 2020-12-24 18:20:53 +01:00
cyberman54
476639c731 ttgobeam.h comments edited 2020-12-24 16:54:20 +01:00
cyberman54
80d46ae001 AXP192 ecplicit register init 2020-12-24 16:52:28 +01:00
cyberman54
a30eab54f7 mqttclient reworked (experimental) 2020-12-23 16:31:31 +01:00
cyberman54
1950650bfb add deinit functions to enter_deepsleep 2020-12-23 16:31:06 +01:00
cyberman54
1ae49f8263 add spi deinit for sleep 2020-12-23 16:30:25 +01:00
cyberman54
f93594e964 cleanup some compiler warnings 2020-12-22 20:06:16 +01:00
cyberman54
457d46529b enter_deepsleep: stop senddata early 2020-12-22 19:13:46 +01:00
cyberman54
46d32f8cfe AXP192 longpress to switch off 2020-12-22 16:17:49 +01:00
cyberman54
2163c539c9 increase task stack size of macprocessor 2020-12-22 15:20:32 +01:00
cyberman54
a04e6440d4 millis() overflow logic reworked 2020-12-21 22:11:41 +01:00
cyberman54
5edb904d7c remove all ESP_ERROR_CHECK(x) 2020-12-21 19:41:25 +01:00
cyberman54
62132030b7 bugfix in wifi on/off logic 2020-12-21 19:35:21 +01:00
Verkehrsrot
bb77277836
Merge branch 'master' into development 2020-12-19 22:32:34 +01:00
cyberman54
fdfd10b227 bugfix persist uptime after deep sleep 2020-12-19 22:30:34 +01:00
cyberman54
85529920d5 ttgobeam10.h: set blue LED off in sleep 2020-12-19 12:36:09 +01:00
cyberman54
2d486e5ede persist uptime during deep sleep 2020-12-19 12:27:07 +01:00
cyberman54
889e88d671 cumulate uptime after deep sleep 2020-12-18 19:07:12 +01:00
cyberman54
85f9645599 blescan.cpp bugfix unregister gap cb 2020-12-18 19:06:44 +01:00
cyberman54
4c9862e7d5 ttgobeam10.h: add blue LED control 2020-12-18 18:40:26 +01:00
cyberman54
284d02cb87 blescan.cpp: avoid ble stack crash after deinit 2020-12-18 18:39:28 +01:00
cyberman54
49a0c703c1 wifiscan.cpp: sanitized mac filter condition 2020-12-18 18:38:44 +01:00
cyberman54
590cc9dd5c skip i2cscan after wakeup from sleep 2020-12-16 18:54:38 +01:00
cyberman54
93e194506f PR #683 /2 2020-12-16 18:54:23 +01:00
cyberman54
3fb5d258b7 PR #683 2020-12-16 18:32:59 +01:00
cyberman54
808e5e5192 bugfix no sleep while joining 2020-12-16 11:57:40 +01:00
cyberman54
973635e0e5 reset.cpp: no sleep while joining 2020-12-16 09:36:16 +01:00
cyberman54
570a3ea486 wifiscan.cpp: remove legay event loop handler 2020-12-15 22:36:52 +01:00
cyberman54
19216faa88 rework wifi init to remove event_handler error 2020-12-13 19:30:16 +01:00
cyberman54
14c8eeb471 new MACFILTER, replacing VENDORFILTER 2020-12-13 19:29:15 +01:00
Klaus K Wilting
b32e91317f deep sleep further development 2020-12-11 16:34:17 +01:00
Klaus K Wilting
7631a96cac olimexpoeiso.h: comments edited 2020-12-11 13:47:35 +01:00
Verkehrsrot
d048b759a8
main.cpp: bugfix wifi start 2020-12-11 12:39:25 +01:00
Klaus K Wilting
93315e142c app irq off before sleep 2020-12-10 22:14:41 +01:00
Klaus K Wilting
28d30493fd channel hopping switch on/off option 2020-12-10 22:12:57 +01:00
Klaus K Wilting
258b6fce53 deep sleep further development 2020-12-10 15:10:28 +01:00
Klaus K Wilting
61615d37e3 mqttclient.cpp: fix hostname 2020-12-10 15:09:24 +01:00
Klaus K Wilting
22f0ce5184 revert _millis & sanitizations deep sleep 2020-12-09 20:37:03 +01:00
Klaus K Wilting
8db24bfa8e msg prios removed, (not needed with buffer queues) 2020-12-09 11:01:54 +01:00
Klaus K Wilting
36afe66df9 new feature deep sleep (wokring alpha) 2020-12-09 10:15:12 +01:00
Klaus K Wilting
016d69b5bb ttgobeam10.h: LED active low correction 2020-12-06 22:06:45 +01:00
Klaus K Wilting
b47c77ee99 ttgobeam10.h: onboard LED added 2020-12-06 19:59:19 +01:00
Klaus K Wilting
b63b7f4ea2 disable SD card reader on olimex 2020-12-06 14:33:22 +01:00
Klaus K Wilting
95cac817b4 sleep power optimization 2020-12-04 19:09:35 +01:00
Klaus K Wilting
04a055b329 sleep cycle mode (experimental) 2020-12-04 17:32:10 +01:00
Antonio Vanegas
f794edaa0d Merge remote-tracking branch 'upstream/master' into av/ttgo-t-wristband 2020-12-01 01:09:42 +01:00
Verkehrsrot
40a1ef1e08
Merge pull request #678 from cyberman54/master
sync dev to master
2020-11-30 22:01:18 +01:00
Antonio Vanegas
4973ac6785
Added initial support for TTGO-Tdisplay board (#676) 2020-11-30 21:58:27 +01:00
Antonio Vanegas
c992581844 added initial header file for ttgo t-wristband 2020-11-29 23:59:58 +01:00
Klaus K Wilting
49d7ab80fa issue #674 (experimental) 2020-11-26 21:32:04 +01:00
Klaus K Wilting
b239961186 issue #675 2020-11-26 21:31:46 +01:00
Verkehrsrot
e4270cb473
Update macsniff.cpp
fix issue #675
2020-11-24 22:12:47 +01:00
Klaus K Wilting
7ccfb427c0 rekindle channel display 2020-11-10 11:07:41 +01:00
Klaus K Wilting
bdd515af55 wifiscan.cpp correct typo 2020-11-09 13:45:42 +01:00
Klaus K Wilting
86a6341101 new display RF load & remove ch display 2020-11-09 13:25:12 +01:00
Klaus K Wilting
2e368a6d8d main.cpp typo corrected 2020-11-09 12:35:51 +01:00
Klaus K Wilting
30731f5c0c MAC processing reworked 2020-11-08 22:14:28 +01:00
Klaus K Wilting
1cd9ae16f1 buffered MAC processing (experimental) 2020-11-07 22:32:36 +01:00
Klaus K Wilting
643352ce80 remove not working EEPROM EIU read code 2020-11-06 12:27:52 +01:00
Klaus K Wilting
8b496d9df4 trigger timesync only if a timesource is present 2020-11-02 21:32:45 +01:00