summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlonkaars <loek@pipeframe.xyz>2022-05-26 14:09:41 +0200
committerlonkaars <loek@pipeframe.xyz>2022-05-26 14:09:41 +0200
commit2a88cf72a211746f4da582850dc5d65ea7bfd4dc (patch)
tree7810d060c6790f05717fa8ed52e6b7b8099a4760
parentd70f4f44f927281d6c9bfff64264bd754d682dc8 (diff)
typedef enums
-rw-r--r--robot/errcatch.c6
-rw-r--r--robot/errcatch.h6
-rw-r--r--shared/errors.h6
-rw-r--r--shared/protocol.h4
4 files changed, 11 insertions, 11 deletions
diff --git a/robot/errcatch.c b/robot/errcatch.c
index cf06f5d..e44acfd 100644
--- a/robot/errcatch.c
+++ b/robot/errcatch.c
@@ -28,7 +28,7 @@ void w2_errcatch_main() {
}
}
-w2_s_error *w2_alloc_error(enum w2_e_errorcodes code, uint16_t length, const char *message) {
+w2_s_error *w2_alloc_error(w2_e_errorcode code, uint16_t length, const char *message) {
w2_s_error *error = malloc(sizeof(w2_s_error) + length);
memcpy(error, &(w2_s_error const){.code = code, .message_length = length}, sizeof(w2_s_error));
strncpy(error->message, message, length);
@@ -36,8 +36,8 @@ w2_s_error *w2_alloc_error(enum w2_e_errorcodes code, uint16_t length, const cha
return error;
}
-void w2_errcatch_throw(enum w2_e_errorcodes code) { w2_errcatch_throw_msg(code, 0, ""); }
-void w2_errcatch_throw_msg(enum w2_e_errorcodes code, uint16_t length, const char *message) {
+void w2_errcatch_throw(w2_e_errorcode code) { w2_errcatch_throw_msg(code, 0, ""); }
+void w2_errcatch_throw_msg(w2_e_errorcode code, uint16_t length, const char *message) {
uint8_t next_index = (g_w2_error_index + 1) % W2_ERROR_BUFFER_SIZE;
g_w2_error_buffer_full = next_index == g_w2_error_offset;
free(g_w2_error_buffer[g_w2_error_index]);
diff --git a/robot/errcatch.h b/robot/errcatch.h
index dcb6a97..836da1b 100644
--- a/robot/errcatch.h
+++ b/robot/errcatch.h
@@ -19,14 +19,14 @@ void w2_errcatch_main();
void w2_errcatch_handle_error(w2_s_error *error);
/** append error to error buffer */
-void w2_errcatch_throw(enum w2_e_errorcodes code);
+void w2_errcatch_throw(w2_e_errorcode code);
/** append error to error buffer (with debug message) */
-void w2_errcatch_throw_msg(enum w2_e_errorcodes code, uint16_t length, const char *message);
+void w2_errcatch_throw_msg(w2_e_errorcode code, uint16_t length, const char *message);
/**
* allocate and initialize error struct
*
* TODO: doesn't handle null pointers from malloc
*/
-w2_s_error *w2_alloc_error(enum w2_e_errorcodes code, uint16_t length, const char *message);
+w2_s_error *w2_alloc_error(w2_e_errorcode code, uint16_t length, const char *message);
diff --git a/shared/errors.h b/shared/errors.h
index 280c5ef..985fcb1 100644
--- a/shared/errors.h
+++ b/shared/errors.h
@@ -15,7 +15,7 @@
* error codes are between 0-63 because the two most significant bits are
* reserved for error type checking
*/
-enum w2_e_errorcodes {
+typedef enum {
/** wireless connection lost from either robot or client-side */
W2_E_CRIT_CONN_LOST = 0x00 | W2_E_TYPE_CRIT,
/** serial COM-port unavalable. client-side only */
@@ -39,7 +39,7 @@ enum w2_e_errorcodes {
W2_E_WARN_LINE_LOST = 0x05 | W2_E_TYPE_WARN,
/** serial buffer full, gets thrown on next cycle */
W2_E_WARN_SERCOMM_BUFFER_FULL = 0x06 | W2_E_TYPE_WARN,
-};
+} w2_e_errorcode;
/**
* error struct
@@ -48,7 +48,7 @@ enum w2_e_errorcodes {
* `message_length`
*/
typedef struct {
- enum w2_e_errorcodes code;
+ w2_e_errorcode code;
uint8_t message_length;
char message[];
} w2_s_error;
diff --git a/shared/protocol.h b/shared/protocol.h
index 5bdfcbe..875bb16 100644
--- a/shared/protocol.h
+++ b/shared/protocol.h
@@ -16,7 +16,7 @@
#define W2_CMD_DIRECTION_MASK (1)
#define W2_CMD_COUNT 28
-enum w2_e_scmds {
+typedef enum {
/** ping command */
W2_CMD_PING = 0x00,
/** exception command */
@@ -45,7 +45,7 @@ enum w2_e_scmds {
W2_CMD_PLAY = 0x18,
/** control leds command */
W2_CMD_CLED = 0x1a,
-};
+} w2_e_scmds;
#pragma pack(push, 1)