From 72193b0b3a9ed1363429784f4b3cb24574a49032 Mon Sep 17 00:00:00 2001
From: Charles <hallard04@free.fr>
Date: Tue, 3 Apr 2018 11:10:46 +0200
Subject: [PATCH] 10s BLE scan time looks enough

---
 project.cson     |  8 ++++++++
 src/macsniff.cpp | 10 ++++++----
 src/main.h       |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 project.cson

diff --git a/project.cson b/project.cson
new file mode 100644
index 00000000..23b8f81a
--- /dev/null
+++ b/project.cson
@@ -0,0 +1,8 @@
+[
+  {
+    title: 'ESP32-Paxcounter'
+    settings:
+      'editor.tabLength': 4
+      'editor.showInvisibles': true
+  }
+]
diff --git a/src/macsniff.cpp b/src/macsniff.cpp
index d8b330a8..7d00fba9 100644
--- a/src/macsniff.cpp
+++ b/src/macsniff.cpp
@@ -33,6 +33,7 @@ bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) {
 	uint16_t hashedmac;
 	std::pair<std::set<uint16_t>::iterator, bool> newmac;
 
+    rgb_set_color(COLOR_MAGENTA);
     addr2int = ( (uint64_t)paddr[0] ) | ( (uint64_t)paddr[1] << 8 ) | ( (uint64_t)paddr[2] << 16 ) | \
     ( (uint64_t)paddr[3] << 24 ) | ( (uint64_t)paddr[4] << 32 ) | ( (uint64_t)paddr[5] << 40 );
 
@@ -44,7 +45,7 @@ bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) {
 
         // salt and hash MAC, and if new unique one, store identifier in container and increment counter on display
 		// https://en.wikipedia.org/wiki/MAC_Address_Anonymization
-			
+
 		addr2int |= (uint64_t) salt << 48;		// prepend 16-bit salt to 48-bit MAC
 		snprintf(macbuf, 21, "%llx", addr2int);	// convert unsigned 64-bit salted MAC to 16 digit hex string
 		hashedmac = rokkit(macbuf, 5);			// hash MAC string, use 5 chars to fit hash in uint16_t container
@@ -57,7 +58,7 @@ bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) {
             newmac = bles.insert(hashedmac);    // add hashed MAC to BLE container if new unique
             strcpy(typebuff, "BLE ");
         }
-     
+
         if (newmac.second) { // first time seen this WIFI or BLE MAC
             snprintf(counter, 6, "%i", macs.size());		// convert 16-bit MAC counter to decimal counter value
             u8x8.draw2x2String(0, 0, counter);
@@ -73,6 +74,8 @@ bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) {
     }
     #endif
 
+    rgb_set_color(COLOR_NONE);
+
     // True if MAC WiFi/BLE was new
     return newmac.second;
 }
@@ -129,7 +132,7 @@ void wifi_sniffer_packet_handler(void* buff, wifi_promiscuous_pkt_type_t type) {
     const wifi_promiscuous_pkt_t *ppkt = (wifi_promiscuous_pkt_t *)buff;
     const wifi_ieee80211_packet_t *ipkt = (wifi_ieee80211_packet_t *)ppkt->payload;
     const wifi_ieee80211_mac_hdr_t *hdr = &ipkt->hdr;
-    
+
     if (( cfg.rssilimit == 0 ) || (ppkt->rx_ctrl.rssi > cfg.rssilimit )) { // rssi is negative value
         uint8_t *p = (uint8_t *) hdr->addr2;
         mac_add(p, ppkt->rx_ctrl.rssi, MAC_SNIFF_WIFI) ;
@@ -138,4 +141,3 @@ void wifi_sniffer_packet_handler(void* buff, wifi_promiscuous_pkt_type_t type) {
     }
     yield();
 }
-
diff --git a/src/main.h b/src/main.h
index 57a190b6..f9af4cc6 100644
--- a/src/main.h
+++ b/src/main.h
@@ -10,7 +10,7 @@
 #define BLECOUNTER                      1       // comment out if you don't want BLE count
 
 // BLE scan time
-#define BLESCANTIME                     15      // [seconds]
+#define BLESCANTIME                     10      // [seconds]
 #define BLESCANCYCLE                    2       // BLE scan once after each <BLECYCLE> wifi scans
 
 // WiFi Sniffer cycle interval