fixed naming inconsistencies

This commit is contained in:
Thies Lennart Alff 2025-02-24 17:45:09 +01:00
parent afd4f400da
commit f9183bce2e
Signed by: lennartalff
GPG key ID: 4EC67D34D594104D
7 changed files with 12 additions and 11 deletions

View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "protocol.h" #include "protocol.h"
#include "hydrolink_enums.h"
#include "hydrolink_msg_ack.h" #include "hydrolink_msg_ack.h"
#include "hydrolink_msg_set_cmd.h" #include "hydrolink_msg_set_cmd.h"
#include "hydrolink_msg_set_response.h" #include "hydrolink_msg_set_response.h"

View file

@ -1,7 +1,7 @@
#pragma once #pragma once
typedef enum CMD_ID { typedef enum CMD_ID {
CMD_ID_SWITCH = 1, /// Command for getting/setting the state of a switch CMD_ID_SWITCH = 1, /// Command for getting/setting the state of a switch
CMD_ID_CMD_ID_PWM = 2, /// Command for getting/setting the value of a PWM channel CMD_ID_PWM = 2, /// Command for getting/setting the value of a PWM channel
CMD_ID_ENUM_END = 3 CMD_ID_ENUM_END = 3
}CMD_ID; }CMD_ID;
#pragma once #pragma once

View file

@ -9,7 +9,7 @@ typedef struct hydrolink_msg_ack_t_s {
uint8_t ack; /// uint8_t ack; ///
} hydrolink_msg_ack_t; } hydrolink_msg_ack_t;
static inline void hydrolink_ack_msg_encode(uint8_t src_id, uint8_t dst_id, const hydrolink_msg_ack_t *msg, hydrolink_msg_t *packet) { static inline void hydrolink_msg_ack_encode(uint8_t src_id, uint8_t dst_id, const hydrolink_msg_ack_t *msg, hydrolink_msg_t *packet) {
packet->id = HYDROLINK_MSG_ID_ACK; packet->id = HYDROLINK_MSG_ID_ACK;
packet->src_id = src_id; packet->src_id = src_id;
packet->dst_id = dst_id; packet->dst_id = dst_id;
@ -20,6 +20,6 @@ static inline void hydrolink_ack_msg_encode(uint8_t src_id, uint8_t dst_id, cons
static inline uint8_t hydrolink_msg_ack_get_ack(const hydrolink_msg_t *packet) { static inline uint8_t hydrolink_msg_ack_get_ack(const hydrolink_msg_t *packet) {
return HYDROLINK_RETURN_uint8_t(packet, 0); return HYDROLINK_RETURN_uint8_t(packet, 0);
} }
static inline void hydrolink_msgack_decode(const hydrolink_msg_t *packet, hydrolink_msg_ack_t *ack) { static inline void hydrolink_msg_ack_decode(const hydrolink_msg_t *packet, hydrolink_msg_ack_t *ack) {
ack->ack = hydrolink_msg_ack_get_ack(packet); ack->ack = hydrolink_msg_ack_get_ack(packet);
} }

View file

@ -10,7 +10,7 @@ uint8_t index; ///
uint8_t cmd_id; /// uint8_t cmd_id; ///
} hydrolink_msg_get_cmd_t; } hydrolink_msg_get_cmd_t;
static inline void hydrolink_get_cmd_msg_encode(uint8_t src_id, uint8_t dst_id, const hydrolink_msg_get_cmd_t *msg, hydrolink_msg_t *packet) { static inline void hydrolink_msg_get_cmd_encode(uint8_t src_id, uint8_t dst_id, const hydrolink_msg_get_cmd_t *msg, hydrolink_msg_t *packet) {
packet->id = HYDROLINK_MSG_ID_GET_CMD; packet->id = HYDROLINK_MSG_ID_GET_CMD;
packet->src_id = src_id; packet->src_id = src_id;
packet->dst_id = dst_id; packet->dst_id = dst_id;
@ -25,7 +25,7 @@ static inline uint8_t hydrolink_msg_get_cmd_get_index(const hydrolink_msg_t *pac
static inline uint8_t hydrolink_msg_get_cmd_get_cmd_id(const hydrolink_msg_t *packet) { static inline uint8_t hydrolink_msg_get_cmd_get_cmd_id(const hydrolink_msg_t *packet) {
return HYDROLINK_RETURN_uint8_t(packet, 1); return HYDROLINK_RETURN_uint8_t(packet, 1);
} }
static inline void hydrolink_msgget_cmd_decode(const hydrolink_msg_t *packet, hydrolink_msg_get_cmd_t *get_cmd) { static inline void hydrolink_msg_get_cmd_decode(const hydrolink_msg_t *packet, hydrolink_msg_get_cmd_t *get_cmd) {
get_cmd->index = hydrolink_msg_get_cmd_get_index(packet); get_cmd->index = hydrolink_msg_get_cmd_get_index(packet);
get_cmd->cmd_id = hydrolink_msg_get_cmd_get_cmd_id(packet); get_cmd->cmd_id = hydrolink_msg_get_cmd_get_cmd_id(packet);
} }

View file

@ -11,7 +11,7 @@ uint8_t result; ///
uint8_t cmd_id; /// uint8_t cmd_id; ///
} hydrolink_msg_get_response_t; } hydrolink_msg_get_response_t;
static inline void hydrolink_get_response_msg_encode(uint8_t src_id, uint8_t dst_id, const hydrolink_msg_get_response_t *msg, hydrolink_msg_t *packet) { static inline void hydrolink_msg_get_response_encode(uint8_t src_id, uint8_t dst_id, const hydrolink_msg_get_response_t *msg, hydrolink_msg_t *packet) {
packet->id = HYDROLINK_MSG_ID_GET_RESPONSE; packet->id = HYDROLINK_MSG_ID_GET_RESPONSE;
packet->src_id = src_id; packet->src_id = src_id;
packet->dst_id = dst_id; packet->dst_id = dst_id;
@ -30,7 +30,7 @@ static inline uint8_t hydrolink_msg_get_response_get_result(const hydrolink_msg_
static inline uint8_t hydrolink_msg_get_response_get_cmd_id(const hydrolink_msg_t *packet) { static inline uint8_t hydrolink_msg_get_response_get_cmd_id(const hydrolink_msg_t *packet) {
return HYDROLINK_RETURN_uint8_t(packet, 5); return HYDROLINK_RETURN_uint8_t(packet, 5);
} }
static inline void hydrolink_msgget_response_decode(const hydrolink_msg_t *packet, hydrolink_msg_get_response_t *get_response) { static inline void hydrolink_msg_get_response_decode(const hydrolink_msg_t *packet, hydrolink_msg_get_response_t *get_response) {
get_response->value = hydrolink_msg_get_response_get_value(packet); get_response->value = hydrolink_msg_get_response_get_value(packet);
get_response->result = hydrolink_msg_get_response_get_result(packet); get_response->result = hydrolink_msg_get_response_get_result(packet);
get_response->cmd_id = hydrolink_msg_get_response_get_cmd_id(packet); get_response->cmd_id = hydrolink_msg_get_response_get_cmd_id(packet);

View file

@ -11,7 +11,7 @@ uint8_t index; ///
uint8_t cmd_id; /// Command defined as in CMD_ID enum. uint8_t cmd_id; /// Command defined as in CMD_ID enum.
} hydrolink_msg_set_cmd_t; } hydrolink_msg_set_cmd_t;
static inline void hydrolink_set_cmd_msg_encode(uint8_t src_id, uint8_t dst_id, const hydrolink_msg_set_cmd_t *msg, hydrolink_msg_t *packet) { static inline void hydrolink_msg_set_cmd_encode(uint8_t src_id, uint8_t dst_id, const hydrolink_msg_set_cmd_t *msg, hydrolink_msg_t *packet) {
packet->id = HYDROLINK_MSG_ID_SET_CMD; packet->id = HYDROLINK_MSG_ID_SET_CMD;
packet->src_id = src_id; packet->src_id = src_id;
packet->dst_id = dst_id; packet->dst_id = dst_id;
@ -30,7 +30,7 @@ static inline uint8_t hydrolink_msg_set_cmd_get_index(const hydrolink_msg_t *pac
static inline uint8_t hydrolink_msg_set_cmd_get_cmd_id(const hydrolink_msg_t *packet) { static inline uint8_t hydrolink_msg_set_cmd_get_cmd_id(const hydrolink_msg_t *packet) {
return HYDROLINK_RETURN_uint8_t(packet, 5); return HYDROLINK_RETURN_uint8_t(packet, 5);
} }
static inline void hydrolink_msgset_cmd_decode(const hydrolink_msg_t *packet, hydrolink_msg_set_cmd_t *set_cmd) { static inline void hydrolink_msg_set_cmd_decode(const hydrolink_msg_t *packet, hydrolink_msg_set_cmd_t *set_cmd) {
set_cmd->value = hydrolink_msg_set_cmd_get_value(packet); set_cmd->value = hydrolink_msg_set_cmd_get_value(packet);
set_cmd->index = hydrolink_msg_set_cmd_get_index(packet); set_cmd->index = hydrolink_msg_set_cmd_get_index(packet);
set_cmd->cmd_id = hydrolink_msg_set_cmd_get_cmd_id(packet); set_cmd->cmd_id = hydrolink_msg_set_cmd_get_cmd_id(packet);

View file

@ -10,7 +10,7 @@ uint8_t result; ///
uint8_t cmd_id; /// uint8_t cmd_id; ///
} hydrolink_msg_set_response_t; } hydrolink_msg_set_response_t;
static inline void hydrolink_set_response_msg_encode(uint8_t src_id, uint8_t dst_id, const hydrolink_msg_set_response_t *msg, hydrolink_msg_t *packet) { static inline void hydrolink_msg_set_response_encode(uint8_t src_id, uint8_t dst_id, const hydrolink_msg_set_response_t *msg, hydrolink_msg_t *packet) {
packet->id = HYDROLINK_MSG_ID_SET_RESPONSE; packet->id = HYDROLINK_MSG_ID_SET_RESPONSE;
packet->src_id = src_id; packet->src_id = src_id;
packet->dst_id = dst_id; packet->dst_id = dst_id;
@ -25,7 +25,7 @@ static inline uint8_t hydrolink_msg_set_response_get_result(const hydrolink_msg_
static inline uint8_t hydrolink_msg_set_response_get_cmd_id(const hydrolink_msg_t *packet) { static inline uint8_t hydrolink_msg_set_response_get_cmd_id(const hydrolink_msg_t *packet) {
return HYDROLINK_RETURN_uint8_t(packet, 1); return HYDROLINK_RETURN_uint8_t(packet, 1);
} }
static inline void hydrolink_msgset_response_decode(const hydrolink_msg_t *packet, hydrolink_msg_set_response_t *set_response) { static inline void hydrolink_msg_set_response_decode(const hydrolink_msg_t *packet, hydrolink_msg_set_response_t *set_response) {
set_response->result = hydrolink_msg_set_response_get_result(packet); set_response->result = hydrolink_msg_set_response_get_result(packet);
set_response->cmd_id = hydrolink_msg_set_response_get_cmd_id(packet); set_response->cmd_id = hydrolink_msg_set_response_get_cmd_id(packet);
} }