Merge pull request #33 from hallard/master
Lora Send WiFi MAC instead of WiFi + BLE
This commit is contained in:
commit
9793598104
@ -85,8 +85,8 @@ Paxcounter generates identifiers for sniffed MAC adresses and collects them temp
|
||||
|
||||
FPort1:
|
||||
|
||||
byte 1: 16-bit Total Wifi+BLE counter, MSB
|
||||
byte 2: 16-bit Total Wifi+BLE counter, LSB
|
||||
byte 1: 16-bit WiFi counter, MSB
|
||||
byte 2: 16-bit WiFi counter, LSB
|
||||
byte 3: 16-bit BLE counter, MSB
|
||||
byte 4: 16-bit BLE counter, LSB
|
||||
|
||||
|
@ -14,15 +14,7 @@
|
||||
// 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, **
|
||||
// *** 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 };
|
||||
#endif
|
||||
|
||||
// Note: Use msb format for APPEUI as in TTN console (cut & paste, for your convenience)
|
||||
// For TTN, APPEUI always starts with 0x70, 0xB3, 0xD5
|
||||
|
@ -113,8 +113,8 @@ void printKeys(void) {
|
||||
void do_send(osjob_t* j){
|
||||
uint8_t mydata[4];
|
||||
uint16_t data;
|
||||
// Total BLE+WIFI unique MACs seen
|
||||
data = (uint16_t) macs.size();
|
||||
// Sum of unique WIFI MACs seen
|
||||
data = (uint16_t) wifis.size();
|
||||
mydata[0] = (data & 0xff00) >> 8;
|
||||
mydata[1] = data & 0xff;
|
||||
|
||||
@ -123,9 +123,9 @@ void do_send(osjob_t* j){
|
||||
mydata[2] = (data & 0xff00) >> 8;
|
||||
mydata[3] = data & 0xff;
|
||||
|
||||
// Sum of unique WIFI MACs seen
|
||||
// Total BLE+WIFI unique MACs seen
|
||||
// TBD ?
|
||||
//data = (uint16_t) wifis.size();
|
||||
//data = (uint16_t) macs.size();
|
||||
//mydata[4] = (data & 0xff00) >> 8;
|
||||
//mydata[5] = data & 0xff;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user