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

beacon monitor mode (experimental)

Browse Source
This commit is contained in:
Klaus K Wilting 2018-07-31 00:06:05 +02:00
parent b0fa9868b1
commit 455c2c8149
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -158,7 +158,7 @@ Hereafter described is the default *plain* format, which uses MSB bit numbering.
byte 14: Vendorfilter mode (0=disabled, 1=enabled) [default 0] byte 14: Vendorfilter mode (0=disabled, 1=enabled) [default 0]
byte 15: RGB LED luminosity (0..100 %) [default 30] byte 15: RGB LED luminosity (0..100 %) [default 30]
byte 16: GPS send data mode (1=on, 0=ff) [default 1] byte 16: GPS send data mode (1=on, 0=ff) [default 1]
byte 17: Beacon monitor mode (1=on, 0=off) [default 0] byte 17: Beacon proximity alarm mode (1=on, 0=off) [default 0]
bytes 18-28: Software version (ASCII format, terminating with zero) bytes 18-28: Software version (ASCII format, terminating with zero)
@ -174,10 +174,10 @@ Hereafter described is the default *plain* format, which uses MSB bit numbering.
byte 1: static value 0x01 byte 1: static value 0x01
**Port #6:** Beacon monitor alarm **Port #6:** Beacon proximity alarm
byte 1: Beacon RSSI reception level byte 1: Beacon RSSI reception level
byte 2: Beacon identifier byte 2: Beacon identifier (0..254)
[**plain_decoder.js**](src/TTN/plain_decoder.js) [**plain_decoder.js**](src/TTN/plain_decoder.js)
@ -311,15 +311,15 @@ Note: all settings are stored in NVRAM and will be reloaded when device starts.
0 ... 100 percentage of luminosity (100% = full light) 0 ... 100 percentage of luminosity (100% = full light)
e.g. 50 -> 50% of luminosity [default] e.g. 50 -> 50% of luminosity [default]
0x11 set beacon monitor mode on/off 0x11 set beacon proximity alarm mode on/off
0 = Beacon monitor mode off [default] 0 = Beacon monitor mode off [default]
1 = Beacon monitor mode on, enables proximity alarm if test beacons are seen 1 = Beacon monitor mode on, enables proximity alarm if test beacons are seen
0x12 set or reset a beacon MAC 0x12 set or reset a beacon MAC for proximity alarm
byte 1 = beacon ID (0..255) byte 1 = beacon ID (0..254)
bytes 2..9 = beacon MAC bytes 2..7 = beacon MAC with 6 digits (e.g. MAC 80:ab:00:01:02:03 -> 0x80ab00010203)
0x80 get device configuration 0x80 get device configuration

6
src/rcommand.cpp
View File

@ -174,12 +174,12 @@ void set_gps(uint8_t val[]) {
}; };
void set_beacon(uint8_t val[]) { void set_beacon(uint8_t val[]) {
if ( (sizeof(*val) / sizeof(val[0]) == 9) && (val[0] <= 0xff ) ) { if ( (sizeof(*val) / sizeof(val[0]) == 7) && (val[0] <= 0xff ) ) {
uint8_t id = val[0]; // use first parameter as beacon storage id uint8_t id = val[0]; // use first parameter as beacon storage id
memmove(val, val + 1, 8); // strip off storage id memmove(val, val + 1, 6); // strip off storage id
beacons[id] = macConvert(val); // store beacon MAC in array beacons[id] = macConvert(val); // store beacon MAC in array
ESP_LOGI(TAG, "Remote command: set beacon ID#%d", id); ESP_LOGI(TAG, "Remote command: set beacon ID#%d", id);
printKey("MAC", val, 8, false); // show beacon MAC printKey("MAC", val, 6, false); // show beacon MAC
} else } else
ESP_LOGW(TAG, "Remote command: set beacon called with invalid parameters"); ESP_LOGW(TAG, "Remote command: set beacon called with invalid parameters");
}; };