From ba2fcb197e64a5badbe01a7eb4a9e3f6e625b6ec Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Tue, 17 Nov 2020 16:27:36 +0100 Subject: [PATCH] Correct merge error --- main.c | 3 +-- si4432.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 44c8c1b..ca8c09e 100644 --- a/main.c +++ b/main.c @@ -870,8 +870,7 @@ config_t config = { #endif .lcd_palette = LCD_DEFAULT_PALETTE, .vbat_offset = 500, - .frequency_IF2 = 2048600000, - .setting_frequency_10mhz = 1000015.0, + .frequency_IF2 = 0, .low_level_offset = 100, // Uncalibrated .high_level_offset = 100, // Uncalibrated .correction_frequency = { 10000, 100000, 200000, 500000, 50000000, 140000000, 200000000, 300000000, 330000000, 350000000 }, diff --git a/si4432.c b/si4432.c index ce0c24e..fd37ca8 100644 --- a/si4432.c +++ b/si4432.c @@ -2206,7 +2206,7 @@ reset: my_microsecond_delay(1000); SI_SDN_LOW; my_microsecond_delay(1000); - ili9341_set_foreground(BRIGHT_COLOR_GREEN); + ili9341_set_foreground(LCD_BRIGHT_COLOR_GREEN); while (!SI4463_READ_CTS) { ili9341_drawstring_7x13("Waiting", 50, 200); my_microsecond_delay(100);