Commit Graph

2093 Commits

Author SHA1 Message Date
cyberman54
7f6cea2e02 preparations for upgrade to arduino-espressif v2.x 2022-02-21 10:45:27 +01:00
cyberman54
b63f466905 fix LORA preprocessor directives 2022-02-21 10:44:13 +01:00
Verkehrsrot
19ade61e66
Merge pull request #855 from cyberman54/development
v3.2.0
2022-02-16 21:20:12 +01:00
cyberman54
e4d6aea362 sds011 final fixes for new lib 2022-02-16 17:40:40 +01:00
cyberman54
f8d3780b2c sds011 more cleanups 2022-02-16 00:47:17 +01:00
cyberman54
9dc3f03b62 sds011 cleanups after moving to new lib 2022-02-16 00:07:41 +01:00
cyberman54
641b0ad7a2 bugfix curve plotter zero drops 2022-02-15 21:58:20 +01:00
cyberman54
a1461be403 make libpax count_payload_t varables local 2022-02-14 21:34:19 +01:00
cyberman54
736d51a142 gpsread.cpp: fix removal TIM_TP5 2022-02-14 20:49:23 +01:00
cyberman54
eeed8b7bfe sds011: change device driver library (initial) 2022-02-14 17:32:46 +01:00
cyberman54
45f531ccfb ttgov21new.h: correction display 2022-02-14 17:31:14 +01:00
cyberman54
4d48b14b88 increase lmic task prio 2022-02-13 18:41:43 +01:00
cyberman54
8f98a9bdde gps fixes (TIM-TP5 removed again) 2022-02-13 18:41:22 +01:00
cyberman54
88efd5dd4d senddata.cpp sanitized 2022-02-13 17:43:05 +01:00
cyberman54
8e4fe93069 sanitze libpax integration (volatile vars removed) 2022-02-13 16:00:01 +01:00
cyberman54
2dd9a4701b rework ublox gps init 2022-02-13 15:41:42 +01:00
cyberman54
2d786967ea gpsread.cpp: fix centiseconds if no PPS present 2022-02-12 18:15:19 +01:00
cyberman54
bc4f2fbb95 move led loop from core0 to core1 2022-02-12 16:27:21 +01:00
cyberman54
a71a7e08a4 getting time from GPS reworked 2022-02-12 16:26:41 +01:00
cyberman54
817f7793c4 fix cyclic time sync when no timesource seen yet 2022-02-09 12:36:45 +01:00
cyberman54
01011013fc adjust task prios & delays & time cal cycle 2022-02-09 12:24:11 +01:00
cyberman54
69da95cd66 sanitize ISR IRAM_ATTR and global vars 2022-02-07 15:38:15 +01:00
cyberman54
c41d44bd7d gps ubx fixes 2022-02-07 15:35:25 +01:00
cyberman54
babfe4b245 UBX commands bugfix baudrate 2022-02-06 20:23:34 +01:00
cyberman54
ef15fa2d2a cyclic.cpp: task errorhandling added 2022-02-06 20:23:08 +01:00
cyberman54
02c29afca6 remove incompleted I2C gps support 2022-02-06 18:33:17 +01:00
cyberman54
2961948759 improve ublox gps chip init 2022-02-06 18:29:30 +01:00
cyberman54
a4133d6e0a correction in paxcounter_orig.conf 2022-01-31 09:24:47 +01:00
cyberman54
746cb0ede2 paxcounter_orig.conf set back to defaults 2022-01-30 23:32:09 +01:00
cyberman54
353e55f0c2 remove esp32-micro-sdcard library 2022-01-30 23:27:28 +01:00
cyberman54
d6385f1f70 further sdcard fixes 2022-01-30 22:12:26 +01:00
cyberman54
d45c96e544 sdcard bugfixes 2022-01-30 21:53:11 +01:00
Verkehrsrot
09d29c1d1f
Update paxcounter_orig.conf 2022-01-30 15:32:14 +01:00
cyberman54
d2ee10f40a update paxcounter_orig.conf 2022-01-30 15:29:52 +01:00
cyberman54
bce80542a8 change CD logging to single file 2022-01-30 15:25:46 +01:00
cyberman54
dffb5dee75 move payloadmask define to paxcounter.conf 2022-01-30 15:25:16 +01:00
Verkehrsrot
4c04f51151
Merge branch 'joseph' into development 2022-01-29 13:50:38 +01:00
cyberman54
51c6a41180 flush to sd card before sleep 2022-01-29 13:47:59 +01:00
cyberman54
db60afe05d remove unused ENS/CWA code 2022-01-28 22:17:17 +01:00
cyberman54
efca209795 Merge branch 'development' of https://github.com/cyberman54/ESP32-Paxcounter into development 2022-01-28 21:50:58 +01:00
cyberman54
150eb72069 update comments in board hal files 2022-01-28 21:50:48 +01:00
cyberman54
aea6dc88c6 for user joseph 2022-01-28 21:43:59 +01:00
cyberman54
c4ec21d055 sdcard logging: add voltage, remove cwa 2022-01-28 21:41:55 +01:00
cyberman54
854480a051 sdcard: timestamp in iso8601 format 2022-01-28 20:57:31 +01:00
cyberman54
76c465ccb7 change order of loraykey display for TTNv3 console 2022-01-28 19:51:59 +01:00
cyberman54
a57730940b increase GPS loop stack size to avoid TG1WDT 2022-01-28 10:39:57 +01:00
cyberman54
08a9b8a557 Revert "add some task watchdog handling"
This reverts commit 13eaae74ac.
2022-01-27 21:40:25 +01:00
cyberman54
13eaae74ac add some task watchdog handling 2022-01-27 18:04:37 +01:00
cyberman54
ad027f7e80 DRAM_ATTR for global variable used in ISR 2022-01-27 18:04:06 +01:00
cyberman54
66c321d0e9 led.cpp: slow down spin loop 2022-01-26 22:45:34 +01:00
cyberman54
a0ea78844a gpsread.cpp: slow down spin loop 2022-01-26 22:45:23 +01:00
cyberman54
1ffdbdac3b dcf77.cpp: simplyfy parity calculation 2022-01-26 22:44:29 +01:00
cyberman54
dfa25cd2b4 increase delay in gps read spin task 2022-01-26 16:58:05 +01:00
cyberman54
dc427314a1 rework task priorities 2022-01-26 16:32:54 +01:00
cyberman54
af01537a95 improve RTC accuracy 2022-01-26 16:21:44 +01:00
cyberman54
43e6ec0cb6 if482.cpp: fixes after removal of eztime 2022-01-26 14:57:35 +01:00
cyberman54
d21d478f8b fix batt LEDlevel blinking 2022-01-24 11:35:42 +01:00
cyberman54
529059edf4 integrate esp32 sntp 2022-01-23 21:12:28 +01:00
cyberman54
b3c683d1ac timekeeper.cpp: fix millis 2022-01-22 14:56:16 +01:00
cyberman54
2ef25b3698 reset.cpp: remove unused RTC_time 2022-01-22 14:31:41 +01:00
cyberman54
3e4da9f1e9 fix missing uint_8 casting 2022-01-22 13:56:40 +01:00
cyberman54
fb82d05cae gpsread.cpp: add yield for thread safety 2022-01-20 17:38:31 +01:00
cyberman54
7d9d6d81c4 sdcard.cpp: adapt to eztime removal 2022-01-20 17:37:34 +01:00
cyberman54
f8e8aec6e0 timekeeper.cpp: add mkgmtime() 2022-01-20 17:37:12 +01:00
cyberman54
5ec8b68fff Revert "bugfix curve plotter display"
This reverts commit 3e045bfcf4.
2022-01-20 11:59:13 +01:00
cyberman54
3e045bfcf4 bugfix curve plotter display 2022-01-20 11:43:41 +01:00
cyberman54
b2c89b3e1a timekeeper.cpp: fix #if #endif issue 2022-01-19 20:29:31 +01:00
cyberman54
76317efc00 timekeeper.cpp: fix edge case ClockMinute = 0 2022-01-19 14:27:16 +01:00
cyberman54
7cc37ac8b9 bugfix dcf77 pulse pause 2022-01-19 14:25:17 +01:00
cyberman54
cdad3c1891 increase task stack size for clock_loop() 2022-01-18 16:07:24 +01:00
cyberman54
7392fec66c set compile date back one day 2022-01-18 01:01:05 +01:00
cyberman54
ee46833dfa rework dcf77 (part 2) 2022-01-18 01:00:40 +01:00
cyberman54
a7f957dedd rework timekeeper 2022-01-16 19:43:29 +01:00
cyberman54
1ea263daf6 delete mobaline 2022-01-16 19:43:19 +01:00
cyberman54
60f191f436 rework if482 2022-01-16 19:43:06 +01:00
cyberman54
83faf69c9f rework dcf77 2022-01-16 19:42:54 +01:00
cyberman54
df8d218c43 removal of all time libs (inital commit) 2022-01-13 23:30:18 +01:00
cyberman54
995cde6a67 fix restore time after deepsleep 2022-01-08 19:10:34 +01:00
cyberman54
adb7f93944 irqhandler.cpp polished 2022-01-08 18:01:28 +01:00
cyberman54
f8777f99f9 configmanager: small fixes / rework 2021-12-27 21:03:41 +01:00
cyberman54
d8210d3ec3 bugfix progversion handling in configmanager 2021-12-24 15:15:28 +01:00
cyberman54
a7bc2be9b7 remove esp_eth_get_mac (for IDF 4.x) 2021-12-22 16:49:03 +01:00
cyberman54
246fcbbbb3 update libs and bump to v3.0.3 2021-11-12 17:00:21 +01:00
Mike Bremford
231dd4b1b7
Update ttgov1.h
ttgo LoRa32 v1 does not have an SD card, and enabling it prevents the LoRa radio from working
2021-10-31 13:47:43 +00:00
cyberman54
ff8ee91983 paxcounter_orig.conf edit BLEADVERTISING default 2021-10-14 22:58:44 +02:00
cyberman54
48e3339167 implement send battery status via lmic 2021-10-11 09:59:41 +02:00
cyberman54
382620a66c optime sleep mode 2021-10-02 14:05:05 +02:00
cyberman54
a4e3b1980e optimize sleep mode 2021-10-02 13:57:38 +02:00
cyberman54
425cb37669 decrease lmic debug level 2021-10-02 13:20:03 +02:00
cyberman54
779bbdc436 decrease loglevel of timekeeper 2021-10-02 13:19:41 +02:00
cyberman54
9d7d0da737 fix issue #828 2021-08-27 19:45:37 +02:00
cyberman54
9e1c9c7f59 improve lora time sync accuracy 2021-07-23 19:10:41 +02:00
cyberman54
903ffe2759 fix rssi limit default value 2021-07-20 19:14:51 +02:00
cyberman54
b398c7a981 fix #817 make rssi limit usable with libpax 2021-07-20 13:56:11 +02:00
cyberman54
5b28fe03ed fix for negative time diffs 2021-07-20 13:24:16 +02:00
Caspar Armster
a83ef4ba72 Fixed byte order in the esp32-paxcounter.yaml to make it validate and changed decoder file name to esp32-paxcounter-packed.js because no uppercase is allowed 2021-07-06 11:52:51 +02:00
cyberman54
335d646fe7 bugfix reagard leap seconds in network time sync 2021-07-06 10:53:48 +02:00
cyberman54
f876edfe36 bump to v3.0.1 2021-07-05 18:09:56 +02:00
Caspar Armster
a43c2ebd2b [FIX] used real world data for example of gps data 2021-06-15 19:10:19 +02:00
Caspar Armster
7d3004761a
Update readme.md 2021-06-15 14:16:18 +02:00
Caspar Armster
c696857f75 [FIX] some design changes in the readme.md 2021-06-15 13:41:55 +02:00
Caspar Armster
9e7b4f27cf [FEAT] initial commit for the additions to the lorawan-devices repo 2021-06-15 13:34:59 +02:00
cyberman54
67c0313e8f v3.0.0 2021-05-29 17:01:08 +02:00
cyberman54
3e00fecb28 migration to ezTime lib 2021-05-09 00:02:41 +02:00
cyberman54
a17e4a6894 bugfix set_countmode 2021-05-07 19:50:22 +02:00
cyberman54
49aba50df1 remove beacon monitormode 2021-05-07 19:41:36 +02:00
cyberman54
ccf9e80c01 add COMPILETIME macro 2021-05-03 19:37:39 +02:00
cyberman54
35f27ca415 rcommand get_time patch timestamp 2021-05-03 19:36:22 +02:00
cyberman54
71aa55863b libpax integration fixes (sendtimer, rcommands) 2021-04-13 16:37:17 +02:00
cyberman54
44e5daaf02 bugfix libpax countermode 2021-04-13 01:57:02 +02:00
cyberman54
13c8a5f0be reset.cpp: bugfix coldstart (2) 2021-04-12 23:45:26 +02:00
cyberman54
ea7fa5d31f reset.cpp: bugfix reset vars in coldstart 2021-04-12 23:44:07 +02:00
cyberman54
fc1ac508ef mqttclient.cpp: Set Ethernet hostname 2021-04-12 17:51:29 +02:00
Verkehrsrot
e6782185ca
Merge pull request #792 from cyberman54/master
lorawan.cpp: removed buggy mac_decode()
2021-04-12 13:24:45 +02:00
cyberman54
9e586ecb2c lorawan.cpp: removed buggy mac_decode() 2021-04-12 13:24:12 +02:00
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