From 1b79ffcad2822a6105a453f78ab6d6af9c6f692a Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 2 Jul 2021 13:06:34 -0400 Subject: [PATCH] lcd_st7920: Check CONFIG_MACH_AVR for slow mcus Use CONFIG_MACH_AVR instead of CONFIG_CLOCK_FREQ to check for slow mcus. Some fast MCUs do not export a high clock frequency. Signed-off-by: Kevin O'Connor --- src/lcd_hd44780.c | 4 ++-- src/lcd_st7920.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lcd_hd44780.c b/src/lcd_hd44780.c index fdba70c9..0afca915 100644 --- a/src/lcd_hd44780.c +++ b/src/lcd_hd44780.c @@ -4,7 +4,7 @@ // // This file may be distributed under the terms of the GNU GPLv3 license. -#include "autoconf.h" // CONFIG_CLOCK_FREQ +#include "autoconf.h" // CONFIG_MACH_AVR #include "basecmd.h" // oid_alloc #include "board/gpio.h" // gpio_out_write #include "board/irq.h" // irq_disable @@ -32,7 +32,7 @@ nsecs_to_ticks(uint32_t ns) static inline void ndelay(uint32_t nsecs) { - if (CONFIG_CLOCK_FREQ <= 48000000) + if (CONFIG_MACH_AVR) // Slower MCUs don't require a delay return; uint32_t end = timer_read_time() + nsecs_to_ticks(nsecs); diff --git a/src/lcd_st7920.c b/src/lcd_st7920.c index 095870c5..7845c09f 100644 --- a/src/lcd_st7920.c +++ b/src/lcd_st7920.c @@ -4,7 +4,7 @@ // // This file may be distributed under the terms of the GNU GPLv3 license. -#include "autoconf.h" // CONFIG_CLOCK_FREQ +#include "autoconf.h" // CONFIG_MACH_AVR #include "basecmd.h" // oid_alloc #include "board/gpio.h" // gpio_out_write #include "board/irq.h" // irq_poll @@ -31,7 +31,7 @@ nsecs_to_ticks(uint32_t ns) static inline void ndelay(uint32_t nsecs) { - if (CONFIG_CLOCK_FREQ <= 48000000) + if (CONFIG_MACH_AVR) // Slower MCUs don't require a delay return; uint32_t end = timer_read_time() + nsecs_to_ticks(nsecs);