Bsongis/power control chip (#6445)

FRSK files support added
This commit is contained in:
Bertrand Songis
2019-05-27 12:23:34 +02:00
committed by GitHub
parent 2eb88cb909
commit 8edf77286d
26 changed files with 438 additions and 51 deletions
+1 -1
View File
@@ -157,7 +157,7 @@ add_definitions(-DBLUETOOTH)
set(SRC
${SRC}
bluetooth.cpp
io/frsky_device_firmware_update.cpp
io/frsky_firmware_update.cpp
)
set(STM32LIB_SRC
+2
View File
@@ -595,7 +595,9 @@ int32_t getVolume(void);
// Telemetry driver
#define TELEMETRY_FIFO_SIZE 512
void telemetryPortInit(uint32_t baudrate, uint8_t mode);
void telemetryPortSetDirectionInput(void);
void telemetryPortSetDirectionOutput(void);
void sportSendByte(uint8_t byte);
void sportSendBuffer(const uint8_t * buffer, uint32_t count);
uint8_t telemetryGetByte(uint8_t * byte);
extern uint32_t telemetryErrors;
@@ -138,6 +138,12 @@ void telemetryPortSetDirectionInput()
TELEMETRY_USART->CR1 |= USART_CR1_RE; // turn on receiver
}
void sportSendByte(uint8_t byte)
{
while (!(TELEMETRY_USART->SR & USART_SR_TXE));
USART_SendData(TELEMETRY_USART, byte);
}
void sportSendBuffer(const uint8_t * buffer, uint32_t count)
{
telemetryPortSetDirectionOutput();
+3 -3
View File
@@ -105,7 +105,7 @@ elseif(PCB STREQUAL X9LITE)
set(LUA_EXPORT lua_export_x9lite)
set(FLAVOUR x9lite)
add_definitions(-DBOARD_NAME="x9lite")
add_definitions(-DPCBX9LITE -DPCBX9 -DSOFTWARE_VOLUME)
add_definitions(-DPCBX9LITE -DPCBX9 -DSOFTWARE_VOLUME -DHARDWARE_POWER_CONTROL_CHIP)
add_definitions(-DEEPROM_VARIANT=0x0800)
set(PXX2 ON)
set(GUI_DIR 128x64)
@@ -143,7 +143,7 @@ elseif(PCB STREQUAL XLITES)
set(HAPTIC YES)
set(LUA_EXPORT lua_export_xlites)
set(FLAVOUR xlites)
add_definitions(-DPCBXLITES -DPCBXLITE -DSOFTWARE_VOLUME -DEXTERNAL_ANTENNA -DSTICKS_PWM)
add_definitions(-DPCBXLITES -DPCBXLITE -DSOFTWARE_VOLUME -DEXTERNAL_ANTENNA -DSTICKS_PWM -DHARDWARE_POWER_CONTROL_CHIP)
add_definitions(-DEEPROM_VARIANT=0x1000)
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
set(GUI_DIR 128x64)
@@ -229,7 +229,7 @@ add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
set(SRC
${SRC}
io/frsky_device_firmware_update.cpp
io/frsky_firmware_update.cpp
)
set(GUI_SRC
+2
View File
@@ -676,7 +676,9 @@ void debugPutc(const char c);
// Telemetry driver
void telemetryPortInit(uint32_t baudrate, uint8_t mode);
void telemetryPortSetDirectionInput(void);
void telemetryPortSetDirectionOutput(void);
void sportSendByte(uint8_t byte);
void sportSendBuffer(const uint8_t * buffer, uint32_t count);
uint8_t telemetryGetByte(uint8_t * byte);
extern uint32_t telemetryErrors;
@@ -83,12 +83,24 @@ void telemetryPortSetDirectionOutput()
TELEMETRY_USART->CR1 &= ~USART_CR1_RE; // turn off receiver
}
void sportWaitTransmissionComplete()
{
while (!(TELEMETRY_USART->SR & USART_SR_TC));
}
void telemetryPortSetDirectionInput()
{
sportWaitTransmissionComplete();
TELEMETRY_DIR_INPUT();
TELEMETRY_USART->CR1 |= USART_CR1_RE; // turn on receiver
}
void sportSendByte(uint8_t byte)
{
while (!(TELEMETRY_USART->SR & USART_SR_TXE));
USART_SendData(TELEMETRY_USART, byte);
}
void sportSendBuffer(const uint8_t * buffer, uint32_t count)
{
telemetryPortSetDirectionOutput();