Commit Graph

2567 Commits

Author SHA1 Message Date
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
Verkehrsrot
ecc611852c
Merge pull request #24 from cyberman54/master
sync test to master
2018-04-03 17:02:34 +02:00
Klaus K Wilting
92487febc0 LoPy/LoP4 LED board definition corrected 2018-04-03 16:54:58 +02:00
Verkehrsrot
3552f05409
Merge pull request #23 from cyberman54/test
updated board definitions for LoPy/LoPy4
2018-04-03 16:42:24 +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
823bb000a1 platformio.ini: log level default changed to [Info] 2018-04-03 15:52:53 +02:00
Oliver Brandmueller
0e1d9e76d0 Merge branch 'master' of https://github.com/cyberman54/ESP32-Paxcounter 2018-04-03 13:50:48 +02:00
Oliver Brandmueller
1beec10822 Add those for Atom/Linux environment 2018-04-03 13:48:28 +02:00
Verkehrsrot
2b4d09bafd
Merge pull request #22 from cyberman54/test
macsniff.cpp: logging bug fixed
2018-04-03 13:44:44 +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
Charles
3c590a2c3d Link fix 2018-04-03 11:23:22 +02:00
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