New UI merged
This commit is contained in:
@@ -21,6 +21,7 @@
|
||||
#ifndef _GUI_COMMON_H_
|
||||
#define _GUI_COMMON_H_
|
||||
|
||||
#include <functional>
|
||||
#include "lcd.h"
|
||||
#include "keys.h"
|
||||
#include "telemetry/telemetry_sensors.h"
|
||||
@@ -37,7 +38,20 @@
|
||||
#define CASE_EVT_ROTARY_RIGHT
|
||||
#endif
|
||||
|
||||
#if defined(LIBOPENUI)
|
||||
typedef std::function<bool(int)> IsValueAvailable;
|
||||
#else
|
||||
typedef bool (*IsValueAvailable)(int);
|
||||
#endif
|
||||
|
||||
enum SwitchContext
|
||||
{
|
||||
LogicalSwitchesContext,
|
||||
ModelCustomFunctionsContext,
|
||||
GeneralCustomFunctionsContext,
|
||||
TimersContext,
|
||||
MixesContext
|
||||
};
|
||||
|
||||
int circularIncDec(int current, int inc, int min, int max, IsValueAvailable isValueAvailable=nullptr);
|
||||
int getFirstAvailable(int min, int max, IsValueAvailable isValueAvailable);
|
||||
@@ -54,6 +68,7 @@ bool isSourceAvailableInGlobalFunctions(int source);
|
||||
bool isSourceAvailableInCustomSwitches(int source);
|
||||
bool isSourceAvailableInResetSpecialFunction(int index);
|
||||
bool isSourceAvailableInGlobalResetSpecialFunction(int index);
|
||||
bool isSwitchAvailable(int swtch, SwitchContext context);
|
||||
bool isSwitchAvailableInLogicalSwitches(int swtch);
|
||||
bool isSwitchAvailableInCustomFunctions(int swtch);
|
||||
bool isSwitchAvailableInMixes(int swtch);
|
||||
@@ -65,6 +80,7 @@ bool isInternalModuleAvailable(int moduleType);
|
||||
bool isRfProtocolAvailable(int protocol);
|
||||
bool isTelemetryProtocolAvailable(int protocol);
|
||||
bool isTrainerModeAvailable(int mode);
|
||||
bool isAssignableFunctionAvailable(int function, CustomFunctionData * functions);
|
||||
|
||||
bool isSensorUnit(int sensor, uint8_t unit);
|
||||
bool isCellsSensor(int sensor);
|
||||
@@ -83,16 +99,14 @@ bool modelHasNotes();
|
||||
bool isSwitch2POSWarningStateAvailable(int state);
|
||||
#endif
|
||||
|
||||
#if defined(GUI)
|
||||
#if defined(LIBOPENUI)
|
||||
#define IS_INSTANT_TRIM_ALLOWED() false
|
||||
#elif defined(GUI)
|
||||
#define IS_INSTANT_TRIM_ALLOWED() (IS_MAIN_VIEW_DISPLAYED() || IS_TELEMETRY_VIEW_DISPLAYED() || IS_OTHER_VIEW_DISPLAYED())
|
||||
#else
|
||||
#define IS_INSTANT_TRIM_ALLOWED() true
|
||||
#endif
|
||||
|
||||
#if defined(FLIGHT_MODES)
|
||||
void drawFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
|
||||
#endif
|
||||
|
||||
swsrc_t checkIncDecMovedSwitch(swsrc_t val);
|
||||
|
||||
void drawCurveRef(coord_t x, coord_t y, CurveRef & curve, LcdFlags flags=0);
|
||||
@@ -108,6 +122,7 @@ void drawCurve(coord_t offset=0);
|
||||
|
||||
#if defined(COLORLCD)
|
||||
void drawStringWithIndex(coord_t x, coord_t y, const char * str, int idx, LcdFlags flags=0, const char * prefix=nullptr, const char * suffix=nullptr);
|
||||
void drawCurveRef(BitmapBuffer * dc, coord_t x, coord_t y, const CurveRef & curve, LcdFlags flags=0);
|
||||
int editChoice(coord_t x, coord_t y, const char * values, int value, int min, int max, LcdFlags flags, event_t event);
|
||||
uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, LcdFlags flags, event_t event);
|
||||
swsrc_t editSwitch(coord_t x, coord_t y, swsrc_t value, LcdFlags flags, event_t event);
|
||||
|
||||
Reference in New Issue
Block a user