bartek/binary-clock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor AT commands

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2020-11-19 18:09:23 +01:00
parent 8b47ed295e
commit 28e2b6114a
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
firmware/at.c
View File

@@ -18,8 +18,8 @@ const struct AT_CMD at_commands[AT_NUM] PROGMEM = {
{ "AT", cmd_at_handler }, { "AT", cmd_at_handler },
{ "ATI", cmd_ati_handler }, { "ATI", cmd_ati_handler },
{ "AT+RST", cmd_at_rst_handler }, { "AT+RST", cmd_at_rst_handler },
{ "AT+TIME", cmd_at_time_handler }, { "AT+TIM", cmd_at_time_handler },
{ "AT+BTNES", cmd_at_btnes_handler }, { "AT+BTS", cmd_at_btnes_handler },
{ "AT+NGT", cmd_at_ngt_handler } { "AT+NGT", cmd_at_ngt_handler }
}; };
@@ -150,7 +150,7 @@ int8_t cmd_at_time_handler(uint8_t mode, char* arg)
rtc_set_time(&time); rtc_set_time(&time);
uart_puts("+TIME="); uart_puts("+TIM=");
uart_puti(time.hour, 10); uart_puti(time.hour, 10);
uart_puts(","); uart_puts(",");
uart_puti(time.minute, 10); uart_puti(time.minute, 10);
@@ -160,7 +160,7 @@ int8_t cmd_at_time_handler(uint8_t mode, char* arg)
break; break;
case M_NORM: case M_NORM:
uart_puts("AT+TIME=(0-23),(0-59),(0-59)\r\n"); uart_puts("AT+TIM=(0-23),(0-59),(0-59)\r\n");
} }
return 0; return 0;
@@ -168,12 +168,12 @@ 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_btnes_handler(uint8_t mode, char* arg)
{ {
uint8_t btness; uint8_t btnes;
switch(mode) switch(mode)
{ {
case M_GET: case M_GET:
uart_puti(ram_cfg.led_brightness, 10); uart_puti(ram_cfg.led_btnes, 10);
uart_puts("\n\r"); uart_puts("\n\r");
break; break;
@@ -181,18 +181,18 @@ int8_t cmd_at_btnes_handler(uint8_t mode, char* arg)
case M_SET: case M_SET:
if(!strlen(arg)) return -1; if(!strlen(arg)) return -1;
btness = atoi(arg); btnes = atoi(arg);
if(btness >= 8) return -1; if(btnes >= 8) return -1;
led_set_btness(btness); led_set_btnes(btnes);
uart_puts("+BTNES="); uart_puts("+BTS=");
uart_puts(arg); uart_puts(arg);
uart_puts("\n\r"); uart_puts("\n\r");
break; break;
case M_NORM: case M_NORM:
uart_puts("AT+BTNES=(0-7)\n\r"); uart_puts("AT+BTS=(0-7)\n\r");
} }
return 0; return 0;

2
firmware/at.h
View File

@@ -9,7 +9,7 @@
struct AT_CMD struct AT_CMD
{ {
char cmd[8]; char cmd[7];
int8_t (*handler)(uint8_t mode, char* arg); int8_t (*handler)(uint8_t mode, char* arg);
}; };

2
firmware/config.h
View File

@@ -19,7 +19,7 @@ struct NIGHTM_CFG
struct CFG struct CFG
{ {
uint8_t led_brightness; uint8_t led_btnes;
struct NIGHTM_CFG night_mode; struct NIGHTM_CFG night_mode;
}; };

2
firmware/keyboard.c
View File

@@ -27,7 +27,7 @@ void inc_second(void)
void inc_brightness(void) void inc_brightness(void)
{ {
led_inc_btness(); led_inc_btnes();
} }
void keyboard_init(void) void keyboard_init(void)

12
firmware/led.c
View File

@@ -9,7 +9,7 @@ volatile uint8_t led_btnes;
void led_init(void) void led_init(void)
{ {
// Set brightness // Set brightness
led_btnes = 1<<(ram_cfg.led_brightness); led_btnes = 1<<(ram_cfg.led_btnes);
// Set outputs // Set outputs
ANODES_DIR |= HOUR_ANODE | MINUTE_ANODE | SECOND_ANODE; ANODES_DIR |= HOUR_ANODE | MINUTE_ANODE | SECOND_ANODE;
@@ -23,18 +23,18 @@ void led_init(void)
TIMSK |= (1<<TOIE0); TIMSK |= (1<<TOIE0);
} }
void led_set_btness(uint8_t btnes) void led_set_btnes(uint8_t btnes)
{ {
if(btnes > 7) btnes = 0; if(btnes > 7) btnes = 0;
led_btnes = 1<<btnes; led_btnes = 1<<btnes;
ram_cfg.led_brightness = btnes; ram_cfg.led_btnes = btnes;
dump_ram2eem(); dump_ram2eem();
} }
void led_inc_btness(void) void led_inc_btnes(void)
{ {
if(++(ram_cfg.led_brightness) > 7) ram_cfg.led_brightness = 0; if(++(ram_cfg.led_btnes) > 7) ram_cfg.led_btnes = 0;
led_btnes = 1<<(ram_cfg.led_brightness); led_btnes = 1<<(ram_cfg.led_btnes);
dump_ram2eem(); dump_ram2eem();
} }

4
firmware/led.h
View File

@@ -16,7 +16,7 @@ extern volatile struct TIME_HMS led_display;
extern volatile uint8_t led_btnes; extern volatile uint8_t led_btnes;
void led_init(void); void led_init(void);
void led_set_btness(uint8_t btness); void led_set_btnes(uint8_t btnes);
void led_inc_btness(void); void led_inc_btnes(void);
#endif #endif

2
firmware/nightm.c
View File

@@ -19,6 +19,6 @@ void nightm_handle(struct TIME_HMS* curr_time)
led_btnes = (begin <= current && current < end) led_btnes = (begin <= current && current < end)
? 1<<(ram_cfg.night_mode.led_btnes) ? 1<<(ram_cfg.night_mode.led_btnes)
: 1<<(ram_cfg.led_brightness); : 1<<(ram_cfg.led_btnes);
} }
} }