Add accelerometer deadzone via UART and ESP-NOW.
Filter BMA456 logs by configurable LSB threshold; master can set deadzone for local sensor or slaves using ACCEL_DEADZONE (UART) and ESP-NOW broadcast until unicast delivery is restored. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -12,6 +12,9 @@ PB_BIND(alox_EspNowDiscover, alox_EspNowDiscover, AUTO)
|
||||
PB_BIND(alox_EspNowSlavePresence, alox_EspNowSlavePresence, AUTO)
|
||||
|
||||
|
||||
PB_BIND(alox_EspNowAccelDeadzone, alox_EspNowAccelDeadzone, AUTO)
|
||||
|
||||
|
||||
PB_BIND(alox_EspNowMessage, alox_EspNowMessage, AUTO)
|
||||
|
||||
|
||||
|
||||
@@ -14,7 +14,8 @@ typedef enum _alox_EspNowMessageType {
|
||||
alox_EspNowMessageType_ESPNOW_UNKNOWN = 0,
|
||||
alox_EspNowMessageType_ESPNOW_DISCOVER = 1,
|
||||
alox_EspNowMessageType_ESPNOW_SLAVE_INFO = 2,
|
||||
alox_EspNowMessageType_ESPNOW_HEARTBEAT = 3
|
||||
alox_EspNowMessageType_ESPNOW_HEARTBEAT = 3,
|
||||
alox_EspNowMessageType_ESPNOW_SET_ACCEL_DEADZONE = 4
|
||||
} alox_EspNowMessageType;
|
||||
|
||||
/* Struct definitions */
|
||||
@@ -31,6 +32,11 @@ typedef struct _alox_EspNowSlavePresence {
|
||||
bool used;
|
||||
} alox_EspNowSlavePresence;
|
||||
|
||||
typedef struct _alox_EspNowAccelDeadzone {
|
||||
uint32_t deadzone;
|
||||
uint32_t client_id; /* 0 = all slaves; otherwise only matching slave_id applies */
|
||||
} alox_EspNowAccelDeadzone;
|
||||
|
||||
typedef struct _alox_EspNowMessage {
|
||||
alox_EspNowMessageType type;
|
||||
pb_size_t which_payload;
|
||||
@@ -38,6 +44,7 @@ typedef struct _alox_EspNowMessage {
|
||||
alox_EspNowDiscover discover;
|
||||
alox_EspNowSlavePresence slave_info;
|
||||
alox_EspNowSlavePresence heartbeat;
|
||||
alox_EspNowAccelDeadzone accel_deadzone;
|
||||
} payload;
|
||||
} alox_EspNowMessage;
|
||||
|
||||
@@ -48,8 +55,9 @@ extern "C" {
|
||||
|
||||
/* Helper constants for enums */
|
||||
#define _alox_EspNowMessageType_MIN alox_EspNowMessageType_ESPNOW_UNKNOWN
|
||||
#define _alox_EspNowMessageType_MAX alox_EspNowMessageType_ESPNOW_HEARTBEAT
|
||||
#define _alox_EspNowMessageType_ARRAYSIZE ((alox_EspNowMessageType)(alox_EspNowMessageType_ESPNOW_HEARTBEAT+1))
|
||||
#define _alox_EspNowMessageType_MAX alox_EspNowMessageType_ESPNOW_SET_ACCEL_DEADZONE
|
||||
#define _alox_EspNowMessageType_ARRAYSIZE ((alox_EspNowMessageType)(alox_EspNowMessageType_ESPNOW_SET_ACCEL_DEADZONE+1))
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -59,9 +67,11 @@ extern "C" {
|
||||
/* Initializer values for message structs */
|
||||
#define alox_EspNowDiscover_init_default {0}
|
||||
#define alox_EspNowSlavePresence_init_default {0, {{NULL}, NULL}, 0, 0, 0, 0}
|
||||
#define alox_EspNowAccelDeadzone_init_default {0, 0}
|
||||
#define alox_EspNowMessage_init_default {_alox_EspNowMessageType_MIN, 0, {alox_EspNowDiscover_init_default}}
|
||||
#define alox_EspNowDiscover_init_zero {0}
|
||||
#define alox_EspNowSlavePresence_init_zero {0, {{NULL}, NULL}, 0, 0, 0, 0}
|
||||
#define alox_EspNowAccelDeadzone_init_zero {0, 0}
|
||||
#define alox_EspNowMessage_init_zero {_alox_EspNowMessageType_MIN, 0, {alox_EspNowDiscover_init_zero}}
|
||||
|
||||
/* Field tags (for use in manual encoding/decoding) */
|
||||
@@ -72,10 +82,13 @@ extern "C" {
|
||||
#define alox_EspNowSlavePresence_slave_id_tag 4
|
||||
#define alox_EspNowSlavePresence_available_tag 5
|
||||
#define alox_EspNowSlavePresence_used_tag 6
|
||||
#define alox_EspNowAccelDeadzone_deadzone_tag 1
|
||||
#define alox_EspNowAccelDeadzone_client_id_tag 2
|
||||
#define alox_EspNowMessage_type_tag 1
|
||||
#define alox_EspNowMessage_discover_tag 2
|
||||
#define alox_EspNowMessage_slave_info_tag 3
|
||||
#define alox_EspNowMessage_heartbeat_tag 4
|
||||
#define alox_EspNowMessage_accel_deadzone_tag 5
|
||||
|
||||
/* Struct field encoding specification for nanopb */
|
||||
#define alox_EspNowDiscover_FIELDLIST(X, a) \
|
||||
@@ -93,30 +106,41 @@ X(a, STATIC, SINGULAR, BOOL, used, 6)
|
||||
#define alox_EspNowSlavePresence_CALLBACK pb_default_field_callback
|
||||
#define alox_EspNowSlavePresence_DEFAULT NULL
|
||||
|
||||
#define alox_EspNowAccelDeadzone_FIELDLIST(X, a) \
|
||||
X(a, STATIC, SINGULAR, UINT32, deadzone, 1) \
|
||||
X(a, STATIC, SINGULAR, UINT32, client_id, 2)
|
||||
#define alox_EspNowAccelDeadzone_CALLBACK NULL
|
||||
#define alox_EspNowAccelDeadzone_DEFAULT NULL
|
||||
|
||||
#define alox_EspNowMessage_FIELDLIST(X, a) \
|
||||
X(a, STATIC, SINGULAR, UENUM, type, 1) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,discover,payload.discover), 2) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,slave_info,payload.slave_info), 3) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,heartbeat,payload.heartbeat), 4)
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,heartbeat,payload.heartbeat), 4) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,accel_deadzone,payload.accel_deadzone), 5)
|
||||
#define alox_EspNowMessage_CALLBACK NULL
|
||||
#define alox_EspNowMessage_DEFAULT NULL
|
||||
#define alox_EspNowMessage_payload_discover_MSGTYPE alox_EspNowDiscover
|
||||
#define alox_EspNowMessage_payload_slave_info_MSGTYPE alox_EspNowSlavePresence
|
||||
#define alox_EspNowMessage_payload_heartbeat_MSGTYPE alox_EspNowSlavePresence
|
||||
#define alox_EspNowMessage_payload_accel_deadzone_MSGTYPE alox_EspNowAccelDeadzone
|
||||
|
||||
extern const pb_msgdesc_t alox_EspNowDiscover_msg;
|
||||
extern const pb_msgdesc_t alox_EspNowSlavePresence_msg;
|
||||
extern const pb_msgdesc_t alox_EspNowAccelDeadzone_msg;
|
||||
extern const pb_msgdesc_t alox_EspNowMessage_msg;
|
||||
|
||||
/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
|
||||
#define alox_EspNowDiscover_fields &alox_EspNowDiscover_msg
|
||||
#define alox_EspNowSlavePresence_fields &alox_EspNowSlavePresence_msg
|
||||
#define alox_EspNowAccelDeadzone_fields &alox_EspNowAccelDeadzone_msg
|
||||
#define alox_EspNowMessage_fields &alox_EspNowMessage_msg
|
||||
|
||||
/* Maximum encoded size of messages (where known) */
|
||||
/* alox_EspNowSlavePresence_size depends on runtime parameters */
|
||||
/* alox_EspNowMessage_size depends on runtime parameters */
|
||||
#define ALOX_MAIN_PROTO_ESP_NOW_MESSAGES_PB_H_MAX_SIZE alox_EspNowDiscover_size
|
||||
#define ALOX_MAIN_PROTO_ESP_NOW_MESSAGES_PB_H_MAX_SIZE alox_EspNowAccelDeadzone_size
|
||||
#define alox_EspNowAccelDeadzone_size 12
|
||||
#define alox_EspNowDiscover_size 6
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@@ -7,6 +7,7 @@ enum EspNowMessageType {
|
||||
ESPNOW_DISCOVER = 1;
|
||||
ESPNOW_SLAVE_INFO = 2;
|
||||
ESPNOW_HEARTBEAT = 3;
|
||||
ESPNOW_SET_ACCEL_DEADZONE = 4;
|
||||
}
|
||||
|
||||
message EspNowDiscover {
|
||||
@@ -22,11 +23,17 @@ message EspNowSlavePresence {
|
||||
bool used = 6;
|
||||
}
|
||||
|
||||
message EspNowAccelDeadzone {
|
||||
uint32 deadzone = 1;
|
||||
uint32 client_id = 2; // 0 = all slaves; otherwise only matching slave_id applies
|
||||
}
|
||||
|
||||
message EspNowMessage {
|
||||
EspNowMessageType type = 1;
|
||||
oneof payload {
|
||||
EspNowDiscover discover = 2;
|
||||
EspNowSlavePresence slave_info = 3;
|
||||
EspNowSlavePresence heartbeat = 4;
|
||||
EspNowAccelDeadzone accel_deadzone = 5;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,6 +30,12 @@ PB_BIND(alox_ClientInput, alox_ClientInput, AUTO)
|
||||
PB_BIND(alox_ClientInputResponse, alox_ClientInputResponse, AUTO)
|
||||
|
||||
|
||||
PB_BIND(alox_AccelDeadzoneRequest, alox_AccelDeadzoneRequest, AUTO)
|
||||
|
||||
|
||||
PB_BIND(alox_AccelDeadzoneResponse, alox_AccelDeadzoneResponse, AUTO)
|
||||
|
||||
|
||||
PB_BIND(alox_OtaStartPayload, alox_OtaStartPayload, AUTO)
|
||||
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@ typedef enum _alox_MessageType {
|
||||
alox_MessageType_VERSION = 3,
|
||||
alox_MessageType_CLIENT_INFO = 4,
|
||||
alox_MessageType_CLIENT_INPUT = 5,
|
||||
alox_MessageType_ACCEL_DEADZONE = 6,
|
||||
alox_MessageType_OTA_START = 16,
|
||||
alox_MessageType_OTA_PAYLOAD = 17,
|
||||
alox_MessageType_OTA_END = 18,
|
||||
@@ -63,6 +64,23 @@ typedef struct _alox_ClientInputResponse {
|
||||
pb_callback_t clients;
|
||||
} alox_ClientInputResponse;
|
||||
|
||||
/* write=false: read deadzone; write=true: apply deadzone (LSB per axis, raw accel units).
|
||||
client_id 0 = local BMA456 on this node; >0 = slave id on master; ignored on slave.
|
||||
all_clients = true (master only): push deadzone to every registered slave via ESP-NOW. */
|
||||
typedef struct _alox_AccelDeadzoneRequest {
|
||||
bool write;
|
||||
uint32_t deadzone;
|
||||
uint32_t client_id;
|
||||
bool all_clients;
|
||||
} alox_AccelDeadzoneRequest;
|
||||
|
||||
typedef struct _alox_AccelDeadzoneResponse {
|
||||
uint32_t deadzone;
|
||||
uint32_t client_id;
|
||||
bool success;
|
||||
uint32_t slaves_updated;
|
||||
} alox_AccelDeadzoneResponse;
|
||||
|
||||
typedef struct _alox_OtaStartPayload {
|
||||
uint32_t total_size;
|
||||
uint32_t block_size;
|
||||
@@ -95,6 +113,8 @@ typedef struct _alox_UartMessage {
|
||||
alox_OtaPayload ota_payload;
|
||||
alox_OtaEndPayload ota_end;
|
||||
alox_OtaStatusPayload ota_status;
|
||||
alox_AccelDeadzoneRequest accel_deadzone_request;
|
||||
alox_AccelDeadzoneResponse accel_deadzone_response;
|
||||
} payload;
|
||||
} alox_UartMessage;
|
||||
|
||||
@@ -122,6 +142,8 @@ extern "C" {
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/* Initializer values for message structs */
|
||||
#define alox_UartMessage_init_default {_alox_MessageType_MIN, 0, {alox_Ack_init_default}}
|
||||
#define alox_Ack_init_default {0}
|
||||
@@ -131,6 +153,8 @@ extern "C" {
|
||||
#define alox_ClientInfoResponse_init_default {{{NULL}, NULL}}
|
||||
#define alox_ClientInput_init_default {0, 0, 0, 0}
|
||||
#define alox_ClientInputResponse_init_default {{{NULL}, NULL}}
|
||||
#define alox_AccelDeadzoneRequest_init_default {0, 0, 0, 0}
|
||||
#define alox_AccelDeadzoneResponse_init_default {0, 0, 0, 0}
|
||||
#define alox_OtaStartPayload_init_default {0, 0}
|
||||
#define alox_OtaPayload_init_default {0, 0, {{NULL}, NULL}}
|
||||
#define alox_OtaEndPayload_init_default {0}
|
||||
@@ -143,6 +167,8 @@ extern "C" {
|
||||
#define alox_ClientInfoResponse_init_zero {{{NULL}, NULL}}
|
||||
#define alox_ClientInput_init_zero {0, 0, 0, 0}
|
||||
#define alox_ClientInputResponse_init_zero {{{NULL}, NULL}}
|
||||
#define alox_AccelDeadzoneRequest_init_zero {0, 0, 0, 0}
|
||||
#define alox_AccelDeadzoneResponse_init_zero {0, 0, 0, 0}
|
||||
#define alox_OtaStartPayload_init_zero {0, 0}
|
||||
#define alox_OtaPayload_init_zero {0, 0, {{NULL}, NULL}}
|
||||
#define alox_OtaEndPayload_init_zero {0}
|
||||
@@ -165,6 +191,14 @@ extern "C" {
|
||||
#define alox_ClientInput_lage_y_tag 3
|
||||
#define alox_ClientInput_bitmask_tag 4
|
||||
#define alox_ClientInputResponse_clients_tag 1
|
||||
#define alox_AccelDeadzoneRequest_write_tag 1
|
||||
#define alox_AccelDeadzoneRequest_deadzone_tag 2
|
||||
#define alox_AccelDeadzoneRequest_client_id_tag 3
|
||||
#define alox_AccelDeadzoneRequest_all_clients_tag 4
|
||||
#define alox_AccelDeadzoneResponse_deadzone_tag 1
|
||||
#define alox_AccelDeadzoneResponse_client_id_tag 2
|
||||
#define alox_AccelDeadzoneResponse_success_tag 3
|
||||
#define alox_AccelDeadzoneResponse_slaves_updated_tag 4
|
||||
#define alox_OtaStartPayload_total_size_tag 1
|
||||
#define alox_OtaStartPayload_block_size_tag 2
|
||||
#define alox_OtaPayload_block_id_tag 1
|
||||
@@ -182,6 +216,8 @@ extern "C" {
|
||||
#define alox_UartMessage_ota_payload_tag 8
|
||||
#define alox_UartMessage_ota_end_tag 9
|
||||
#define alox_UartMessage_ota_status_tag 10
|
||||
#define alox_UartMessage_accel_deadzone_request_tag 11
|
||||
#define alox_UartMessage_accel_deadzone_response_tag 12
|
||||
|
||||
/* Struct field encoding specification for nanopb */
|
||||
#define alox_UartMessage_FIELDLIST(X, a) \
|
||||
@@ -194,7 +230,9 @@ X(a, STATIC, ONEOF, MESSAGE, (payload,client_input_response,payload.client
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,ota_start,payload.ota_start), 7) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,ota_payload,payload.ota_payload), 8) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,ota_end,payload.ota_end), 9) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,ota_status,payload.ota_status), 10)
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,ota_status,payload.ota_status), 10) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,accel_deadzone_request,payload.accel_deadzone_request), 11) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,accel_deadzone_response,payload.accel_deadzone_response), 12)
|
||||
#define alox_UartMessage_CALLBACK NULL
|
||||
#define alox_UartMessage_DEFAULT NULL
|
||||
#define alox_UartMessage_payload_ack_payload_MSGTYPE alox_Ack
|
||||
@@ -206,6 +244,8 @@ X(a, STATIC, ONEOF, MESSAGE, (payload,ota_status,payload.ota_status), 10)
|
||||
#define alox_UartMessage_payload_ota_payload_MSGTYPE alox_OtaPayload
|
||||
#define alox_UartMessage_payload_ota_end_MSGTYPE alox_OtaEndPayload
|
||||
#define alox_UartMessage_payload_ota_status_MSGTYPE alox_OtaStatusPayload
|
||||
#define alox_UartMessage_payload_accel_deadzone_request_MSGTYPE alox_AccelDeadzoneRequest
|
||||
#define alox_UartMessage_payload_accel_deadzone_response_MSGTYPE alox_AccelDeadzoneResponse
|
||||
|
||||
#define alox_Ack_FIELDLIST(X, a) \
|
||||
|
||||
@@ -254,6 +294,22 @@ X(a, CALLBACK, REPEATED, MESSAGE, clients, 1)
|
||||
#define alox_ClientInputResponse_DEFAULT NULL
|
||||
#define alox_ClientInputResponse_clients_MSGTYPE alox_ClientInput
|
||||
|
||||
#define alox_AccelDeadzoneRequest_FIELDLIST(X, a) \
|
||||
X(a, STATIC, SINGULAR, BOOL, write, 1) \
|
||||
X(a, STATIC, SINGULAR, UINT32, deadzone, 2) \
|
||||
X(a, STATIC, SINGULAR, UINT32, client_id, 3) \
|
||||
X(a, STATIC, SINGULAR, BOOL, all_clients, 4)
|
||||
#define alox_AccelDeadzoneRequest_CALLBACK NULL
|
||||
#define alox_AccelDeadzoneRequest_DEFAULT NULL
|
||||
|
||||
#define alox_AccelDeadzoneResponse_FIELDLIST(X, a) \
|
||||
X(a, STATIC, SINGULAR, UINT32, deadzone, 1) \
|
||||
X(a, STATIC, SINGULAR, UINT32, client_id, 2) \
|
||||
X(a, STATIC, SINGULAR, BOOL, success, 3) \
|
||||
X(a, STATIC, SINGULAR, UINT32, slaves_updated, 4)
|
||||
#define alox_AccelDeadzoneResponse_CALLBACK NULL
|
||||
#define alox_AccelDeadzoneResponse_DEFAULT NULL
|
||||
|
||||
#define alox_OtaStartPayload_FIELDLIST(X, a) \
|
||||
X(a, STATIC, SINGULAR, UINT32, total_size, 1) \
|
||||
X(a, STATIC, SINGULAR, UINT32, block_size, 2)
|
||||
@@ -285,6 +341,8 @@ extern const pb_msgdesc_t alox_ClientInfo_msg;
|
||||
extern const pb_msgdesc_t alox_ClientInfoResponse_msg;
|
||||
extern const pb_msgdesc_t alox_ClientInput_msg;
|
||||
extern const pb_msgdesc_t alox_ClientInputResponse_msg;
|
||||
extern const pb_msgdesc_t alox_AccelDeadzoneRequest_msg;
|
||||
extern const pb_msgdesc_t alox_AccelDeadzoneResponse_msg;
|
||||
extern const pb_msgdesc_t alox_OtaStartPayload_msg;
|
||||
extern const pb_msgdesc_t alox_OtaPayload_msg;
|
||||
extern const pb_msgdesc_t alox_OtaEndPayload_msg;
|
||||
@@ -299,6 +357,8 @@ extern const pb_msgdesc_t alox_OtaStatusPayload_msg;
|
||||
#define alox_ClientInfoResponse_fields &alox_ClientInfoResponse_msg
|
||||
#define alox_ClientInput_fields &alox_ClientInput_msg
|
||||
#define alox_ClientInputResponse_fields &alox_ClientInputResponse_msg
|
||||
#define alox_AccelDeadzoneRequest_fields &alox_AccelDeadzoneRequest_msg
|
||||
#define alox_AccelDeadzoneResponse_fields &alox_AccelDeadzoneResponse_msg
|
||||
#define alox_OtaStartPayload_fields &alox_OtaStartPayload_msg
|
||||
#define alox_OtaPayload_fields &alox_OtaPayload_msg
|
||||
#define alox_OtaEndPayload_fields &alox_OtaEndPayload_msg
|
||||
@@ -313,6 +373,8 @@ extern const pb_msgdesc_t alox_OtaStatusPayload_msg;
|
||||
/* alox_ClientInputResponse_size depends on runtime parameters */
|
||||
/* alox_OtaPayload_size depends on runtime parameters */
|
||||
#define ALOX_MAIN_PROTO_UART_MESSAGES_PB_H_MAX_SIZE alox_ClientInput_size
|
||||
#define alox_AccelDeadzoneRequest_size 16
|
||||
#define alox_AccelDeadzoneResponse_size 20
|
||||
#define alox_Ack_size 0
|
||||
#define alox_ClientInput_size 22
|
||||
#define alox_OtaEndPayload_size 6
|
||||
|
||||
@@ -9,6 +9,7 @@ enum MessageType {
|
||||
VERSION = 3;
|
||||
CLIENT_INFO = 4;
|
||||
CLIENT_INPUT = 5;
|
||||
ACCEL_DEADZONE = 6;
|
||||
OTA_START = 16;
|
||||
OTA_PAYLOAD = 17;
|
||||
OTA_END = 18;
|
||||
@@ -28,6 +29,8 @@ message UartMessage {
|
||||
OtaPayload ota_payload = 8;
|
||||
OtaEndPayload ota_end = 9;
|
||||
OtaStatusPayload ota_status = 10;
|
||||
AccelDeadzoneRequest accel_deadzone_request = 11;
|
||||
AccelDeadzoneResponse accel_deadzone_response = 12;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,6 +70,23 @@ message ClientInputResponse {
|
||||
repeated ClientInput clients = 1;
|
||||
}
|
||||
|
||||
// write=false: read deadzone; write=true: apply deadzone (LSB per axis, raw accel units).
|
||||
// client_id 0 = local BMA456 on this node; >0 = slave id on master; ignored on slave.
|
||||
// all_clients = true (master only): push deadzone to every registered slave via ESP-NOW.
|
||||
message AccelDeadzoneRequest {
|
||||
bool write = 1;
|
||||
uint32 deadzone = 2;
|
||||
uint32 client_id = 3;
|
||||
bool all_clients = 4;
|
||||
}
|
||||
|
||||
message AccelDeadzoneResponse {
|
||||
uint32 deadzone = 1;
|
||||
uint32 client_id = 2;
|
||||
bool success = 3;
|
||||
uint32 slaves_updated = 4;
|
||||
}
|
||||
|
||||
message OtaStartPayload {
|
||||
uint32 total_size = 1;
|
||||
uint32 block_size = 2;
|
||||
|
||||
Reference in New Issue
Block a user