Some more fixes.
This commit is contained in:
+1
-1
@@ -32,7 +32,7 @@ constexpr event_t EVT_ENTRY_UP = 0x1002;
|
|||||||
constexpr event_t EVT_ROTARY_LEFT = 0x1003;
|
constexpr event_t EVT_ROTARY_LEFT = 0x1003;
|
||||||
constexpr event_t EVT_ROTARY_RIGHT = 0x1004;
|
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_BREAK = 0x0200;
|
||||||
constexpr event_t _MSK_KEY_REPT = 0x0400;
|
constexpr event_t _MSK_KEY_REPT = 0x0400;
|
||||||
constexpr event_t _MSK_KEY_FIRST = 0x0600;
|
constexpr event_t _MSK_KEY_FIRST = 0x0600;
|
||||||
|
|||||||
@@ -33,5 +33,5 @@ if(PYTHONINTERP_FOUND)
|
|||||||
add_lua_export_target(tx12 ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_TX12)
|
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(t8 ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_T8)
|
||||||
add_lua_export_target(t16 ${LUA_INCLUDES} -DPCBHORUS -DPCBX10 -DRADIO_T16)
|
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()
|
endif()
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ void delay_self(int count)
|
|||||||
AUDIO_RCC_AHB1Periph |\
|
AUDIO_RCC_AHB1Periph |\
|
||||||
HAPTIC_RCC_AHB1Periph |\
|
HAPTIC_RCC_AHB1Periph |\
|
||||||
INTMODULE_RCC_AHB1Periph |\
|
INTMODULE_RCC_AHB1Periph |\
|
||||||
INTMODULE_RCC_AHB1Periph|\
|
FLYSKY_HALL_RCC_AHB1Periph |\
|
||||||
EXTMODULE_RCC_AHB1Periph\
|
EXTMODULE_RCC_AHB1Periph\
|
||||||
)
|
)
|
||||||
#define RCC_AHB3PeriphMinimum (SDRAM_RCC_AHB3Periph)
|
#define RCC_AHB3PeriphMinimum (SDRAM_RCC_AHB3Periph)
|
||||||
|
|||||||
@@ -18,19 +18,34 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _LIBOPENUI_CONFIG_H_
|
#pragma once
|
||||||
#define _LIBOPENUI_CONFIG_H_
|
|
||||||
|
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "libopenui_defines.h"
|
#include "libopenui_defines.h"
|
||||||
|
|
||||||
#include "colors.h"
|
#include "colors.h"
|
||||||
#include "board.h"
|
#include "board.h"
|
||||||
#include "keys.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;
|
typedef uint16_t pixel_t;
|
||||||
|
|
||||||
constexpr bool WRAP_FORM_FIELDS_WITHIN_PAGE = true;
|
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_BUTTON_WIDTH = 60;
|
||||||
constexpr uint32_t MENU_HEADER_BUTTONS_LEFT = MENU_HEADER_BUTTON_WIDTH;
|
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,
|
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 uint32_t INPUT_EDIT_LABELS_WIDTH = 80;
|
||||||
constexpr coord_t INPUT_EDIT_CURVE_WIDTH = LCD_W;
|
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 int CJK_FIRST_LETTER_INDEX = 128 - 32 + 21;
|
||||||
constexpr coord_t CHAR_SPACING = 0;
|
constexpr coord_t CHAR_SPACING = 0;
|
||||||
|
|
||||||
#endif // _LIBOPENUI_CONFIG_H_
|
#define ROTARY_ENCODER_SPEED() rotencSpeed
|
||||||
|
|||||||
Reference in New Issue
Block a user