feat: Add sensor hostname prefix to CSI_DATA, BLE_DATA, EVENT packets
Multi-sensor support: all data streams now include CONFIG_CSI_HOSTNAME after the packet type tag. Increase BLE and EVENT buffer sizes.
This commit is contained in:
@@ -310,8 +310,8 @@ static void wifi_csi_rx_cb(void *ctx, wifi_csi_info_t *info)
|
|||||||
ESP_LOGI(TAG, "================ CSI RECV (UDP) ================");
|
ESP_LOGI(TAG, "================ CSI RECV (UDP) ================");
|
||||||
}
|
}
|
||||||
pos = snprintf(s_udp_buffer, sizeof(s_udp_buffer),
|
pos = snprintf(s_udp_buffer, sizeof(s_udp_buffer),
|
||||||
"CSI_DATA,%d," MACSTR ",%d,%d,%d,%d,%d,%d,%d,%d,%d",
|
"CSI_DATA,%s,%d," MACSTR ",%d,%d,%d,%d,%d,%d,%d,%d,%d",
|
||||||
s_count, MAC2STR(info->mac), rx_ctrl->rssi, rx_ctrl->rate,
|
CONFIG_CSI_HOSTNAME, s_count, MAC2STR(info->mac), rx_ctrl->rssi, rx_ctrl->rate,
|
||||||
rx_ctrl->noise_floor, fft_gain, agc_gain, rx_ctrl->channel,
|
rx_ctrl->noise_floor, fft_gain, agc_gain, rx_ctrl->channel,
|
||||||
rx_ctrl->timestamp, rx_ctrl->sig_len, rx_ctrl->rx_state);
|
rx_ctrl->timestamp, rx_ctrl->sig_len, rx_ctrl->rx_state);
|
||||||
#else
|
#else
|
||||||
@@ -319,8 +319,8 @@ static void wifi_csi_rx_cb(void *ctx, wifi_csi_info_t *info)
|
|||||||
ESP_LOGI(TAG, "================ CSI RECV (UDP) ================");
|
ESP_LOGI(TAG, "================ CSI RECV (UDP) ================");
|
||||||
}
|
}
|
||||||
pos = snprintf(s_udp_buffer, sizeof(s_udp_buffer),
|
pos = snprintf(s_udp_buffer, sizeof(s_udp_buffer),
|
||||||
"CSI_DATA,%d," MACSTR ",%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
|
"CSI_DATA,%s,%d," MACSTR ",%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
|
||||||
s_count, MAC2STR(info->mac), rx_ctrl->rssi, rx_ctrl->rate, rx_ctrl->sig_mode,
|
CONFIG_CSI_HOSTNAME, s_count, MAC2STR(info->mac), rx_ctrl->rssi, rx_ctrl->rate, rx_ctrl->sig_mode,
|
||||||
rx_ctrl->mcs, rx_ctrl->cwb, rx_ctrl->smoothing, rx_ctrl->not_sounding,
|
rx_ctrl->mcs, rx_ctrl->cwb, rx_ctrl->smoothing, rx_ctrl->not_sounding,
|
||||||
rx_ctrl->aggregation, rx_ctrl->stbc, rx_ctrl->fec_coding, rx_ctrl->sgi,
|
rx_ctrl->aggregation, rx_ctrl->stbc, rx_ctrl->fec_coding, rx_ctrl->sgi,
|
||||||
rx_ctrl->noise_floor, rx_ctrl->ampdu_cnt, rx_ctrl->channel, rx_ctrl->secondary_channel,
|
rx_ctrl->noise_floor, rx_ctrl->ampdu_cnt, rx_ctrl->channel, rx_ctrl->secondary_channel,
|
||||||
@@ -509,9 +509,10 @@ static int ble_gap_event_cb(struct ble_gap_event *event, void *arg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Send BLE_DATA via UDP */
|
/* Send BLE_DATA via UDP */
|
||||||
char buf[128];
|
char buf[160];
|
||||||
int len = snprintf(buf, sizeof(buf),
|
int len = snprintf(buf, sizeof(buf),
|
||||||
"BLE_DATA,%02x:%02x:%02x:%02x:%02x:%02x,%d,%s,%s\n",
|
"BLE_DATA,%s,%02x:%02x:%02x:%02x:%02x:%02x,%d,%s,%s\n",
|
||||||
|
CONFIG_CSI_HOSTNAME,
|
||||||
disc->addr.val[5], disc->addr.val[4], disc->addr.val[3],
|
disc->addr.val[5], disc->addr.val[4], disc->addr.val[3],
|
||||||
disc->addr.val[2], disc->addr.val[1], disc->addr.val[0],
|
disc->addr.val[2], disc->addr.val[1], disc->addr.val[0],
|
||||||
disc->rssi,
|
disc->rssi,
|
||||||
@@ -624,10 +625,10 @@ static void adaptive_task(void *arg)
|
|||||||
wifi_ping_router_start();
|
wifi_ping_router_start();
|
||||||
|
|
||||||
/* Notify Pi */
|
/* Notify Pi */
|
||||||
char event[80];
|
char event[128];
|
||||||
int len = snprintf(event, sizeof(event),
|
int len = snprintf(event, sizeof(event),
|
||||||
"EVENT motion=%d rate=%d wander=%.6f",
|
"EVENT,%s,motion=%d rate=%d wander=%.6f",
|
||||||
motion ? 1 : 0, target_rate, wander);
|
CONFIG_CSI_HOSTNAME, motion ? 1 : 0, target_rate, wander);
|
||||||
if (s_udp_socket >= 0) {
|
if (s_udp_socket >= 0) {
|
||||||
sendto(s_udp_socket, event, len, 0,
|
sendto(s_udp_socket, event, len, 0,
|
||||||
(struct sockaddr *)&s_dest_addr, sizeof(s_dest_addr));
|
(struct sockaddr *)&s_dest_addr, sizeof(s_dest_addr));
|
||||||
|
|||||||
Reference in New Issue
Block a user