From e7f1a2fb64a3d965eb482a21a585fe6f43378d55 Mon Sep 17 00:00:00 2001 From: Sadeep Madurange Date: Mon, 4 Aug 2025 18:50:54 +0800 Subject: Move uart init to main.c and modify fpm init code. --- fpm.c | 20 ++++++-------------- main.c | 17 +++++++++++++---- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/fpm.c b/fpm.c index 4f3b4ed..6599996 100644 --- a/fpm.c +++ b/fpm.c @@ -5,7 +5,6 @@ #include "fpm.h" #define MAXPDLEN 64 -#define RST_DELAY_MS 500 #define HEADER_HO 0xEF #define HEADER_LO 0x01 @@ -169,21 +168,14 @@ static inline uint8_t img2tz(uint8_t bufid) uint8_t fpm_init(void) { uint8_t rc; + uint16_t dt = 0; - UBRR0H = UBRRH_VALUE; - UBRR0L = UBRRL_VALUE; -#if USE_2X - UCSR0A |= (1 << U2X0); -#else - UCSR0A &= ~(1 << U2X0); -#endif - UCSR0B = (1 << TXEN0) | (1 << RXEN0); - UCSR0C = (1 << UCSZ01) | (1 << UCSZ00); - - _delay_ms(RST_DELAY_MS); + do { + rc = check_pwd(); + _delay_ms(100); + dt += 100; + } while (rc == 0 && dt < 500); - if ((rc = check_pwd())) - fpm_led(OFF, NIL, 0); return rc; } diff --git a/main.c b/main.c index 326f4ac..3af81c5 100644 --- a/main.c +++ b/main.c @@ -18,8 +18,8 @@ #define LED_DDR DDRB #define LED_PORT PORTB -#define PWR_FPM PC4 -#define PWR_SERVO PC5 +#define PWR_SERVO PC4 +#define PWR_FPM PC5 #define PWR_DDR DDRC #define PWR_PORT PORTC @@ -99,7 +99,16 @@ int main(void) PWR_DDR |= (1 << PWR_FPM) | (1 << PWR_SERVO); pwr_fpm_servo_on(); - fpm_init(); + /* UART for FPM */ + UBRR0H = UBRRH_VALUE; + UBRR0L = UBRRL_VALUE; +#if USE_2X + UCSR0A |= (1 << U2X0); +#else + UCSR0A &= ~(1 << U2X0); +#endif + UCSR0B = (1 << TXEN0) | (1 << RXEN0); + UCSR0C = (1 << UCSZ01) | (1 << UCSZ00); /* servo */ TCCR1A |= (1 << WGM11); @@ -168,7 +177,7 @@ int main(void) } cmd = NONE; - _delay_ms(50); + _delay_ms(500); pwr_fpm_servo_off(); set_sleep_mode(SLEEP_MODE_PWR_DOWN); -- cgit v1.2.3