DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,194 Commits 1 Branch 0 Tags 40 MiB
1d7753feac
Commit Graph

2022 Commits

Author SHA1 Message Date
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
August Quint
b8fc516a01
Update senddata.cpp 
added: CWA-handling
 2020-09-01 11:57:45 +02:00
August Quint
c15d8cb893
Update main.cpp 
added: CWA-handling
 2020-09-01 11:56:21 +02:00
August Quint
e9800db481
Update macsniff.cpp 
added: CWA-handling
 2020-09-01 11:53:49 +02:00
August Quint
ad288b7058
Update sdcard.cpp 
added: CWA-handling
 2020-09-01 11:52:07 +02:00
August Quint
2a2ee35c59
Create coona.cpp 
added: CWA-handling
 2020-09-01 11:50:28 +02:00
August Quint
add5b8ca2d
Update ttgov21new.h 
corrected: SD-card
 2020-09-01 11:49:17 +02:00
August Quint
d36579c8d0
Update paxcounter.conf 
added: CWA-handling
 2020-09-01 11:48:19 +02:00
Verkehrsrot
b2922b1ea3
Merge pull request #624 from cyberman54/development 
hint on bintray usage added
 2020-08-16 13:48:20 +02:00
Klaus K Wilting
8f054ea64d hint on bintray usage added 2020-08-16 13:46:37 +02:00
Verkehrsrot
4c2aad8e24
Merge pull request #620 from cyberman54/development 
Development
 2020-07-29 10:53:46 +02:00
Klaus K Wilting
ae74b097d4 RTC lib update 2020-07-29 10:50:40 +02:00
Klaus K Wilting
48cdb06c2c small cleanups 2020-07-19 16:03:15 +02:00
Klaus K Wilting
6b785fedd7 mqtt lib changed (experimental) 2020-06-20 15:04:03 +02:00
Klaus K Wilting
c51a45cfd0 typo 2020-06-19 21:44:15 +02:00
Klaus K Wilting
8f46feaf33 ttgobeamv10.h edited 2020-06-19 14:10:40 +02:00
Klaus K Wilting
d555656852 MQTT client enhanced (experimental) 2020-06-16 20:29:49 +02:00
Klaus K Wilting
55315b7301 m5fire.h note added 2020-06-16 18:04:56 +02:00
Klaus K Wilting
6ec85c20c4 removed unused var macs_total 2020-06-16 18:01:05 +02:00
Verkehrsrot
48d57f137a
Merge pull request #609 from cyberman54/development 
Development
 2020-06-06 21:16:47 +02:00
Klaus K Wilting
7f16cd430c ttgov21new.h: change SD interface SPI -> SDMMC 2020-06-06 21:16:04 +02:00
Klaus K Wilting
6c24aea7e4 sdcard.cpp edits 2020-06-06 21:15:31 +02:00
Verkehrsrot
956ea2f879
Merge pull request #608 from cyberman54/development 
v1.9.996
 2020-06-06 15:22:21 +02:00
Klaus K Wilting
48cbe53cee timekeeper.cpp: removed lora check 2020-06-06 15:15:40 +02:00
Klaus K Wilting
271f5edd00 ttgobeamv10.h display removed 2020-06-06 15:09:35 +02:00
Klaus K Wilting
5dd5c481ad sdcard code sanitizations 2020-06-06 15:09:12 +02:00
Klaus K Wilting
46cc027ee4 display.cpp: check display type setting 2020-06-02 16:34:53 +02:00
Klaus K Wilting
014bae059e mqtt client test (experimental) 2020-05-22 00:07:49 +02:00
Klaus K Wilting
05e5d31a53 mqtt client (experimental) 2020-05-21 19:42:42 +02:00
Klaus K Wilting
9c0b504841 mqtt test (experimental) 2020-05-20 18:29:07 +02:00
Klaus K Wilting
98789a7dd5 disable SD card on Olimex-POE (currently broken) 2020-05-20 12:41:03 +02:00
Klaus K Wilting
c5635f59b2 mqtt code sanitizations 2020-05-20 12:40:37 +02:00
Klaus K Wilting
897343a96a m5core.h: bugfix PSRAM 2020-05-20 12:40:14 +02:00
Verkehrsrot
de9f01bb01
Update m5core.h 2020-05-18 10:52:45 +02:00
Klaus K Wilting
c5c9e933d4 MQTT client (experimental) 2020-05-17 23:07:38 +02:00
Klaus K Wilting
73ee2df3d4 Ethernet MQTT client (experimental) 2020-05-16 23:49:34 +02:00
Klaus K Wilting
10616ffc52 sdcard fix 2020-05-16 18:01:00 +02:00
Klaus K Wilting
011dc171c1 olimexpoe hal file updated 2020-05-16 15:30:45 +02:00
Klaus K Wilting
6e487983b5 SD card reader native mode added 2020-05-16 15:30:05 +02:00
Klaus K Wilting
2b46a69dbe revert display lib driver handling & update lmic 2020-05-15 18:30:21 +02:00
Klaus K Wilting
cfb40d300c new board olimex-poe added 2020-05-15 18:00:07 +02:00
Klaus K Wilting
cdf60c6df9 changed ssoled to OneBitDisplay library 2020-05-09 23:38:51 +02:00
Klaus K Wilting
c7441ad58a display library select added 2020-05-09 22:49:00 +02:00
Klaus K Wilting
62d28c54b6 charge current control added 2020-05-09 22:48:29 +02:00
Klaus K Wilting
b2254540c2 AXP192 charge current user settings 2020-05-09 13:42:08 +02:00
Klaus K Wilting
2a7c020e1b do i2cscan earlier in main.cpp 2020-05-09 13:41:19 +02:00
Klaus K Wilting
c4c817828e T-Beam v10 chare current control added (#604) 2020-05-09 12:22:29 +02:00
Klaus K Wilting
e6d838bc2b RGB LED color fix 2020-05-02 17:25:04 +02:00
Klaus K Wilting
f91b3fa016 battery monitor fixes 2020-05-02 17:24:52 +02:00
Klaus K Wilting
5818c8d1d3 RGB LED colors slightly changed 2020-05-01 12:39:59 +02:00
Klaus K Wilting
b15d59f012 compiler warnings sanitizations 2020-05-01 12:24:52 +02:00
Klaus K Wilting
cce3589858 i2c.h/.cpp: add IP5306 address 2020-05-01 12:23:46 +02:00
Klaus K Wilting
904394a200 bugfix battery level status display IP5306 2020-04-20 17:05:12 +02:00
Klaus K Wilting
2624f7b35b M5 battery monitor improved (read IP5306 chip) 2020-04-19 19:51:23 +02:00
Klaus K Wilting
53be14d8a6 battery level code switched to callback 2020-04-14 10:57:30 +02:00
Klaus K Wilting
0531a3fda8 battery level processing fix 2020-04-14 09:57:02 +02:00
Klaus K Wilting
af02c2c661 battery level calculation fixes 2020-04-14 00:15:51 +02:00
Klaus K Wilting
316517337a battery percentage calculation improved 2020-04-13 22:07:26 +02:00
Klaus K Wilting
1e8671984c battery level calculation fixes 2020-04-13 15:07:27 +02:00
Klaus K Wilting
dda9cc5802 batt level fixes 2020-04-12 22:14:15 +02:00
Klaus K Wilting
60391792d1 battery level display fixes 2020-04-12 22:12:13 +02:00
Verkehrsrot
9e52874d4b
Merge branch 'master' into development 2020-04-12 19:39:00 +02:00
Klaus K Wilting
4a1499b2bb battery percentage display fixes 2020-04-12 17:33:13 +02:00
Klaus K Wilting
bf2d32896f battery percentage display fixes 2020-04-11 23:36:17 +02:00
Klaus K Wilting
f4e8c67117 Battery percentage display 2020-04-11 21:30:09 +02:00
Klaus K Wilting
90a004ec79 prepare LMIC battlevel MAC request 2020-04-10 23:26:29 +02:00
Klaus K Wilting
a6cbc2479e compiler warning sanitizations 2020-04-10 22:56:17 +02:00
Klaus K Wilting
438b3485e5 compiler warning sanitizations 2020-04-10 22:37:18 +02:00
Klaus K Wilting
99b67deaec M5 display support fixes 2020-04-10 22:27:37 +02:00
Klaus K Wilting
bdcd05cb21 M5 display support fixes 2020-04-10 18:40:40 +02:00
Klaus K Wilting
4584a5a34b M5 display support (experimental) 2020-04-06 17:40:45 +02:00
Klaus K Wilting
59930870fd enhanced RGB LED control for M5fire 2020-04-06 11:53:55 +02:00
Klaus K Wilting
67cede2886 lmic_config.h: bugfix pycom boards 2020-04-06 11:53:38 +02:00
Klaus K Wilting
2d45c599bd M5stack display support (experimental) 2020-04-05 23:22:31 +02:00
Klaus K Wilting
a56c534195 M5stack display support (experimental) 2020-04-05 23:01:39 +02:00
Klaus K Wilting
70d836d2f6 M5stack display support (experimental) 2020-04-05 18:19:39 +02:00
Klaus K Wilting
07d5b18cc1 payload.cpp: sanitized 2020-04-03 18:33:05 +02:00
Verkehrsrot
3b065bb13a
Update payload.cpp 2020-04-03 17:03:05 +02:00
Klaus K Wilting
886587cacb display.cpp: bugfix (issue #583) 2020-04-01 21:04:17 +02:00
Verkehrsrot
0ac5e2a925
Update ttgov21new.h 2020-04-01 15:21:05 +02:00
Klaus K Wilting
0de6d61e26 bugfix ttgov21new.h (issue #583) 2020-04-01 15:12:48 +02:00
Klaus K Wilting
2f8301d36a M5 display support (experimental) 2020-03-29 23:05:42 +02:00
Klaus K Wilting
e2af3e0951 M5 TFT display support (experimental) 2020-03-29 20:08:30 +02:00
Klaus K Wilting
bb0f1fd10a M5 hal files corrections 2020-03-29 19:58:50 +02:00
Klaus K Wilting
7fcf93a655 M5 TFT display initial commit (experimental) 2020-03-29 19:41:33 +02:00
Klaus K Wilting
62c30a1684 #include cleanup 3 2020-03-29 18:11:24 +02:00
Klaus K Wilting
87d93f6978 #include cleanup 2020-03-29 18:08:52 +02:00
Klaus K Wilting
11e91bbd00 timesync.cpp small debug msg change 2020-03-29 17:03:55 +02:00
Verkehrsrot
d14fb2cfc7
Merge pull request #581 from cyberman54/development 
v1.9.982
 2020-03-29 12:58:29 +02:00
Klaus K Wilting
4029d545a2 display support reworked, prepared for TFT/LCD 2020-03-29 12:10:42 +02:00
Klaus K Wilting
b9481f459d paxocunter.conf: remove timediffport 2020-03-29 11:59:31 +02:00
Dierk Arp
714ed1675c Update ttgov1.h 
issue #577:  Pin DIO2 of SX1276 is connected to pin 32
 2020-03-24 07:50:49 +01:00
Klaus K Wilting
090657ac82 enhanced RGB LED control: use more than 1 LED 2020-03-21 08:38:42 +01:00
Julian Flake
e7d5df6f4b Fix i2c address for OLED on TTGOv1 (use 0x3C instead of 0x3D) 2020-03-17 22:37:18 +01:00
Klaus K Wilting
8dde6bb13b fixed error in Lorawan network timesync 2020-03-17 20:45:17 +01:00
Klaus K Wilting
4d5417cd6f Merge branch 'development' of https://github.com/cyberman54/ESP32-Paxcounter into development 2020-03-16 19:15:14 +01:00
Klaus K Wilting
5096cd8751 loraconf.sample.h edited 2020-03-16 19:13:01 +01:00
Julian Flake
8e41894a0b Updated README.md and comments in loraconf.h.sample to reflect ABP modifications 2020-03-16 00:08:59 +01:00
Verkehrsrot
0375185f68
Merge pull request #501 from nuthub/development 
Implemented ABP configuration (on development branch)
 2020-03-15 22:11:05 +01:00
Klaus K Wilting
64b3a2c491 timesync.cpp fixes 2020-03-15 20:21:26 +01:00
Klaus K Wilting
9abd0e7a07 switch AES to avoid compiler warnings in lmic.c 2020-03-15 18:09:41 +01:00
Klaus K Wilting
10c96759f4 code sanitizations (eleminate compiler warnings) 2020-03-15 13:04:03 +01:00
Klaus K Wilting
a85f84ede4 m5core.h m4fire.h bugfix lora pins 2020-03-14 18:46:39 +01:00
Klaus K Wilting
25eaeab2b5 ttgov21new.h sds & bme settings removed 2020-03-14 08:20:51 +01:00
Verkehrsrot
ffa4c6d1c6
Merge pull request #570 from cyberman54/development 
update branch sds011 to dev
 2020-03-14 07:52:07 +01:00
Verkehrsrot
8392b8c308
Merge branch 'SDS011' into SDS011 2020-03-14 07:38:22 +01:00
August Quint
d818b6ecf4
Update payload.cpp 2020-03-13 15:41:07 +01:00
August Quint
0c91c55cd4
Update payload.cpp 2020-03-13 15:29:20 +01:00
August Quint
8520afcf8d
Update payload.cpp 2020-03-13 15:25:18 +01:00
Julian Flake
4127588752 Implemented ABP configuration 2020-03-12 15:23:56 +01:00
Klaus K Wilting
aaf127f5e8 gpsread code sanitizations 2020-03-11 23:49:24 +01:00
Klaus K Wilting
42ee21a2f7 timesync code sanitziations 2020-03-11 23:49:06 +01:00
Klaus K Wilting
e8664c8505 update display lib 2020-03-11 23:47:56 +01:00
Klaus K Wilting
1057a25fc4 gpsread code sanitizations 2020-03-11 23:47:33 +01:00
Klaus K Wilting
aa042f6968 update display lib 2020-03-11 23:47:16 +01:00
Klaus K Wilting
1da355b7b0 further fixes in timesync.cpp 2020-03-08 16:15:46 +01:00
Klaus K Wilting
3ab9cf5a42 MAC decode printout tuned 2020-03-08 16:15:16 +01:00
Klaus K Wilting
bf4f3c0e8f timesync.cpp comments polished 2020-03-07 23:47:36 +01:00
Klaus K Wilting
f5399d8108 timesync code refactored 2020-03-07 23:18:36 +01:00
Klaus K Wilting
85c342e3d7 bugfix timekeeper.cpp fallback logic 2020-03-07 19:41:27 +01:00
Klaus K Wilting
1467d2145b timesync code refactoring 2020-03-07 19:41:08 +01:00
Klaus K Wilting
27dfdadd71 bugfix nodered timeserver 2020-03-07 19:24:34 +01:00
Klaus K Wilting
cf29505c84 fix SNR display bug 2020-03-07 13:00:22 +01:00
Klaus K Wilting
3bc5d5a13f fix fCounter display offset by 1 bug 2020-03-07 12:52:46 +01:00
Klaus K Wilting
a7f0ee61b3 rcommand.cpp small fix 2020-03-07 00:06:15 +01:00
Klaus K Wilting
c79a36ef3b mac_decode code sanitized 2020-03-07 00:03:05 +01:00
Klaus K Wilting
63fd681c3b MAC command mac_decode calls 2020-03-06 22:22:58 +01:00
Klaus K Wilting
3187fb0d51 paxcounter.conf: timesync settings restructured 2020-03-06 19:27:11 +01:00
Klaus K Wilting
73a612779b deeply reworked timesync code 2020-03-06 19:24:58 +01:00
Klaus K Wilting
f1b13f11fa timeserver: removed timezone format 2020-03-06 19:23:51 +01:00
Klaus K Wilting
7ba2186ac1 timesync.cpp: minor code beautifications 2020-03-05 01:30:07 +01:00
Klaus K Wilting
fbfb03ef81 timesync.cpp: minor sanitizations 2020-03-04 23:39:28 +01:00
Klaus K Wilting
1d2a2a5876 timesync with network is now default setting 2020-03-04 21:59:38 +01:00
Klaus K Wilting
2cf52f1af6 big timesync code sanitization 2020-03-04 21:54:26 +01:00
Klaus K Wilting
3f2c08432d timeserver.java added (as found in nodered json) 2020-03-04 15:11:50 +01:00
Klaus K Wilting
58c39171c7 timesync.cpp: remove a debug logging 2020-03-03 20:16:36 +01:00
Klaus K Wilting
efd0cc3819 lorawan.cpp: code sanitizations 2020-03-03 16:52:29 +01:00
Klaus K Wilting
c17bfa02af reworked lora appserver timesync logic (part 2) 2020-03-03 16:38:29 +01:00
Klaus K Wilting
1516d71018 reworked lora appserver timesync logic (part 1) 2020-03-03 12:54:42 +01:00
Klaus K Wilting
0f2e48f39c timekeeper.h: bugfix time source debug log 2020-03-03 12:54:00 +01:00
Klaus K Wilting
4d3390383e lorawan.cpp: enhance RX/TX callback functions 2020-03-03 12:53:30 +01:00
Klaus K Wilting
36f0a6255a timesync.cpp: adjust lora time calibration 2020-03-02 00:12:57 +01:00
Klaus K Wilting
785cb4068a timesync.cpp: fixed major bug in lora time sync 2020-03-01 23:49:52 +01:00
Klaus K Wilting
d180a56fd1 ex post clean solution for issue #510 2020-03-01 16:18:17 +01:00
August Quint
d18403a84a
Cayenne: added code for PM-values 2020-02-28 16:12:16 +01:00
Klaus K Wilting
f00397929b enhanced Lora runtime parameter display 2020-02-26 00:40:09 +01:00
Klaus K Wilting
39f99043d6 SDS011 code sanitizations 2020-02-25 22:18:20 +01:00
Klaus K Wilting
417c3c7e69 Merge branch 'SDS011' of https://github.com/cyberman54/ESP32-Paxcounter into SDS011 2020-02-25 21:16:23 +01:00
Klaus K Wilting
2cb5325181 ESP32 platform update; show more Lora Params 2020-02-25 20:23:41 +01:00
August Quint
cfe877ff70
Update sds011read.cpp 2020-02-25 17:22:31 +01:00
August Quint
8380f9651e
Merge branch 'SDS011' into master 2020-02-25 17:04:28 +01:00
August Quint
96ab12420f
Update senddata.cpp 2020-02-25 16:01:02 +01:00
August Quint
497c738405
Update sds011read.cpp 2020-02-25 15:56:11 +01:00
August Quint
f3218b4266
Update ttgov21new.h 2020-02-25 15:47:15 +01:00
August Quint
ad3cd8bf9e
Update generic.h 2020-02-25 15:46:13 +01:00
August Quint
d0ffe9ab7e
Update sdcard.cpp 2020-02-25 15:44:56 +01:00
August Quint
b674b5e1b0
Update sds011read.cpp 2020-02-25 15:43:54 +01:00
August Quint
0d18feb29d
Update sds011read.cpp 2020-02-25 15:41:12 +01:00
August Quint
25d4d9d047
Update ttgov21new.h 2020-02-19 13:58:58 +01:00
August Quint
40c27f8c66
Update sds011read.cpp 2020-02-19 13:57:21 +01:00
Verkehrsrot
6e66d6a296 Merge pull request #551 from cyberman54/master 
sync sds011 to master
 2020-02-10 09:29:57 +01:00
Verkehrsrot
94d4f2f445 M5stack support & lib updates 2020-02-08 13:40:28 +01:00
Verkehrsrot
9f993e6ccf Merge pull request #548 from cyberman54/master 
sync dev to master
 2020-02-08 13:13:54 +01:00
Verkehrsrot
8da544f60f Merge pull request #547 from AugustQu/SDS011 
Sds011
 2020-02-08 12:56:57 +01:00
Verkehrsrot
f8db281869 OLED display reset now by oledInit() 2020-02-07 22:57:06 +01:00
Verkehrsrot
fa2920340c SDS011read.cpp: bugfix conditional compile 2020-02-06 16:53:50 +01:00
August Quint
853bddd265
Update senddata.cpp 
removed some debug-info
 2020-02-06 14:30:04 +01:00
August Quint
66e760391d
Update cyclic.cpp 
removed some debug-info
 2020-02-06 14:29:23 +01:00
Cornelio Hopmann
d1563e59bb Added: RGB LED Support 2020-02-05 23:06:05 +01:00
Verkehrsrot
867c5477df sds011 code sanitizations 2020-02-05 22:13:30 +01:00
Cornelio Hopmann
7500ef38b8 Experimental: M5Stack Support 
+ Fixed case-sensitie board name (Linux)
+ Added M5Stack Fire board
+ WiFi sniffing tested with verbose mode (NO LoRa or GPS)
 2020-02-05 22:03:22 +01:00
Verkehrsrot
bc198b722b
Merge pull request #544 from cyberman54/master 
sync sds011 with master
 2020-02-05 19:43:02 +01:00
August Quint
090a1c6e35
Update senddata.cpp 
copy+paste-error corrected
 2020-02-05 16:25:25 +01:00
August Quint
ddf06b4913
Update timekeeper.cpp 
copy+paste-error corrected
 2020-02-05 16:03:29 +01:00
August Quint
c80e7aa7a5
Update main.cpp 
copy+paste-error corrected
 2020-02-05 16:02:04 +01:00
August Quint
18a0c5f547
Update sdcard.cpp 
copy+paste-error corrected
 2020-02-05 15:58:32 +01:00
August Quint
d6e4ba16e7
Update payload.cpp 
copy+paste-error corrected
 2020-02-05 15:57:33 +01:00
August Quint
f5faf31a2a
Update cyclic.cpp 
copy+paste-error corrected
 2020-02-05 15:55:54 +01:00
Verkehrsrot
4ee9ff7bf5 SS_OLED library update 2020-02-04 14:05:46 +01:00
August Quint
1cfe16b33c
Update main.cpp 2020-02-03 15:31:49 +01:00
August Quint
3621cfcc52
Update payload.cpp 2020-02-03 15:31:06 +01:00
August Quint
f35014cab8
Update senddata.cpp 2020-02-03 15:30:15 +01:00
August Quint
766ef6c888
Update cyclic.cpp 2020-02-03 15:29:32 +01:00
August Quint
9e1cb5fbc0
Update timekeeper.cpp 2020-02-03 15:28:45 +01:00
August Quint
14baacc4bf
Update sdcard.cpp 2020-02-03 15:27:49 +01:00
August Quint
8fe69a9130
Update sds011read.cpp 2020-02-03 15:26:57 +01:00
Verkehrsrot
298ded12d4 externalized Bosch BSEC library 2020-01-28 21:49:24 +01:00
Verkehrsrot
40d021ab9d heltecv2.h bugfix Lora SCK pin 2020-01-28 21:41:20 +01:00
Verkehrsrot
edf038d6f2 M5stack Basic core support (experimental) 2020-01-27 20:11:55 +01:00
Verkehrsrot
440aba71ed
Merge pull request #536 from AugustQu/SDS011 
SDS011
 2020-01-22 19:11:38 +01:00
August Quint
b5250a21ed
added support for SDS011 2020-01-22 15:51:49 +01:00
August Quint
c1411e5c1b
added support for SDS011 2020-01-22 15:49:07 +01:00
Verkehrsrot
3ce4108707
Merge pull request #529 from AugustQu/patch-6 
plus modifications for SDS011
 2020-01-21 21:28:20 +01:00
Verkehrsrot
20a7cf88a2
Merge pull request #528 from AugustQu/patch-7 
initial
 2020-01-21 21:28:11 +01:00
Verkehrsrot
210efbb0b9
Merge pull request #525 from AugustQu/patch-10 
plus code for SDS011
 2020-01-21 21:27:41 +01:00
August Quint
dbaf2dbf6d
plus code for SDS011 2020-01-21 15:03:07 +01:00
August Quint
788ff354dc
plus code for SDS011 2020-01-21 15:00:35 +01:00
August Quint
aacadda01d
initial 2020-01-21 14:56:02 +01:00
August Quint
c545136c06
plus modifications for SDS011 2020-01-21 14:54:35 +01:00
Verkehrsrot
18eb82e96c bugfix auto page flip 2020-01-20 11:45:11 +01:00
Verkehrsrot
f960627910 auto page flip mode 2020-01-20 11:41:31 +01:00
Verkehrsrot
5cb51b2ff0 bugfix display page flip loop 2020-01-20 11:12:00 +01:00
Verkehrsrot
e8abe8567b skip display pages with no content (issue #523) 2020-01-19 22:21:45 +01:00
Verkehrsrot
b841961894 hotfix gps position data wrong in payload 2020-01-04 19:12:50 +01:00
Verkehrsrot
acabc8b7d6 gps fix detection enhanced 2020-01-03 09:59:10 +01:00
Verkehrsrot
1414ebd421 Show pressure with BMP180/BME280 (issue 519) 2020-01-02 15:44:09 +01:00
Verkehrsrot
2e76ae89f2 lmic_config.h updated for lmic v3.0.99.10 2020-01-01 18:25:17 +01:00
Verkehrsrot
05d489dd31 lolin32 hal files sanitized 2020-01-01 16:32:27 +01:00
Verkehrsrot
f7affae898 lolin32lora: wrong pin definitions corrected 2020-01-01 16:20:01 +01:00
Verkehrsrot
523a8155d5 lolin32litelora.h: wrong pin definitions corrected 2020-01-01 16:15:07 +01:00
Verkehrsrot
ea40041960 lmic_config.h removed clock error default 2019-12-31 11:18:20 +01:00
cyberman54
3b6d05b2af bugfix sdcard.cpp 2019-12-30 18:10:44 +01:00
cyberman54
b734f6213b sdcard.cpp: added compiler directive 2019-12-30 17:25:05 +01:00
Verkehrsrot
4e1472caae
Merge pull request #513 from cyberman54/sdcard 
add sdcard support to branch development
 2019-12-28 17:16:31 +01:00
Verkehrsrot
b9949d8eb9 bugfix in decoders plain & packed 2019-12-27 12:57:22 +01:00
Verkehrsrot
985548e73e irqhandler.cpp code sanitization 2019-12-26 16:58:42 +01:00
Verkehrsrot
fac48ed9c4 irqhandler code optimized 2019-12-26 16:55:19 +01:00
Verkehrsrot
ed1b06dd2e irqhandler.cpp: bugfix irq flag handling 2019-12-26 13:25:59 +01:00
Verkehrsrot
2544b371d8 code sanitization 2019-12-25 23:25:51 +01:00
Verkehrsrot
dbed27fb32 cyclic.cpp bugfix battery low 2019-12-25 23:22:11 +01:00
Verkehrsrot
ad44e9f93c code sanitization gps_status 2019-12-25 23:21:58 +01:00
Verkehrsrot
04aa7e1d60 removed static at some functions 2019-12-25 23:21:31 +01:00
Verkehrsrot
86c3685f6c sdcard support (experimental) 2019-12-25 23:07:34 +01:00
Verkehrsrot
6d7b392620 ss_oled update (now working) 2019-12-21 16:51:09 +01:00
Verkehrsrot
c65c32275e update ss_oled lib (experimental) 2019-12-21 15:18:42 +01:00
Verkehrsrot
12f00a9203
Merge pull request #506 from cyberman54/master 
sync dev to master
 2019-12-21 14:29:04 +01:00
Verkehrsrot
97b02d34b9 i2c functions moved from power.cpp to i2c.cpp 2019-12-21 14:27:33 +01:00
Verkehrsrot
0741e4c1ab disable ss_oled changes until lib is fixed 2019-12-15 18:21:02 +01:00
Verkehrsrot
a2274cda2c update ss_oled to 3.1.0 2019-12-15 17:49:55 +01:00
Verkehrsrot
c994a33bd9 bmesensor.cpp code sanitizations 2019-12-15 17:03:33 +01:00
Cristiano José Sulzbach
e08bf4d64a Added support for Bosch BMP180 sensor 2019-12-08 09:58:12 -02:00
Verkehrsrot
773f506940
Merge branch 'master' into combine-lora-msg 2019-11-27 22:16:07 +01:00
Verkehrsrot
d9a74bd8be main.cpp comments sanitized 2019-11-27 22:13:38 +01:00
Verkehrsrot
a7497624b7 change GPS data default off to on 2019-11-27 22:13:18 +01:00
nerdyscout
b7a640e02f enable GPS default,fix SenseBox payload,whitespace 2019-11-27 20:26:03 +00:00
nerdyscout
6feb1c1f65 gps.fix broken 2019-11-24 17:13:42 +00:00
nerdyscout
59f6bc6d28 cfg.wifiscan 2019-11-21 20:34:54 +00:00
nerdyscout
2c0cf88e0b Merge branch 'combine-lora-msg' of github.com:ttnkn/ESP32-Paxcounter into combine-lora-msg 2019-11-21 20:18:18 +00:00
nerdyscout
032cfa0f8e changes opensensebox payload struct 2019-11-21 20:18:03 +00:00
nerdyscout
30ec7f3aea Merge branch 'combine-lora-msg' into HEAD 2019-11-21 17:17:54 +00:00
nerdyscout
35646546d0 Merge branch 'combine-lora-msg2' into HEAD 2019-11-21 17:17:31 +00:00
Verkehrsrot
2252d65375 TTN settings for join 2019-11-21 17:16:36 +00:00
Verkehrsrot
28d9def1d4 disable LMIC onEvent() 2019-11-21 17:16:36 +00:00
Verkehrsrot
b5c5e3ce47 ota.cpp bugfix led define 2019-11-21 17:16:36 +00:00
Verkehrsrot
4d12aa7cec bugfix reset runmode logic 2019-11-21 17:16:36 +00:00
nerdyscout
bb227b525b additional decoder for short latLon on port4 2019-11-21 17:04:55 +00:00
nerdyscout
494a9a3586 Merge branch 'development' of github.com:cyberman54/ESP32-Paxcounter into combine-lora-msg 2019-11-20 16:47:31 +00:00
nerdyscout
ae8f4ac514 style 2019-11-19 22:41:49 +00:00
nerdyscout
8790c9f3d5 defaults 2019-11-19 22:39:36 +00:00
nerdyscout
be448a37a3 OpenSenseBox specific payload 2019-11-19 22:27:12 +00:00
Verkehrsrot
b1a0790531 sanitizations 2019-11-19 21:32:09 +01:00
Verkehrsrot
fb682196a9 octopus32.h edit notes 2019-11-19 19:48:29 +01:00
Verkehrsrot
f86fda1cb6 sanitizations in some files 2019-11-19 15:44:55 +01:00
Verkehrsrot
2c102f69a9 combined GPS data revised logic 2019-11-18 13:25:52 +01:00
Verkehrsrot
39ee7b4d82
Merge pull request #487 from cyberman54/master 
sync dev to master
 2019-11-17 14:18:37 +01:00
Verkehrsrot
e790c22792 Merge branch 'master' of https://github.com/cyberman54/ESP32-Paxcounter 2019-11-17 14:13:56 +01:00
Verkehrsrot
41fd41b59b wifiscan.cpp: fix wifi on/off 2019-11-17 14:13:48 +01:00
nerdyscout
ab82374bfa less generic, only advanced gps+counter 2019-11-17 09:32:43 +00:00
Philipp Schäfer
b56ab478ee esp_wifi v3.3 changes see https://github.com/espressif/esp-idf/issues/4311 
https://github.com/espressif/esp-idf/issues/4005
 2019-11-16 21:18:50 +01:00
Verkehrsrot
bc9d550b7d combined gps payload (issue #482) 2019-11-11 20:31:14 +01:00
Verkehrsrot
c826240d94 Wifi/BLE counter display logic improved 2019-11-11 15:23:41 +01:00