DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33 from hallard/master

Browse Source 
Lora Send WiFi MAC instead of WiFi + BLE
This commit is contained in:
Verkehrsrot 2018-04-06 11:01:47 +02:00 committed by GitHub
commit 9793598104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -85,8 +85,8 @@ Paxcounter generates identifiers for sniffed MAC adresses and collects them temp
FPort1: FPort1:
byte 1: 16-bit Total Wifi+BLE counter, MSB byte 1: 16-bit WiFi counter, MSB
byte 2: 16-bit Total Wifi+BLE counter, LSB byte 2: 16-bit WiFi counter, LSB
byte 3: 16-bit BLE counter, MSB byte 3: 16-bit BLE counter, MSB
byte 4: 16-bit BLE counter, LSB byte 4: 16-bit BLE counter, LSB

8
src/loraconf.sample.h
View File

@ -14,15 +14,7 @@
// Note: Use same format as in TTN console (cut & paste, for your convenience) // Note: Use same format as in TTN console (cut & paste, for your convenience)
// *** Take care : If Using a board with Microchip 24AA02E64 Uinique ID for deveui, ** // *** Take care : If Using a board with Microchip 24AA02E64 Uinique ID for deveui, **
// *** this DEVEUI will be overwriten by the one contained in the Microchip module *** // *** this DEVEUI will be overwriten by the one contained in the Microchip module ***
#if defined (ttgov2)
static const u1_t DEVEUI[8]={ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 };
#elif defined (ttgov1)
static const u1_t DEVEUI[8]={ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
#elif defined (heltec_wifi_lora_32)
static const u1_t DEVEUI[8]={ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32 };
#else
static const u1_t DEVEUI[8]={ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const u1_t DEVEUI[8]={ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
#endif
// Note: Use msb format for APPEUI as in TTN console (cut & paste, for your convenience) // Note: Use msb format for APPEUI as in TTN console (cut & paste, for your convenience)
// For TTN, APPEUI always starts with 0x70, 0xB3, 0xD5 // For TTN, APPEUI always starts with 0x70, 0xB3, 0xD5

8
src/lorawan.cpp
View File

@ -113,8 +113,8 @@ void printKeys(void) {
void do_send(osjob_t* j){ void do_send(osjob_t* j){
uint8_t mydata[4]; uint8_t mydata[4];
uint16_t data; uint16_t data;
// Total BLE+WIFI unique MACs seen // Sum of unique WIFI MACs seen
data = (uint16_t) macs.size(); data = (uint16_t) wifis.size();
mydata[0] = (data & 0xff00) >> 8; mydata[0] = (data & 0xff00) >> 8;
mydata[1] = data & 0xff; mydata[1] = data & 0xff;
@ -123,9 +123,9 @@ void do_send(osjob_t* j){
mydata[2] = (data & 0xff00) >> 8; mydata[2] = (data & 0xff00) >> 8;
mydata[3] = data & 0xff; mydata[3] = data & 0xff;
// Sum of unique WIFI MACs seen // Total BLE+WIFI unique MACs seen
// TBD ? // TBD ?
//data = (uint16_t) wifis.size(); //data = (uint16_t) macs.size();
//mydata[4] = (data & 0xff00) >> 8; //mydata[4] = (data & 0xff00) >> 8;
//mydata[5] = data & 0xff; //mydata[5] = data & 0xff;