Commit Graph

1199 Commits

Author SHA1 Message Date
Charles
c066a62ede Added RGB Led doc 2018-04-03 11:20:06 +02:00
hallard
c7d548a7cc Merge remote-tracking branch 'upstream/master' 2018-04-03 11:15:48 +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
Verkehrsrot
672b510ba4
Merge pull request #20 from cyberman54/test
sync Test to Master
2018-04-03 11:09:13 +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
Verkehrsrot
2657596646
Merge pull request #19 from cyberman54/master
syncing with master
2018-04-02 22:50:45 +02:00
Klaus K Wilting
b854f09204 v1.2.85 2018-04-02 22:45:08 +02:00
Klaus K Wilting
94008da338 update readme.md 2018-04-02 21:38:48 +02:00
Klaus K Wilting
32a40e9904 update readme.md 2018-04-02 21:35:03 +02:00
Klaus K Wilting
49f6c6476c readme.md updated 2018-04-02 21:29:06 +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
Verkehrsrot
65c9784fc7
Update README.md 2018-04-02 15:48:58 +02:00
Verkehrsrot
2a23f66050
Merge pull request #17 from cyberman54/hallard-master
v1.2.8 - thanks to Charles Hallard for contribution!
2018-04-02 14:49:42 +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
a46bfe2d1d Added Smart LED library 2018-04-02 01:37:55 +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
Verkehrsrot
31ba16550d
Merge pull request #14 from cyberman54/development
Development
2018-04-01 22:23:06 +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
4b9beff3bd Merge branch 'development' of https://github.com/cyberman54/ESP32-Paxcounter into development 2018-04-01 21:03:20 +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