From c5372a842ead457f1224a1cb5855f77534d2a9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Thu, 19 Nov 2020 22:09:55 +0100 Subject: [PATCH] Create common.h file with meta globals --- firmware/at.c | 21 ++++++++++++--------- firmware/at.h | 4 ++-- firmware/common.h | 9 +++++++++ 3 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 firmware/common.h diff --git a/firmware/at.c b/firmware/at.c index b99c438..6e86377 100644 --- a/firmware/at.c +++ b/firmware/at.c @@ -4,6 +4,7 @@ #include #include #include +#include "common.h" #include "at.h" #include "uart.h" #include "config.h" @@ -12,15 +13,17 @@ #include "led.h" #include "rtc.h" +#define PROJ_STR __PROJ_NAME " " __PROJ_REV " ::: " __PROJ_AUTHOR " " __PROJ_DATE + #define UNUSED(X) (void)(X) const struct AT_CMD at_commands[AT_NUM] PROGMEM = { - { "AT", cmd_at_handler }, - { "ATI", cmd_ati_handler }, - { "AT+RST", cmd_at_rst_handler }, - { "AT+TIM", cmd_at_time_handler }, - { "AT+BTS", cmd_at_btnes_handler }, - { "AT+NGT", cmd_at_ngt_handler } + { "AT", cmd_at_handler }, + { "ATI", cmd_ati_handler }, + { "AT+RST", cmd_at_rst_handler }, + { "AT+TIM", cmd_at_tim_handler }, + { "AT+BTS", cmd_at_bts_handler }, + { "AT+NGT", cmd_at_ngt_handler } }; void parse_at(char* at_cmd, char* arg, uint8_t mode) @@ -87,7 +90,7 @@ int8_t cmd_ati_handler(uint8_t mode, char* arg) if(mode != M_NORM) return -1; - uart_puts_P(PSTR("Binary Clock v1.0 :: Bartlomiej Pluta 2020\r\n")); + uart_puts_P(PSTR(PROJ_STR "\r\n")); uart_puts_P(PSTR("compilation " __DATE__ " " __TIME__ "\n\r")); uart_puts_P(PSTR("avr-libc v" __AVR_LIBC_VERSION_STRING__ " " __AVR_LIBC_DATE_STRING__ "\n\r")); @@ -107,7 +110,7 @@ int8_t cmd_at_rst_handler(uint8_t mode, char* arg) return 0; } -int8_t cmd_at_time_handler(uint8_t mode, char* arg) +int8_t cmd_at_tim_handler(uint8_t mode, char* arg) { struct TIME_HMS n_time; char* val; @@ -157,7 +160,7 @@ int8_t cmd_at_time_handler(uint8_t mode, char* arg) return 0; } -int8_t cmd_at_btnes_handler(uint8_t mode, char* arg) +int8_t cmd_at_bts_handler(uint8_t mode, char* arg) { uint8_t btnes; diff --git a/firmware/at.h b/firmware/at.h index 96f89a2..556df76 100644 --- a/firmware/at.h +++ b/firmware/at.h @@ -18,8 +18,8 @@ void at_handler(char* cmd); int8_t cmd_at_handler(uint8_t mode, char* arg); int8_t cmd_ati_handler(uint8_t mode, char* arg); int8_t cmd_at_rst_handler(uint8_t mode, char* arg); -int8_t cmd_at_time_handler(uint8_t mode, char* arg); -int8_t cmd_at_btnes_handler(uint8_t mode, char* arg); +int8_t cmd_at_tim_handler(uint8_t mode, char* arg); +int8_t cmd_at_bts_handler(uint8_t mode, char* arg); int8_t cmd_at_ngt_handler(uint8_t mode, char* arg); #define AT_NUM 6 diff --git a/firmware/common.h b/firmware/common.h new file mode 100644 index 0000000..3e2189c --- /dev/null +++ b/firmware/common.h @@ -0,0 +1,9 @@ +#ifndef __COMMON_H__ +#define __COMMON_H__ + +#define __PROJ_NAME "Binary Clock" +#define __PROJ_AUTHOR "Bartlomiej Pluta" +#define __PROJ_DATE "2020" +#define __PROJ_REV "rev:1.0" + +#endif \ No newline at end of file