piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #373 from EdgeTX/2.4

Browse Source 
Merge from 2.4
This commit is contained in:
richardclli
2021-06-30 15:14:08 +08:00
committed by GitHub
parent fe532f32fe 2aa52965a9
commit 2222ee75e8
58 changed files with 375 additions and 1296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/common/arm/stm32/aux_serial_driver.cpp
+2 -10
View File
@@ -159,11 +159,7 @@ void auxSerialInit(unsigned int mode, unsigned int protocol)
void auxSerialPutc(char c)
{
#if !defined(SIMU)
int n = 0;
while (auxSerialTxFifo.isFull()) {
delay_ms(1);
if (++n > 100) return;
}
if (auxSerialTxFifo.isFull()) return;
auxSerialTxFifo.push(c);
USART_ITConfig(AUX_SERIAL_USART, USART_IT_TXE, ENABLE);
#endif
@@ -357,11 +353,7 @@ void aux2SerialInit(unsigned int mode, unsigned int protocol)
void aux2SerialPutc(char c)
{
#if !defined(SIMU)
int n = 0;
while (aux2SerialTxFifo.isFull()) {
delay_ms(1);
if (++n > 100) return;
}
if (aux2SerialTxFifo.isFull()) return;
aux2SerialTxFifo.push(c);
USART_ITConfig(AUX2_SERIAL_USART, USART_IT_TXE, ENABLE);
#endif
radio/src/targets/common/arm/stm32/rotary_encoder_driver.cpp
+25 -16
View File
@@ -72,25 +72,34 @@ void rotaryEncoderInit()
void rotaryEncoderCheck()
{
#if (defined(RADIO_FAMILY_T16) && !defined(RADIO_T18)) || defined(RADIO_TX12)
static uint8_t state = 0;
static uint8_t state = 0;
uint8_t pins = ROTARY_ENCODER_POSITION();
if (pins != (state & 0x03) && !(readKeys() & (1 << KEY_ENTER))) {
if ((pins & 0x01) ^ ((pins & 0x02) >> 1)) {
if ((state & 0x03) == 3)
++rotencValue;
else
--rotencValue;
}
else
{
if ((state & 0x03) == 3)
--rotencValue;
else if ((state & 0x03) == 0)
++rotencValue;
}
state &= ~0x03 ;
state |= pins ;
if ((pins ^ (state & 0x03)) == 0x03)
{
if (pins == 3)
{
rotencValue += 2;
}
else
{
rotencValue -= 2;
}
}
else
{
if ((state & 0x01) ^ ((pins & 0x02) >> 1))
{
rotencValue -= 1;
}
else
{
rotencValue += 1;
}
}
state &= ~0x03;
state |= pins;
#else
uint8_t newPosition = ROTARY_ENCODER_POSITION();
if (newPosition != rotencPosition && !(readKeys() & (1 << KEY_ENTER))) {
radio/src/targets/horus/board.h
+8 -1
View File
@@ -379,6 +379,11 @@ enum Analogs {
NUM_ANALOGS
};
#if defined(PCBX12S)
#define EXT1 SLIDER_FRONT_LEFT
#define EXT2 SLIDER_FRONT_RIGHT
#endif
#define SLIDER1 SLIDER_FRONT_LEFT
#define SLIDER2 SLIDER_FRONT_RIGHT
@@ -411,7 +416,9 @@ enum CalibratedAnalogs {
CALIBRATED_POT3,
#if defined(PCBX12S)
CALIBRATED_SLIDER_FRONT_LEFT,
CALIBRATED_POT_EXT1 = CALIBRATED_SLIDER_FRONT_LEFT,
CALIBRATED_SLIDER_FRONT_RIGHT,
CALIBRATED_POT_EXT2 = CALIBRATED_SLIDER_FRONT_RIGHT,
CALIBRATED_SLIDER_REAR_LEFT,
CALIBRATED_SLIDER_REAR_RIGHT,
#else
@@ -641,7 +648,7 @@ void sportUpdatePowerInit();
#define DEBUG_BAUDRATE 115200
#define LUA_DEFAULT_BAUDRATE 115200
#endif
#if defined(AUX_SERIAL_GPIO)
#if defined(AUX_SERIAL)
extern uint8_t auxSerialMode;
#if defined __cplusplus
void auxSerialSetup(unsigned int baudrate, bool dma, uint16_t length = USART_WordLength_8b, uint16_t parity = USART_Parity_No, uint16_t stop = USART_StopBits_1);