Merge branch 'EdgeTX:main' into eshifri/invert_switch2

This commit is contained in:
eshifri
2021-08-17 12:16:28 -07:00
committed by GitHub
3 changed files with 26 additions and 11 deletions
@@ -83,11 +83,10 @@ void interrupt10ms()
#endif #endif
uint8_t index = 0; uint8_t index = 0;
uint8_t in = readKeys(); uint32_t in = readKeys();
for (uint8_t i = 1; i != uint8_t(1u << TRM_BASE); i <<= 1) {
uint8_t value = (in & i); for (int i = 0; i < TRM_BASE; i++) {
keys[index].input(value); keys[index++].input(in & (1 << i));
++index;
} }
#if defined(ROTARY_ENCODER_NAVIGATION) #if defined(ROTARY_ENCODER_NAVIGATION)
+2 -2
View File
@@ -146,9 +146,9 @@ enum EnumKeys
KEY_PGDN, KEY_PGDN,
KEY_ENTER, KEY_ENTER,
KEY_MODEL, KEY_MODEL,
KEY_UP = KEY_MODEL, KEY_UP /*= KEY_MODEL*/,
KEY_EXIT, KEY_EXIT,
KEY_DOWN = KEY_EXIT, KEY_DOWN /*= KEY_EXIT*/,
KEY_TELEM, KEY_TELEM,
KEY_RIGHT = KEY_TELEM, KEY_RIGHT = KEY_TELEM,
KEY_RADIO, KEY_RADIO,
+20 -4
View File
@@ -28,7 +28,7 @@ DMAFifo<TELEMETRY_FIFO_SIZE> telemetryDMAFifo __DMA (TELEMETRY_DMA_Stream_RX);
uint8_t telemetryFifoMode; uint8_t telemetryFifoMode;
#endif #endif
void telemetryPortInit(uint32_t baudrate, uint8_t mode) void telemetryPortInitCommon(uint32_t baudrate, uint8_t mode, uint8_t noinv = 0)
{ {
if (baudrate == 0) { if (baudrate == 0) {
USART_DeInit(TELEMETRY_USART); USART_DeInit(TELEMETRY_USART);
@@ -65,8 +65,17 @@ void telemetryPortInit(uint32_t baudrate, uint8_t mode)
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL; GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
GPIO_Init(TELEMETRY_REV_GPIO, &GPIO_InitStructure); GPIO_Init(TELEMETRY_REV_GPIO, &GPIO_InitStructure);
TELEMETRY_TX_POL_INV();
TELEMETRY_RX_POL_INV(); if (noinv == 0)
{
TELEMETRY_TX_POL_NORM();
TELEMETRY_RX_POL_NORM();
}
else
{
TELEMETRY_TX_POL_INV();
TELEMETRY_RX_POL_INV();
}
USART_InitStructure.USART_BaudRate = baudrate; USART_InitStructure.USART_BaudRate = baudrate;
if (mode & TELEMETRY_SERIAL_8E2) { if (mode & TELEMETRY_SERIAL_8E2) {
@@ -89,9 +98,14 @@ void telemetryPortInit(uint32_t baudrate, uint8_t mode)
NVIC_EnableIRQ(TELEMETRY_USART_IRQn); NVIC_EnableIRQ(TELEMETRY_USART_IRQn);
} }
void telemetryPortInit(uint32_t baudrate, uint8_t mode)
{
telemetryPortInitCommon(baudrate, mode, 0);
}
void telemetryPortInvertedInit(uint32_t baudrate) void telemetryPortInvertedInit(uint32_t baudrate)
{ {
#warning "TODO telemetryPortInvertedInit"; telemetryPortInitCommon(baudrate, TELEMETRY_SERIAL_DEFAULT, 1);
} }
/*void extmoduleSendInvertedByte(uint8_t byte) /*void extmoduleSendInvertedByte(uint8_t byte)
@@ -113,6 +127,8 @@ void telemetryPortSetDirectionInput()
void sportSendByte(uint8_t byte) void sportSendByte(uint8_t byte)
{ {
telemetryPortSetDirectionOutput();
while (!(TELEMETRY_USART->SR & USART_SR_TXE)); while (!(TELEMETRY_USART->SR & USART_SR_TXE));
USART_SendData(TELEMETRY_USART, byte); USART_SendData(TELEMETRY_USART, byte);
} }