Merge branch 'development' of https://github.com/cyberman54/ESP32-Paxcounter into development

This commit is contained in:
Verkehrsrot 2019-10-24 19:20:47 +02:00
commit 71cd663c2d

View File

@ -39,7 +39,7 @@ void printKey(const char *name, const uint8_t *key, uint8_t len, bool lsb) {
uint64_t macConvert(uint8_t *paddr) { uint64_t macConvert(uint8_t *paddr) {
uint64_t *mac; uint64_t *mac;
mac = (uint64_t *)paddr; mac = (uint64_t *)paddr;
return (__builtin_bswap64(*mac) >> 8); return (__builtin_bswap64(*mac) >> 16);
} }
bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) { bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) {
@ -134,4 +134,4 @@ bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) {
// True if MAC WiFi/BLE was new // True if MAC WiFi/BLE was new
return added; // function returns bool if a new and unique Wifi or BLE mac was return added; // function returns bool if a new and unique Wifi or BLE mac was
// counted (true) or not (false) // counted (true) or not (false)
} }