From fe532f32fe3ed734e1ce6a83f93c4ece2cfd197c Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Wed, 30 Jun 2021 15:10:45 +0800
Subject: [PATCH] Some more fixes.

---
 radio/src/keys.h                          |  2 +-
 radio/src/lua/CMakeLists.txt              |  2 +-
 radio/src/targets/nv14/board.cpp          |  2 +-
 radio/src/targets/nv14/libopenui_config.h | 36 ++++++++++++-----------
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/radio/src/keys.h b/radio/src/keys.h
index f8d30f1e5..bbe71e09b 100644
--- a/radio/src/keys.h
+++ b/radio/src/keys.h
@@ -32,7 +32,7 @@ constexpr event_t EVT_ENTRY_UP =       0x1002;
 constexpr event_t EVT_ROTARY_LEFT =    0x1003;
 constexpr event_t EVT_ROTARY_RIGHT =   0x1004;
 
-#if defined(PCBHORUS)
+#if defined(PCBHORUS) || defined (PCBNV14)
 constexpr event_t _MSK_KEY_BREAK =     0x0200;
 constexpr event_t _MSK_KEY_REPT =      0x0400;
 constexpr event_t _MSK_KEY_FIRST =     0x0600;
diff --git a/radio/src/lua/CMakeLists.txt b/radio/src/lua/CMakeLists.txt
index cab6bcd4f..8325bb2aa 100644
--- a/radio/src/lua/CMakeLists.txt
+++ b/radio/src/lua/CMakeLists.txt
@@ -33,5 +33,5 @@ if(PYTHONINTERP_FOUND)
   add_lua_export_target(tx12      ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_TX12)
   add_lua_export_target(t8        ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_T8)
   add_lua_export_target(t16       ${LUA_INCLUDES} -DPCBHORUS   -DPCBX10 -DRADIO_T16)
-  add_lua_export_target(nv14      ${LUA_INCLUDES} -DPCBFLYSKY  -DPCBNV14)
+  add_lua_export_target(nv14      ${LUA_INCLUDES} -I${RADIO_SRC_DIR}/targets/nv14 -DPCBNV14)
 endif()
diff --git a/radio/src/targets/nv14/board.cpp b/radio/src/targets/nv14/board.cpp
index 809c8c62b..8608806ea 100644
--- a/radio/src/targets/nv14/board.cpp
+++ b/radio/src/targets/nv14/board.cpp
@@ -134,7 +134,7 @@ void delay_self(int count)
                                AUDIO_RCC_AHB1Periph |\
                                HAPTIC_RCC_AHB1Periph |\
                                INTMODULE_RCC_AHB1Periph |\
-                               INTMODULE_RCC_AHB1Periph|\
+                               FLYSKY_HALL_RCC_AHB1Periph |\
                                EXTMODULE_RCC_AHB1Periph\
                               )
 #define RCC_AHB3PeriphMinimum (SDRAM_RCC_AHB3Periph)
diff --git a/radio/src/targets/nv14/libopenui_config.h b/radio/src/targets/nv14/libopenui_config.h
index a24c6fef9..502856879 100644
--- a/radio/src/targets/nv14/libopenui_config.h
+++ b/radio/src/targets/nv14/libopenui_config.h
@@ -18,19 +18,34 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _LIBOPENUI_CONFIG_H_
-#define _LIBOPENUI_CONFIG_H_
+#pragma once
 
 #include "debug.h"
 #include "libopenui_defines.h"
+
 #include "colors.h"
 #include "board.h"
 #include "keys.h"
 
+enum FontIndex
+{
+  FONT_STD_INDEX,
+#if !defined(BOLD)
+  FONT_BOLD_INDEX,
+  FONT_XXS_INDEX,
+  FONT_XS_INDEX,
+  FONT_L_INDEX,
+  FONT_XL_INDEX,
+  FONT_XXL_INDEX,
+#endif
+  
+  FONTS_COUNT
+};
+
 typedef uint16_t pixel_t;
 
 constexpr bool WRAP_FORM_FIELDS_WITHIN_PAGE = true;
-constexpr uint32_t SLIDE_SPEED_REDUCTION = 5;
+constexpr short SLIDE_SPEED_REDUCTION = 5;
 
 constexpr uint32_t MENU_HEADER_BUTTON_WIDTH =      60;
 constexpr uint32_t MENU_HEADER_BUTTONS_LEFT =      MENU_HEADER_BUTTON_WIDTH;
@@ -132,19 +147,6 @@ constexpr uint32_t PAGE_TITLE_LEFT =               70;
   TABLE_BGCOLOR_INDEX,
 };*/
 
-enum FontIndex
-{
-  FONT_STD_INDEX,
-#if !defined(BOLD)
-  FONT_BOLD_INDEX,
-  FONT_XXS_INDEX,
-  FONT_XS_INDEX,
-  FONT_L_INDEX,
-  FONT_XL_INDEX,
-  FONT_XXL_INDEX,
-#endif
-  FONTS_COUNT
-};
 
 constexpr uint32_t INPUT_EDIT_LABELS_WIDTH = 80;
 constexpr coord_t INPUT_EDIT_CURVE_WIDTH = LCD_W;
@@ -175,4 +177,4 @@ constexpr LcdFlags TABLE_BODY_FONT = FONT(STD);
 constexpr int CJK_FIRST_LETTER_INDEX = 128 - 32 + 21;
 constexpr coord_t CHAR_SPACING = 0;
 
-#endif // _LIBOPENUI_CONFIG_H_
+#define ROTARY_ENCODER_SPEED() rotencSpeed