Commit Graph

1882 Commits

Author SHA1 Message Date
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
Klaus K Wilting
8452347bf3 HAS_SENSOR defines sanitization 2020-11-02 18:44:06 +01:00
Klaus K Wilting
40f0036b7a lopy4.h: corrections 2020-11-02 18:36:01 +01:00
Klaus K Wilting
e5d13be42e eliminate usage of millis() in whole code 2020-11-02 12:39:46 +01:00
Klaus K Wilting
8341a2115e stack memory debug information improved 2020-11-02 12:25:30 +01:00
Klaus K Wilting
45b0b40db8 lorawan.cpp code sanitizations 2020-11-02 12:24:40 +01:00
Klaus K Wilting
8a0a3949fd fix #issue668 2020-11-01 13:45:17 +01:00
Klaus K Wilting
44758161dc ecopower.h modified 2020-10-31 21:42:47 +01:00
Klaus K Wilting
229daf080c bugfix mqttclient.cpp 2020-10-31 12:50:48 +01:00
Klaus K Wilting
cf87950e27 SDMMC fix (PR #665, activating pullups) 2020-10-31 12:05:26 +01:00
Klaus K Wilting
49f169ce22 small corrections BME sensors 2020-10-30 12:25:15 +01:00
Klaus K Wilting
5bbe4bee02 new _ASSERT function 2020-10-30 12:24:16 +01:00
Klaus K Wilting
7330419f5e i2c detection improved 2020-10-18 21:01:14 +02:00
Klaus K Wilting
f77fdffba8 i2c device scan improved 2020-10-14 10:29:13 +02:00
Klaus K Wilting
4833044df7 ENS counter added to decoders 2020-10-10 16:05:47 +02:00
Klaus K Wilting
2ff80fa360 mqttclient small fix 2020-10-10 00:49:55 +02:00
Klaus K Wilting
b5502f9edb increase stack size for gps and timesync tasks 2020-10-09 23:29:18 +02:00
Klaus K Wilting
92eb55b001 time sync protocol: handling of end mark 0xff 2020-10-09 23:02:36 +02:00
Klaus K Wilting
ac82a5f19e packed decoder modified for fix issue #659 2020-10-09 22:48:15 +02:00
Klaus K Wilting
0f1ab7e89e small code sanitizations 2020-10-09 22:47:04 +02:00
Klaus K Wilting
0d7683fdcc fix missing clearance of timesync pending flag 2020-10-09 22:46:45 +02:00
Klaus K Wilting
93408a9e81 fix for gps time sync 2020-10-09 22:45:44 +02:00
Klaus K Wilting
d34b164537 fix issue #655 2020-10-09 22:44:52 +02:00
Klaus K Wilting
2375d4943e fix control flow for time sync sequence indexing 2020-10-09 21:43:53 +02:00
Klaus K Wilting
e3858eceef Don't clear ENS count in cumulative mode 2020-10-09 19:56:29 +02:00
Klaus K Wilting
56521fe9fb configmanager.cpp: ENS count default added 2020-10-09 18:50:43 +02:00
Klaus K Wilting
287e8dbc20 fix issue #659 2020-10-09 16:42:53 +02:00
Klaus K Wilting
4286e4b8b3 small code sanitizations 2020-10-05 21:57:45 +02:00
Klaus K Wilting
d530187130 configmanager bugfix 2020-10-05 15:41:49 +02:00
Klaus K Wilting
b28a86c9a2 revert change in ttgov21new.h (not yet functional) 2020-10-05 14:07:19 +02:00
Klaus K Wilting
092842a4c0 PR #653 merged and added some corrections 2020-10-05 13:56:41 +02:00
Verkehrsrot
ae80ac7f7f
Merge pull request #653 from ChrSchultz/development
Created Remotecommand for switching on/of ENS-Counter
2020-10-05 13:46:12 +02:00
Klaus K Wilting
69235b94d7 gps time sync improvements 2020-10-05 13:40:22 +02:00
Chrisotph Schultz
d3bf77d1e7 added rcmd 0x18 for switching off/on ENS 2020-10-05 12:58:05 +02:00
Chrisotph Schultz
0e2a4e6893 Revert " corrected some errors"
This reverts commit 98c2ad3838.
2020-10-05 12:49:54 +02:00
Chrisotph Schultz
98c2ad3838 corrected some errors 2020-10-05 12:40:33 +02:00
Chrisotph Schultz
21d94247bd merged v2.0.17 2020-10-05 00:11:53 +02:00
Klaus K Wilting
eece72cef0 v2.0.17 2020-10-04 23:22:48 +02:00
Klaus K Wilting
b34f6f892c gpsread.cpp: comments edited 2020-10-04 23:17:39 +02:00
Klaus K Wilting
b0d3dfebb5 gpsread.cpp: NMEA ZDA processing improved 2020-10-04 23:13:17 +02:00
Chrisotph Schultz
cae92514bb adding Set ENS counter on/off via rcomd 0x18 00|01 2020-10-04 22:58:29 +02:00
Klaus K Wilting
5dc44a02fb configmanager comments added 2020-10-04 19:32:22 +02:00
Klaus K Wilting
ad72fa9e41 configmanager cleanups 2020-10-04 19:25:49 +02:00
Klaus K Wilting
414bc41404 configmanager: enhancements for version migration 2020-10-04 19:10:36 +02:00
Chrisotph Schultz
a90f3d07da updated bord comment to //ttgo-lora32-v21new 2020-10-04 15:42:38 +02:00
Klaus K Wilting
1186b000b6 some function renames for better code readability 2020-10-04 14:29:57 +02:00
Klaus K Wilting
502434abc4 configmanager: improved error handling 2020-10-04 13:15:17 +02:00
Klaus K Wilting
c7fcf438e6 configmanager.cpp cleanup 2020-10-03 12:41:35 +02:00
Klaus K Wilting
85c235573b configmanager .cpp: some corrections after rewrite 2020-10-03 12:14:07 +02:00
Klaus K Wilting
ef84966917 rewrite configmanager (experimental) 2020-10-02 23:07:24 +02:00
Klaus K Wilting
31765e3b65 paxcounter_orig.conf: default countermode corr'd 2020-10-02 22:58:41 +02:00
Klaus K Wilting
963d9dbb5f correction to bugfix issue#649 2020-10-01 22:33:33 +02:00
Klaus K Wilting
c8f8b7c1a4 fix issue#649 2020-10-01 15:39:54 +02:00
Klaus K Wilting
25ef6a5eca paxcounter_orig.conf indents corrected 2020-09-29 22:06:31 +02:00
Klaus K Wilting
3b66add7d1 timekeeper.cpp: comments edited 2020-09-29 17:28:27 +02:00
Klaus K Wilting
8a8d3a8f1a rename loraconf_sample.h 2020-09-29 17:28:10 +02:00
Klaus K Wilting
73104cafeb gpsread.cpp: comments edited 2020-09-29 17:27:52 +02:00
Verkehrsrot
9ac365d9ea
Merge pull request #648 from oseiler2/GpsDrivenTimeSynch
Gps driven time synch
2020-09-29 17:20:55 +02:00
Christoph Schultz
50b0e8cb0d
Rename loarconf_sample_h to loarconf_sample.h 2020-09-29 08:05:41 +02:00
Christoph Schultz
0d4cc0372d
Update loarconf_sample_h 2020-09-29 08:00:22 +02:00
Oliver Seiler
0a510a0c33 Improved time synch handling for GPS based time
This will update the time from GPS on first valid time received by GPS.
2020-09-29 18:59:53 +13:00
Christoph Schultz
9c8b41105e
Update paxcounter_orig.conf
remade original settings
2020-09-28 22:17:59 +02:00
Oliver Seiler
cbaf705c15 Merge remote-tracking branch 'remotes/origin/master' into GpsDrivenTimeSynch 2020-09-28 11:45:29 +13:00
Christoph Schultz
c9680e665e
Delete paxcounter.conf 2020-09-27 23:26:21 +02:00
Chrisotph Schultz
db281e11f9 created paxcounter_orig.conf and platformio_orig.ini, added platformio.ini and paxcounter.conf to .gitignore and update Readme.md 2020-09-27 23:15:50 +02:00
Oliver Seiler
1c40572c9b Synch time from GPX on first valid GPS time received 2020-09-28 09:49:41 +13:00
Chrisotph Schultz
c802ad2c46 Merge remote-tracking branch 'refs/remotes/origin/master' 2020-09-27 19:29:46 +02:00
Chrisotph Schultz
e117f6945f done chages 2020-09-27 19:29:31 +02:00
Klaus K Wilting
14921ee266 macsniff.cpp: reduce logging on level debug 2020-09-27 18:23:48 +02:00
Klaus K Wilting
44b990be38 ttgobean.h removed display default on 2020-09-27 18:19:16 +02:00
Klaus K Wilting
01f990d17f fix issue#642 2020-09-27 18:03:12 +02:00
Klaus K Wilting
5073c00f17 sensor.cpp: comment for ENS count added 2020-09-27 18:00:28 +02:00
Oliver Seiler
19710bae4b Fixing issue #639 in a better way, that ensures TIME_SYNC_INTERVAL_RETRY is used over TIME_SYNC_INTERVAL when GPS time was invalid 2020-09-27 20:39:02 +13:00
Oliver Seiler
53570d7ccf Add sub band channel selection for AU915
Also see https://github.com/mcci-catena/arduino-lmic/commits/master/examples/ttn-abp/ttn-abp.ino
2020-09-27 18:19:02 +13:00
Oliver Seiler
74239d77f4 Fix: issue #639, if no LORA time source available and GPS time in first call is invalid, then time will never get updated from GPS
https://github.com/cyberman54/ESP32-Paxcounter/issues/639
2020-09-27 17:35:27 +13:00
Klaus K Wilting
3e0102920a main.cpp: update copyright notice 2020-09-26 21:22:55 +02:00
Klaus K Wilting
deba557ee9 lorawan.cpp: bugfix in myBattLevelCb() 2020-09-26 21:21:28 +02:00
Chrisotph Schultz
a9f19d4459 set configs 2020-09-25 23:41:43 +02:00
Klaus K Wilting
e38eae90e2 CWA detection improved (Issue #636) 2020-09-24 22:29:07 +02:00
Klaus K Wilting
7a85c0f0c3 Merge branch 'master' of https://github.com/cyberman54/ESP32-Paxcounter 2020-09-21 16:42:46 +02:00
Klaus K Wilting
715663617c remove "PAX" from display to show higher numbers 2020-09-21 16:42:19 +02:00
Klaus K Wilting
62674e80d3 paxcounter.conf: default port for gps corrected 2020-09-21 16:41:20 +02:00
Verkehrsrot
7bfb1aff27
paxcounter.conf: default settings corrected 2020-09-16 11:26:14 +02:00
Klaus K Wilting
da845993dd code sanitizations (fix some compiler warnings) 2020-09-12 22:39:04 +02:00
Klaus K Wilting
f2b6e12bc9 BLE install logic changed (issue #612) 2020-09-12 19:11:13 +02:00
Klaus K Wilting
2a9469422c wifi/bt coexist code sanitization 2020-09-12 13:58:18 +02:00
Verkehrsrot
6d29855d92
Update paxcounter.conf 2020-09-05 14:40:23 +02:00
Klaus K Wilting
26b6896353 display.cpp: small mask fixes 2020-09-05 14:25:14 +02:00
Klaus K Wilting
ae106406a1 CWA settings 2020-09-04 20:37:47 +02:00
Klaus K Wilting
0f6e08e7e1 CWA code edits 2020-09-03 16:37:51 +02:00
Klaus K Wilting
2f0b3c8ef2 CWA scanner minor modifications 2020-09-02 18:55:06 +02:00
Klaus K Wilting
c014824667 CWA detection (experimental) 2020-09-02 11:21:56 +02:00
Klaus K Wilting
2c15b29255 bugfix timesync LORASERVER (issue #625) 2020-09-02 11:20:43 +02:00
August Quint
ec54f3e2e3
Update paxcounter.conf
set to standard-values
2020-09-01 16:30:27 +02:00
August Quint
9c1d03d886
Update sensor.cpp
added: CWA-handling
2020-09-01 12:02:21 +02:00
August Quint
98302a9530
Update display.cpp
added: CWA-handling
2020-09-01 12:01:00 +02:00
August Quint
1f388d6430
Update blecsan.cpp
added: CWA-handling
2020-09-01 11:59:00 +02:00