Commit Graph

534 Commits

Author SHA1 Message Date
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
e9d52ba560 globals.h: fix missing extern var channel 2021-03-31 16:28:32 +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
36363ee377 main.h: added include coexist.h 2021-03-31 09:46:51 +02:00
cyberman54
74ca49b84e main.h: added include coexist.h 2021-03-31 09:45:32 +02:00
cyberman54
7d401697f6 issue #774 2021-03-31 09:44:23 +02:00
cyberman54
7e0d2b3178 fix issue #775 2021-03-31 09:04:13 +02:00
cyberman54
e44e406500 libpax integration 5 (sanitize globals.h) 2021-03-27 23:36:39 +01:00
cyberman54
b2d6bb7dcc libpax integration 3 (remove macfilter) 2021-03-27 23:25:11 +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
97ee6d653c removed rf_load var 2021-03-25 22:30:27 +01:00
cyberman54
5777df2c48 introduce global var device clientId 2021-03-25 14:03:13 +01:00
cyberman54
cc7508aa41 libpax-only initial push 2021-03-25 10:30:38 +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
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
9060ba2f4c reset.h: RTC_runmode code sanitization 2021-03-20 21:31:04 +01:00
Verkehrsrot
74bc84b0e1
Merge pull request #753 from cyberman54/development
v2.4.0
2021-03-06 19:31:28 +01:00
cyberman54
6b3e8d00c2 maintenance mode (error handling improved) 2021-03-06 13:55:38 +01:00
cyberman54
88774d13e9 maintenance mode (1st full version) 2021-03-05 17:00:28 +01:00
Verkehrsrot
011c539035
globals.h: bugfix RTC_NOINIT 2021-03-05 16:31:05 +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
f5d5e7c6fc maintenance mode (experimental) 2021-03-03 16:20:21 +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
b5390d9e2c v2.3.0 2021-01-30 17:54:34 +01:00
cyberman54
144b59fb57 remove unneeded defines from globals.h 2021-01-10 00:34:31 +01:00
cyberman54
69a6216665 fix bitshift in irq mask 2021-01-09 23:52:29 +01:00
cyberman54
241a19148b fix bitshift in payload + configmask 2021-01-09 23:52:08 +01:00
cyberman54
3d6af69c0b repair broken rcommand processing 2021-01-07 10:37:55 +01:00
cyberman54
61c7e4c12f process rcmd via queue 2021-01-01 15:25:56 +01:00
cyberman54
98f83d9679 MQTT client rcommand completion 2020-12-30 22:25:37 +01:00
cyberman54
bf5a376926 fix issue #697 2020-12-30 22:07:50 +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
73263c3d04 externalize hash code to library 2020-12-27 23:43:45 +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
71ae40c260 code for bitmasks sanitzed 2020-12-24 16:52:07 +01:00
cyberman54
a30eab54f7 mqttclient reworked (experimental) 2020-12-23 16:31:31 +01:00
cyberman54
1ae49f8263 add spi deinit for sleep 2020-12-23 16:30:25 +01:00
cyberman54
a04e6440d4 millis() overflow logic reworked 2020-12-21 22:11:41 +01:00
cyberman54
f29f295826 change send data order to counts first 2020-12-21 22:07:24 +01:00
cyberman54
fdfd10b227 bugfix persist uptime after deep sleep 2020-12-19 22:30:34 +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
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
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
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
04a055b329 sleep cycle mode (experimental) 2020-12-04 17:32:10 +01:00
Klaus K Wilting
6896807c33 BOSCH BSEC upgrade tp 1.4.80 2020-11-21 20:38:17 +01:00
Klaus K Wilting
7ccfb427c0 rekindle channel display 2020-11-10 11:07:41 +01:00
Klaus K Wilting
86a6341101 new display RF load & remove ch display 2020-11-09 13:25:12 +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
8452347bf3 HAS_SENSOR defines sanitization 2020-11-02 18:44:06 +01:00
Klaus K Wilting
e5d13be42e eliminate usage of millis() in whole code 2020-11-02 12:39:46 +01:00
Klaus K Wilting
0673293744 new _millis function definition 2020-11-02 12:25:10 +01:00
Klaus K Wilting
8a0a3949fd fix #issue668 2020-11-01 13:45:17 +01:00
Klaus K Wilting
cf87950e27 SDMMC fix (PR #665, activating pullups) 2020-10-31 12:05:26 +01:00
Klaus K Wilting
5bbe4bee02 new _ASSERT function 2020-10-30 12:24:16 +01:00
Klaus K Wilting
f77fdffba8 i2c device scan improved 2020-10-14 10:29:13 +02:00
Klaus K Wilting
0adedc3e35 display.h: typo in defines (but had no impact) 2020-10-13 22:12:51 +02:00
Klaus K Wilting
092842a4c0 PR #653 merged and added some corrections 2020-10-05 13:56:41 +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
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
414bc41404 configmanager: enhancements for version migration 2020-10-04 19:10:36 +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
a0a041b1d1 globals.h: comment added 2020-10-03 12:33:41 +02:00
Klaus K Wilting
ef84966917 rewrite configmanager (experimental) 2020-10-02 23:07:24 +02:00
Klaus K Wilting
da845993dd code sanitizations (fix some compiler warnings) 2020-09-12 22:39:04 +02:00
Klaus K Wilting
2a9469422c wifi/bt coexist code sanitization 2020-09-12 13:58:18 +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
August Quint
f1bf16bd74
Create corona.h
added: CWA-handling
2020-09-01 16:26:30 +02:00
August Quint
dcc26a6c9e
Update macsniff.h 2020-09-01 11:36:41 +02:00
August Quint
e7b7fb1144
Update senddata.h
added: CWA-handling
2020-09-01 11:35:45 +02:00
August Quint
5007373f58
Update main.h
added: CWA-handling
2020-09-01 11:34:13 +02:00
August Quint
b288106f83
Update sdcard.h
correcting the SD-card-pins
2020-09-01 11:33:17 +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
d555656852 MQTT client enhanced (experimental) 2020-06-16 20:29:49 +02:00
Klaus K Wilting
6ec85c20c4 removed unused var macs_total 2020-06-16 18:01:05 +02:00
Klaus K Wilting
6c24aea7e4 sdcard.cpp edits 2020-06-06 21:15:31 +02:00
Klaus K Wilting
5dd5c481ad sdcard code sanitizations 2020-06-06 15:09:12 +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
c5635f59b2 mqtt code sanitizations 2020-05-20 12:40:37 +02:00
Klaus K Wilting
e0b04775e0 sdcard.h: bugfix conditional compile 2020-05-20 12:34:58 +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
6e487983b5 SD card reader native mode added 2020-05-16 15:30:05 +02:00
Klaus K Wilting
cdf60c6df9 changed ssoled to OneBitDisplay library 2020-05-09 23:38:51 +02:00
Klaus K Wilting
62d28c54b6 charge current control added 2020-05-09 22:48:29 +02:00
Klaus K Wilting
cce3589858 i2c.h/.cpp: add IP5306 address 2020-05-01 12:23:46 +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
c8a5896043 power.h sanitization 2020-04-13 23:47:59 +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
60391792d1 battery level display fixes 2020-04-12 22:12:13 +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
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
a56c534195 M5stack display support (experimental) 2020-04-05 23:01:39 +02:00
Klaus K Wilting
2f8301d36a M5 display support (experimental) 2020-03-29 23:05:42 +02:00
Klaus K Wilting
7fcf93a655 M5 TFT display initial commit (experimental) 2020-03-29 19:41:33 +02:00
Klaus K Wilting
a90889dce3 #include cleanup 2 2020-03-29 18:09:52 +02:00
Klaus K Wilting
87d93f6978 #include cleanup 2020-03-29 18:08:52 +02:00
Klaus K Wilting
4029d545a2 display support reworked, prepared for TFT/LCD 2020-03-29 12:10:42 +02:00
Julian Flake
e7d5df6f4b Fix i2c address for OLED on TTGOv1 (use 0x3C instead of 0x3D) 2020-03-17 22:37:18 +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
f33494b84f
Update payload.h 2020-03-13 15:35:42 +01:00
August Quint
8f7ba2943f
Update payload.h 2020-03-13 15:33:47 +01:00
August Quint
406f71eea5
Update payload.h 2020-03-13 15:23:22 +01:00
Klaus K Wilting
42ee21a2f7 timesync code sanitziations 2020-03-11 23:49:06 +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
795ca18f6a remove old functions from timekeeper.h 2020-03-08 16:14:37 +01:00
Klaus K Wilting
f5399d8108 timesync code refactored 2020-03-07 23:18:36 +01:00
Klaus K Wilting
1467d2145b timesync code refactoring 2020-03-07 19:41:08 +01:00
Klaus K Wilting
c79a36ef3b mac_decode code sanitized 2020-03-07 00:03:05 +01:00
Klaus K Wilting
73a612779b deeply reworked timesync code 2020-03-06 19:24:58 +01:00
Klaus K Wilting
2cf52f1af6 big timesync code sanitization 2020-03-04 21:54:26 +01:00