Commit Graph

62 Commits

Author SHA1 Message Date
Klaus K Wilting
f266da5a9f Merge branch 'master' of https://github.com/hallard/ESP32-Paxcounter into test 2018-04-03 17:05:44 +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
3640a62b93 Removed all display code if not HAS_DISPLAY 2018-04-03 12:38:15 +02:00
Charles
6739a226c3 Blink RGB Led on BLE device seen 2018-04-03 11:23:39 +02:00
Charles
9f2a2919c5 Revert "10s BLE scan time looks enough"
This reverts commit 72193b0b3a.
2018-04-03 11:11:04 +02:00
Charles
72193b0b3a 10s BLE scan time looks enough 2018-04-03 11:10:46 +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
60b1d31f6a some fixes in macsniff.cpp 2018-04-02 14:34:16 +02:00
Klaus K Wilting
a839f5ea68 resolved merge conflicts 2018-04-02 09:30:03 +02:00
Charles
c5d82fb1e0 Removed Vendor filter for BLE Scan 2018-04-02 02:59:55 +02:00
Charles
0840573f38 Merged in macsniff 2018-04-02 01:30:24 +02:00