Last fixes for lab03.2

This commit is contained in:
Arti Zirk 2016-10-24 00:01:26 +03:00
parent 9d5fff9fa0
commit 500c36b81b

View File

@ -23,7 +23,8 @@ int main (void)
/* End init */ /* End init */
/* Print version info to stderr */ /* Print version info to stderr */
fprintf_P(stderr, PSTR(PROG_VERSION), PSTR(GIT_DESCR), PSTR(__DATE__), PSTR(__TIME__)); fprintf_P(stderr, PSTR(PROG_VERSION),
PSTR(GIT_DESCR), PSTR(__DATE__), PSTR(__TIME__));
fprintf_P(stderr, PSTR(LIBC_VERSION), PSTR(__AVR_LIBC_VERSION_STRING__)); fprintf_P(stderr, PSTR(LIBC_VERSION), PSTR(__AVR_LIBC_VERSION_STRING__));
/* End version print */ /* End version print */
@ -45,13 +46,13 @@ int main (void)
_delay_ms(BLINK_DELAY_MS); _delay_ms(BLINK_DELAY_MS);
/* Month search and print */ /* Month search and print */
char month_first_leter; char letter;
fprintf_P(stdout, PSTR(GET_MONTH_MSG)); fprintf_P(stdout, PSTR(GET_MONTH_MSG));
fscanf(stdin, "%c", &month_first_leter); fscanf(stdin, "%c", &letter);
fprintf(stdout, "%c\n", month_first_leter); fprintf(stdout, "%c\n", letter);
lcd_goto(0x40); /* Got to the beginning of the next line */ lcd_goto(0x40); /* Got to the beginning of the next line */
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
if (!strncmp_P(&month_first_leter, (PGM_P)pgm_read_word(&ENG_MONTH[i]), 1)) { if (!strncmp_P(&letter, (PGM_P)pgm_read_word(&ENG_MONTH[i]), 1)) {
fprintf_P(stdout, (PGM_P)pgm_read_word(&ENG_MONTH[i])); fprintf_P(stdout, (PGM_P)pgm_read_word(&ENG_MONTH[i]));
fputc('\n', stdout); fputc('\n', stdout);
lcd_puts_P((PGM_P)pgm_read_word(&ENG_MONTH[i])); lcd_puts_P((PGM_P)pgm_read_word(&ENG_MONTH[i]));
@ -61,7 +62,6 @@ int main (void)
lcd_puts_P(PSTR(" ")); /* Clear the end of the line */ lcd_puts_P(PSTR(" ")); /* Clear the end of the line */
/* set pin 3 low to turn led off */ /* set pin 3 low to turn led off */
PORTA &= ~_BV(PORTA3); PORTA &= ~_BV(PORTA3);
_delay_ms(BLINK_DELAY_MS); _delay_ms(BLINK_DELAY_MS);