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

fiy simu and firmware compilation issues for different radios

Browse Source
This commit is contained in:
gagarinlg
2022-06-11 15:38:08 +02:00
committed by Raphael Coeffic
parent 4ec3304969
commit dec89b56c2
7 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/common/arm/stm32/timers_driver.h
+1
View File
@@ -25,6 +25,7 @@
uint16_t getTmr2MHz();
#define watchdogSuspend(timeout)
#else
#include "board.h"
radio/src/targets/horus/backlight_driver.cpp
+4
View File
@@ -22,6 +22,10 @@
#include "opentx_types.h"
#include "board.h"
#if !defined(BOOT)
#include "myeeprom.h"
#endif
void backlightInit()
{
// PIN init
radio/src/targets/horus/board.cpp
+2 -2
View File
@@ -63,7 +63,7 @@ void watchdogInit(unsigned int duration)
IWDG->KR = 0xCCCC; // start
}
#if HAS_SPORT_UPDATE_CONNECTOR()
#if HAS_SPORT_UPDATE_CONNECTOR() && !defined(BOOT)
void sportUpdateInit()
{
GPIO_InitTypeDef GPIO_InitStructure;
@@ -257,7 +257,7 @@ void boardInit()
usbChargerInit();
#endif
#if HAS_SPORT_UPDATE_CONNECTOR()
#if HAS_SPORT_UPDATE_CONNECTOR() && !defined(BOOT)
sportUpdateInit();
#endif
radio/src/targets/simu/simpgmspace.cpp
+2
View File
@@ -47,6 +47,8 @@ bool simu_running = false;
uint32_t telemetryErrors = 0;
volatile rotenc_t rotencValue = 0;
// TODO: remove all STM32 defs
GPIO_TypeDef gpioa, gpiob, gpioc, gpiod, gpioe, gpiof, gpiog, gpioh, gpioi, gpioj;
USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4;
radio/src/targets/taranis/lcd_driver_aspi.cpp
+5
View File
@@ -22,6 +22,11 @@
#include "board.h"
#include "lcd.h"
#if !defined(BOOT)
#include "myeeprom.h"
#include "debug.h"
#endif
#define CONTRAST_OFS 5
#define RESET_WAIT_DELAY_MS 1300 // Wait time after LCD reset before first command
radio/src/targets/taranis/top_lcd_driver.cpp
+4
View File
@@ -19,7 +19,11 @@
* GNU General Public License for more details.
*/
#include <stdlib.h>
#include "opentx.h"
#include "board.h"
#include "lcd.h"
#define CS1_HIGH() TOPLCD_GPIO->BSRRL = TOPLCD_GPIO_PIN_CS1
#define CS1_LOW() TOPLCD_GPIO->BSRRH = TOPLCD_GPIO_PIN_CS1
radio/src/translations/untranslated.h
+2 -2
View File
@@ -52,7 +52,7 @@
#define TR_SW_VSRCRAW \
STR_CHAR_SWITCH "SA", STR_CHAR_SWITCH "SB", STR_CHAR_SWITCH "SC", \
STR_CHAR_SWITCH "SD", STR_CHAR_SWITCH "SG", STR_CHAR_SWITCH "SH", \
STR_CHAR_SWITCH "SI", STR_CHAR_SWITCH "SJ",
STR_CHAR_SWITCH "SI", STR_CHAR_SWITCH "SJ"
#elif defined(RADIO_TX12)
#define TR_POTS_VSRCRAW STR_CHAR_POT "S1", STR_CHAR_POT "S2"
#define TR_SW_VSRCRAW \
@@ -71,7 +71,7 @@
#define TR_SW_VSRCRAW STR_CHAR_SWITCH"SA", STR_CHAR_SWITCH"SB", STR_CHAR_SWITCH"SC", STR_CHAR_SWITCH"SD", STR_CHAR_SWITCH"SE", STR_CHAR_SWITCH"SF", STR_CHAR_SWITCH"SG"
#elif defined(PCBX9LITE)
#define TR_POTS_VSRCRAW STR_CHAR_POT"S1"
#define TR_SW_VSRCRAW STR_CHAR_SWITCH"SA", STR_CHAR_SWITCH"SB", STR_CHAR_SWITCH"SC", STR_CHAR_SWITCH"SD", STR_CHAR_SWITCH"SE",
#define TR_SW_VSRCRAW STR_CHAR_SWITCH"SA", STR_CHAR_SWITCH"SB", STR_CHAR_SWITCH"SC", STR_CHAR_SWITCH"SD", STR_CHAR_SWITCH"SE"
#elif defined(PCBTARANIS)
#define TR_POTS_VSRCRAW STR_CHAR_POT"S1", STR_CHAR_POT"S2", STR_CHAR_POT"S3", STR_CHAR_SLIDER"LS", STR_CHAR_SLIDER"RS"
#define TR_SW_VSRCRAW STR_CHAR_SWITCH"SA", STR_CHAR_SWITCH"SB", STR_CHAR_SWITCH"SC", STR_CHAR_SWITCH"SD", STR_CHAR_SWITCH"SE", STR_CHAR_SWITCH"SF", STR_CHAR_SWITCH"SG", STR_CHAR_SWITCH"SH", STR_CHAR_SWITCH"SI"