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

823 Commits

Author SHA1 Message Date
Klaus K Wilting
01e81b3581 blescan.cpp: comment added 2018-04-15 21:02:29 +02:00
Klaus K Wilting
43c06bb94f blescsn.cpp: esp_blufi_api.h include added again (*is* needed) 2018-04-15 20:58:08 +02:00
Klaus K Wilting
a0564f3607 blescan.cpp: bluefi_api removed (unneeded) 2018-04-15 20:20:35 +02:00
Klaus K Wilting
24eed4a55e main.cpp: small change in main loop 2018-04-15 18:54:23 +02:00
Klaus K Wilting
d3bbd46f79 delays in loop_tasks adjusted 2018-04-15 18:19:47 +02:00
Klaus K Wilting
524adaf8b5 !REPAIR! blescan.cpp: delay(500) back; otherwise watchdog triggers 2018-04-15 18:05:36 +02:00
Klaus K Wilting
441204236e main.cpp: single core option removed 2018-04-15 14:32:26 +02:00
Klaus K Wilting
77dc71ed13 blescan.cpp: removed delay in bt_loop task 2018-04-15 14:06:25 +02:00
Klaus K Wilting
34d32df248 changed core 1->0; increased stack size for bt task -> 8192 2018-04-15 13:59:37 +02:00
Klaus K Wilting
0b0dc9c02b v1.2.98 2018-04-15 12:12:06 +02:00
Klaus K Wilting
342f135d41 main.h: removed BLESCANCYCLE 2018-04-15 01:21:13 +02:00
Klaus K Wilting
e4afdf6c77 blescan.cpp optimization 2018-04-15 01:04:39 +02:00
Klaus K Wilting
4f8bb26fc0 blescan.cpp optimization 2018-04-15 00:51:28 +02:00
Klaus K Wilting
666d2e0e32 fixes blescan.cpp & update readme.md 2018-04-14 21:42:30 +02:00
Klaus K Wilting
f903a930c4 !REPAIR! some more was broken in blescan.cpp 2018-04-14 21:20:45 +02:00
Klaus K Wilting
ed8334d3e8 blescan.cpp: bt_loop speedup 2018-04-14 21:02:49 +02:00
Klaus K Wilting
af0f26f4e8 !REPAIR! of broken blescan.cpp 2018-04-14 21:00:36 +02:00
Klaus K Wilting
5f34015199 blescan.cpp: code sanitization 2018-04-14 20:51:44 +02:00
Klaus K Wilting
d4c4f5b532 further fixes for refactoring BLE scan 2018-04-14 20:33:33 +02:00
Klaus K Wilting
c57e7b75f4 completely reworked BLE scan 2018-04-14 20:22:58 +02:00
Klaus K Wilting
116197f632 blescan.cpp created 2018-04-14 19:22:29 +02:00
Klaus K Wilting
e91b6be5dd macsniff.cpp: removed some BLExxx.h 2018-04-14 17:52:30 +02:00
Klaus K Wilting
e1f8d89cab Little code sanitization in BLECount() 2018-04-09 12:30:49 +02:00
Klaus K Wilting
95d8db56ae main.h defaults 2018-04-07 12:03:19 +02:00
Klaus K Wilting
c88b37d92d minor fixes if BLE disabled 2018-04-07 12:02:13 +02:00
Klaus K Wilting
a6b22a3fb3 BLE params changed 2018-04-06 22:25:12 +02:00
Klaus K Wilting
71b6f75781 BLE params changed 2018-04-06 22:24:54 +02:00
Klaus K Wilting
f9ba346c68 enhanced BLE scan parameters 2018-04-06 21:34:25 +02:00
Klaus K Wilting
9acdd1d575 comments added in BLE routine 2018-04-06 18:19:10 +02:00
Klaus K Wilting
308a8d38a2 changed BLE scan mode to passive (is faster) 2018-04-06 17:52:24 +02:00
Klaus K Wilting
0041970142 minor u8x8 code optimizations 2018-04-06 17:31:01 +02:00
Klaus K Wilting
b82a770882 OLED Display cosmetics 2018-04-06 17:19:37 +02:00
Klaus K Wilting
a65c6f8596 reduce screen flicker by removing clearlines 2018-04-06 16:09:01 +02:00
Charles
9315810028 Removed sample config with defines 2018-04-06 10:56:21 +02:00
Charles
bd62e3d538 Send WiFi Mac instead of total WiFi+BLE 2018-04-06 10:56:03 +02:00
Klaus K Wilting
f435d44981 macsniff.cpp: reduced screen flicker 2018-04-05 22:11:32 +02:00
Klaus K Wilting
018c78ba29 minor cosmetics 2018-04-05 21:47:43 +02:00
Charles
7fc0fc0a74 Optimize add function, fixed New/Already Seen bug 2018-04-05 16:26:25 +02:00
Charles
01d617f61e Fixed display bug 2018-04-05 14:35:53 +02:00
Charles
a37a567ab2 Code optimization 2018-04-05 14:34:39 +02:00
Charles
114651d8c0 Improved hash & salt 2018-04-05 14:33:30 +02:00
Charles
bc114e4d1f Added board definition symbol 2018-04-05 09:56:26 +02:00
Charles
17fab82cd7 Centralized display 2018-04-05 08:48:24 +02:00
Charles
428a29286c Removed any display from mac_add 2018-04-05 08:48:08 +02:00
Charles
0e4c8facd0 make currentScanDevice extern 2018-04-05 08:47:41 +02:00
Charles
66c4aa4a0c bump to v1.2.94 2018-04-05 08:47:17 +02:00
Charles
549e9ef944 removed unneeded #include 2018-04-05 08:46:59 +02:00
Klaus K Wilting
ba76646f21 main.cpp: reduced i2c display speed (test) 2018-04-04 23:29:03 +02:00
Klaus K Wilting
c71ff050cf main.cpp: double u8x8.begin() removed 2018-04-04 22:56:34 +02:00
Charles
58b3299f93 Changed display mode to see if we still see 16 max bug 2018-04-04 18:02:30 +02:00
Charles
0798c6388a Added unit of RSSI debug line 2018-04-04 14:34:44 +02:00
Charles
334a23a8e2 Avoid buffer overflow 2018-04-04 14:27:36 +02:00
Charles
204b91237c optimized newnac 2018-04-04 14:23:02 +02:00
Charles
eef19c581b Cosmetic OLED display 2018-04-04 14:22:15 +02:00
Charles
8ca6e7b024 Optimized salt and hash 2018-04-04 12:45:31 +02:00
Charles
327aaf46f8 created centralized function salt_reset() 2018-04-04 12:39:40 +02:00
Verkehrsrot
dd99c078f1
revert change in macsniff.cpp (to be further tested) 2018-04-04 09:51:33 +02:00
Verkehrsrot
03a8a29aac
Merge branch 'master' into master 2018-04-04 08:31:48 +02:00
Charles
0144a305e5 Bump to v1.2.93 2018-04-04 01:42:10 +02:00
Charles
39b0c4eefe Added warning on software deveui override by HW one 2018-04-04 01:37:59 +02:00
Charles
b0d29b16b2 bump to v1.2.92 2018-04-04 01:27:36 +02:00
Charles
16d015feae Fixed and Moved reading HW deveui to lorawan.cpp 2018-04-04 01:26:05 +02:00
Klaus K Wilting
2a9cc2b2b4 v1.2.92: display flip mode implemented 2018-04-03 23:42:43 +02:00
Charles
2edae9d51b Use size of buffer instead of hard number 2018-04-03 23:38:37 +02:00
Klaus K Wilting
dc7f4ca90e v1.2.91: enhanced RGB LED blink 2018-04-03 21:26:51 +02:00
Klaus K Wilting
f71d967eab testing 2018-04-03 18:13:39 +02:00
Klaus K Wilting
d2330fb5b1 testing 2018-04-03 18:03:05 +02:00
Klaus K Wilting
4246359c30 merge pull request #21 for testing 2018-04-03 17:47:11 +02:00
Klaus K Wilting
f266da5a9f Merge branch 'master' of https://github.com/hallard/ESP32-Paxcounter into test 2018-04-03 17:05:44 +02:00
Klaus K Wilting
92487febc0 LoPy/LoP4 LED board definition corrected 2018-04-03 16:54:58 +02:00
Klaus K Wilting
22ba119bf5 updated board definitions for LoPy/LoPy4 2018-04-03 16:41:23 +02:00
Charles
47f0f90cf3 Revert "Removed all display code if not HAS_DISPLAY" 
This reverts commit 3640a62b93.
 2018-04-03 16:14:57 +02:00
Klaus K Wilting
30a66743a6 macsniff.cpp: logging bug fixed 2018-04-03 13:18:31 +02:00
Charles
f4ecc3924b Added 24AA02E64 deveui reading 
Not working yet (I2C bug in ESP32 framework)
 2018-04-03 12:39:11 +02:00
Charles
3640a62b93 Removed all display code if not HAS_DISPLAY 2018-04-03 12:38:15 +02:00
Charles
8b4c5c1d87 Added values for Microchip 24AA02E64 unique DEVEUI Address 2018-04-03 11:27:34 +02:00
Charles
3b1baf1fc4 BLE Scan time set to 10s 2018-04-03 11:24:06 +02:00
Charles
6739a226c3 Blink RGB Led on BLE device seen 2018-04-03 11:23:39 +02:00
Klaus K Wilting
5cdb4d53aa configmanager.cpp: bugfix blescancycle NVRAM 2018-04-03 11:07:00 +02:00
Klaus K Wilting
9c15a86b77 v1.2.86 small fixes 2018-04-02 23:27:38 +02:00
Klaus K Wilting
b854f09204 v1.2.85 2018-04-02 22:45:08 +02:00
Klaus K Wilting
7eef5a846e v1.2.83: BLE scan frequency made remote configurable 2018-04-02 21:26:22 +02:00
Klaus K Wilting
da9ea6a35d main.cpp: bug fixed in loop count logic (issue #18) 2018-04-02 21:02:22 +02:00
Klaus K Wilting
703e6ec894 main.cpp: bug fixed channel rotation 2018-04-02 19:04:10 +02:00
Klaus K Wilting
95358eb6d3 comments cosmetics 2018-04-02 14:43:39 +02:00
Klaus K Wilting
60b1d31f6a some fixes in macsniff.cpp 2018-04-02 14:34:16 +02:00
Klaus K Wilting
cbecfb4463 v1.2.71 test 2018-04-02 10:09:44 +02:00
Klaus K Wilting
c330571a14 v1.2.7 test 2018-04-02 09:44:30 +02:00
Klaus K Wilting
ec89b8c1d3 resolved merge conflicts 2018-04-02 09:38:45 +02:00
Klaus K Wilting
9da4a1c10a resolve merge conflicts 2018-04-02 09:32:11 +02:00
Klaus K Wilting
a839f5ea68 resolved merge conflicts 2018-04-02 09:30:03 +02:00
Charles
05f1f75c9f Fixed RGB Led after transmit 2018-04-02 03:13:01 +02:00
Charles
121e79cd7c Added Leds managment 2018-04-02 03:00:27 +02:00
Charles
c5d82fb1e0 Removed Vendor filter for BLE Scan 2018-04-02 02:59:55 +02:00
Charles
ea62f49220 On Board LED is active LOW 2018-04-02 01:38:25 +02:00
Charles
5aa86ba801 Added RGB LED, and new counters 2018-04-02 01:36:51 +02:00
Charles
2a7989658d use new counters 2018-04-02 01:36:34 +02:00
Charles
ef85178016 Refactored mac counter and BLE scan 2018-04-02 01:36:14 +02:00
Charles
96630e08f8 Added RGB Luminosity, changed AES to perf and default BLE duration 2018-04-02 01:35:36 +02:00
Charles
8a2d848370 Set back to include file 2018-04-02 01:34:10 +02:00
Charles
5c5d40e050 added RGB Led 2018-04-02 01:33:49 +02:00
Charles
0840573f38 Merged in macsniff 2018-04-02 01:30:24 +02:00
Klaus K Wilting
cc6d8da5dd salting finally bugfixed 2018-04-01 22:25:08 +02:00
Klaus K Wilting
2a8aef60a9 salting fixed 2018-04-01 22:21:00 +02:00
Klaus K Wilting
70d7b4f719 salt bugfix 2018-04-01 22:14:51 +02:00
Klaus K Wilting
0326e03fd8 salt logic modified 2018-04-01 21:02:13 +02:00
Klaus K Wilting
39022e2340 salt logic modified 2018-04-01 20:56:18 +02:00
Klaus K Wilting
7c906c5d6b salt logic improved 2018-04-01 19:04:13 +02:00
Klaus K Wilting
91ac7eb32f salt logic improved 2018-04-01 18:33:22 +02:00
Klaus K Wilting
c1065193c6 salt logic improved 2018-04-01 18:18:01 +02:00
Klaus K Wilting
ca75dee4f2 logging modified 2018-04-01 16:59:48 +02:00
Klaus K Wilting
5d6d06005a modified salt logic 2018-04-01 16:52:07 +02:00
Klaus K Wilting
4914305ba8 code sanitization 2018-04-01 13:27:53 +02:00
Klaus K Wilting
eebcb4f73a MAC mask removed again 2018-04-01 13:24:02 +02:00
Klaus K Wilting
78ead0f0ce changed random number generator 2018-04-01 13:16:59 +02:00
Klaus K Wilting
c1c6dda221 srand init fixed 2018-04-01 10:54:44 +02:00
Klaus K Wilting
626269d62c sprintf mac counter fixed 2018-04-01 10:40:18 +02:00
Klaus K Wilting
1b22c6db7b bugfix in mac counter printf 2018-04-01 09:58:01 +02:00
Charles
fb3d63483b Added RGB Led luminosity parameter 2018-03-31 23:30:32 +02:00
Charles
3a8a0dcb65 Added LED_ACTIVE_LOW 2018-03-31 23:23:16 +02:00
Charles
4c9e6c3c4d added LED_ACTIVE_LOW 
Led management done in loop
 2018-03-31 23:22:46 +02:00
Klaus K Wilting
ac8fa77eb0 srand init fixed 2018-03-31 23:22:43 +02:00
Klaus K Wilting
cf2a620e8a reduced mac and ble counter to 16bit 2018-03-31 23:12:27 +02:00
Charles
c029117fec Creation 2018-03-31 23:04:26 +02:00
Charles
0ec9b2e83a Splitted to cpp+h be able to get used by blecount.cpp 2018-03-31 23:04:17 +02:00
Klaus K Wilting
527f47d558 small code sanitizations 2018-03-31 22:11:55 +02:00
Klaus K Wilting
3448a08875 srand() init with temperature 2018-03-31 21:50:03 +02:00
Klaus K Wilting
d92cd89dae srand() init with chip temperature 2018-03-31 21:47:39 +02:00
Klaus K Wilting
6220a44e7e salt bugfix 2018-03-31 19:04:56 +02:00
Klaus K Wilting
17f550984f v1.2.61: salt value displayed on console 2018-03-31 18:37:49 +02:00
Klaus K Wilting
17197b46e4 v1.2.6 salting & hashing MACs implemented 2018-03-31 18:17:13 +02:00
Klaus K Wilting
27af81ab5c new 32bit hash logic 2018-03-31 15:09:53 +02:00
Klaus K Wilting
df6cb25b38 created first version with hash 2018-03-31 13:54:40 +02:00
Klaus K Wilting
b0cd39cafa main.h: wifi settings enhanced 2018-03-30 22:10:28 +02:00
Klaus K Wilting
19ddbc4113 small code improvements 2018-03-30 21:37:51 +02:00
Klaus K Wilting
8e4abfa90f update LICENSE 2018-03-30 21:23:35 +02:00
Klaus K Wilting
ec5f781cfc revert change main.h -> main.conf 2018-03-30 20:57:00 +02:00
Klaus K Wilting
4b46c19db0 revert change main.h -> main.conf 2018-03-30 20:54:41 +02:00
Klaus K Wilting
f6f63b6a57 changed main.h -> main.conf 2018-03-30 20:51:49 +02:00
Klaus K Wilting
875ad77967 wifisniffer.cpp: code improvements 2018-03-30 20:41:08 +02:00
Charles
b9d80f98ce Updated comment 2018-03-28 01:31:00 +02:00
Charles
d35ae40b32 Creation 2018-03-28 01:30:47 +02:00
Klaus K Wilting
aff7ff9444 change LoPy/LoPy4 RGB-LED 2018-03-27 14:34:37 +02:00
Klaus K Wilting
92cbaeeaa6 v1.2.5 2018-03-27 12:46:38 +02:00
Klaus K Wilting
156aba2709 development branch created 2018-03-27 12:45:09 +02:00
Charles
ff85d908ac default to disable brownout detection 2018-03-27 11:05:33 +02:00
Charles
6e0ec1cb2a Added brownout remove and pullup on button 2018-03-27 11:05:06 +02:00
Charles
fdcfcdadc0 updated comments 2018-03-27 02:07:10 +02:00
Charles
466e49d998 Creation 2018-03-27 01:51:48 +02:00
Klaus K Wilting
ce3f7c09f6 comments in loraconf_sample.h changed 2018-03-25 23:43:26 +02:00
Klaus K Wilting
7b9e962963 bug fixed in template loraconf_sample.h 2018-03-25 23:41:24 +02:00
Klaus K Wilting
4ec57e067d main.cpp: bug fixed in button handling 2018-03-25 23:38:54 +02:00
Klaus K Wilting
0539562a66 New title pic 2018-03-25 20:34:44 +02:00
Klaus K Wilting
4559aa02a6 rcommand.cpp fixed (issue #9) 2018-03-24 15:58:12 +01:00
Klaus K Wilting
d6164f3132 wifi antenna switch implented (LoPy/LoPy4 only) 2018-03-24 13:38:43 +01:00
Klaus K Wilting
62325e9d40 changes in antenna.cpp; license cleanup 2018-03-24 11:28:33 +01:00
Klaus K Wilting
05e9843bd5 bug fixed in printKey() 2018-03-24 10:43:48 +01:00
Klaus K Wilting
fe925f19f8 revert a buggy change in lorawan.cpp 2018-03-23 16:48:52 +01:00
Klaus K Wilting
16bc2dda23 loraconf_sample.h updated 2018-03-23 16:45:27 +01:00
Klaus K Wilting
09e2cba909 fixed error in DEVEUI parsing 2018-03-23 11:57:19 +01:00
Klaus K Wilting
adb391211c rcommand.cpp: missing lmic include fixed 2018-03-21 23:44:22 +01:00
Klaus K Wilting
701e8192f8 APPEUI handling changed (issue #5) 2018-03-21 22:50:49 +01:00
Klaus K Wilting
86c2bfd98e fix loraconf_sample.h 2018-03-21 22:35:57 +01:00
Klaus K Wilting
903bbac73d DEVEUI handling improved (issue #5) 2018-03-21 22:32:59 +01:00
Klaus K Wilting
ce5dadeffe code sanitization; button on TTGOv1 2018-03-21 21:53:42 +01:00
Klaus K Wilting
ac0ff020c6 code sanitizations 2018-03-21 18:03:14 +01:00
Klaus K Wilting
f4a3cb8571 v1.2.3 2018-03-21 17:41:43 +01:00
Klaus K Wilting
861115913a code sanitizations 2018-03-21 17:34:11 +01:00
Klaus K Wilting
cf7c908883 TTGOv1 support added (experimental) 2018-03-21 14:33:55 +01:00
Klaus K Wilting
825943c2e5 wifisniffer.cpp: settings changed 2018-03-20 22:58:51 +01:00
Klaus K Wilting
daa0b2e58e set wifi_init_config NVS flash: disabled 2018-03-20 22:14:43 +01:00
Klaus K Wilting
548a1ce22d v1.2.1: TTGOv1 support (experimental) 2018-03-20 21:38:41 +01:00
Verkehrsrot
f238dc3f0f
Initial upload 2018-03-18 19:45:17 +01:00