New UI merged

This commit is contained in:
Bertrand Songis
2019-08-28 20:50:14 +02:00
parent 1f41076b0e
commit f4f8893ae9
806 changed files with 30836 additions and 11704 deletions
+2 -2
View File
@@ -284,13 +284,13 @@ void OpenTxSimulator::rotaryEncoderEvent(int steps)
key = KEY_DOWN;
else if (steps < 0)
key = KEY_UP;
#else
#elif defined(HARDWARE_KEYS)
if (steps > 0)
key = KEY_MINUS;
else if (steps < 0)
key = KEY_PLUS;
#endif
else
#endif
// Should not happen but Clang complains that key is unset otherwise
return;
+31 -1
View File
@@ -69,6 +69,16 @@ void lcdInit()
{
}
void lcdCopy(void * dest, void * src)
{
}
void lcdNextLayer()
{
}
void toplcdOff()
{
}
@@ -703,7 +713,7 @@ void boardOff()
{
}
#if defined(PCBHORUS) || defined(PCBTARANIS)
#if defined(PCBFRSKY) || defined(PCBFLYSKY)
HardwareOptions hardwareOptions;
#endif
@@ -763,7 +773,11 @@ void rtcSetTime(const struct gtm * t)
}
#if defined(AUX_SERIAL)
#if defined(AUX_SERIAL_DMA_Stream_RX)
AuxSerialRxFifo auxSerialRxFifo(nullptr);
#else
AuxSerialRxFifo auxSerialRxFifo;
#endif
uint8_t auxSerialMode;
void auxSerialInit(unsigned int mode, unsigned int protocol)
{
@@ -781,3 +795,19 @@ void auxSerialStop()
{
}
#endif
#if defined(INTMODULE_HEARTBEAT_GPIO)
volatile HeartbeatCapture heartbeatCapture;
void init_intmodule_heartbeat()
{
}
void stop_intmodule_heartbeat()
{
}
void check_intmodule_heartbeat()
{
}
#endif
+1 -1
View File
@@ -288,7 +288,7 @@ inline void DMA_Init(DMA_Stream_TypeDef* DMAy_Streamx, DMA_InitTypeDef* DMA_Init
inline void DMA_ITConfig(DMA_Stream_TypeDef* DMAy_Streamx, uint32_t DMA_IT, FunctionalState NewState) { }
inline void DMA_StructInit(DMA_InitTypeDef* DMA_InitStruct) { }
inline void DMA_Cmd(DMA_Stream_TypeDef* DMAy_Streamx, FunctionalState NewState) { }
void DMACopy(void * src, void * dest, unsigned size);
void lcdCopy(void * dest, void * src);
inline FlagStatus DMA_GetFlagStatus(DMA_Stream_TypeDef* DMAy_Streamx, uint32_t DMA_FLAG) { return RESET; }
inline ITStatus DMA_GetITStatus(DMA_Stream_TypeDef* DMAy_Streamx, uint32_t DMA_IT) { return RESET; }
inline void DMA_ClearITPendingBit(DMA_Stream_TypeDef* DMAy_Streamx, uint32_t DMA_IT) { }