Remove SKY9X target

This commit is contained in:
Raphael Coeffic
2022-01-29 14:40:17 +10:00
committed by Peter Feerick
parent 5601bd53b2
commit 09c49e24ee
166 changed files with 24 additions and 38415 deletions
+1 -3
View File
@@ -78,9 +78,7 @@ if(Qt5Widgets_FOUND)
set(all_libs_cmd ${CMAKE_COMMAND} -E echo "Building all simulator libraries")
foreach(pcb ${PCB_TYPES})
set(pcbrev "")
if(pcb STREQUAL SKY9X)
set(pcbrev "-DPCBREV=REVC")
elseif(pcb STREQUAL X12S)
if(pcb STREQUAL X12S)
set(pcbrev "-DPCBREV=13")
endif()
set(all_libs_cmd ${all_libs_cmd} && ${CMAKE_COMMAND} -DPCB=${pcb} ${pcbrev} -Wno-dev ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} && ${CMAKE_COMMAND} --build . --target libsimulator -- ${mkflags})
+1 -1
View File
@@ -633,7 +633,7 @@ const int OpenTxSimulator::voltageToAdc(const int volts)
int ret = 0;
#if defined(PCBHORUS) || defined(PCBX7)
ret = (float)volts * 16.2f;
#elif defined(PCBTARANIS) || defined(PCBSKY9X)
#elif defined(PCBTARANIS)
ret = (float)volts * 13.3f;
#else
ret = (float)volts * 14.15f;
-29
View File
@@ -47,7 +47,6 @@ bool simu_running = false;
uint32_t telemetryErrors = 0;
#if defined(STM32)
GPIO_TypeDef gpioa, gpiob, gpioc, gpiod, gpioe, gpiof, gpiog, gpioh, gpioi, gpioj;
TIM_TypeDef tim1, tim2, tim3, tim4, tim5, tim6, tim7, tim8, tim9, tim10;
RCC_TypeDef rcc;
@@ -76,17 +75,6 @@ void DMA_ClearITPendingBit(DMA_Stream_TypeDef* DMAy_Streamx, uint32_t DMA_IT) {
void SPI_I2S_DMACmd(SPI_TypeDef* SPIx, uint16_t SPI_I2S_DMAReq, FunctionalState NewState) { }
void UART3_Configure(uint32_t baudrate, uint32_t masterClock) { }
void NVIC_Init(NVIC_InitTypeDef * NVIC_InitStruct) { }
#else
Pio Pioa, Piob, Pioc;
Pmc pmc;
Ssc ssc;
Pwm pwm;
Tc tc1;
Twi Twio;
Usart Usart0;
Dacc dacc;
Adc Adc0;
#endif
FATFS g_FATFS_Obj;
@@ -141,9 +129,7 @@ uint64_t CoGetOSTime(void)
void simuInit()
{
#if defined(STM32)
RCC->CSR = 0;
#endif
// set power button to "not pressed"
#if defined(PWR_SWITCH_GPIO) // STM32
@@ -610,18 +596,6 @@ uint32_t readTrims()
uint32_t switchState(uint8_t index)
{
#if defined(PCBSKY9X)
switch(index) {
case 0:
return switchesStates[0] < 0;
case 1:
return switchesStates[0] == 0;
case 2:
return switchesStates[0] > 0;
default:
return switchesStates[index - 2] > 0;
}
#else
div_t qr = div(index, 3);
int state = switchesStates[qr.quot];
switch (qr.rem) {
@@ -632,10 +606,8 @@ uint32_t switchState(uint8_t index)
default:
return state == 0;
}
#endif
}
#if defined(STM32)
int usbPlugged() { return false; }
int getSelectedUsbMode() { return USB_JOYSTICK_MODE; }
void setSelectedUsbMode(int mode) {}
@@ -747,7 +719,6 @@ uint32_t isBootloaderStart(const uint8_t * block)
{
return 1;
}
#endif // defined(STM32)
#if defined(PCBXLITES)
bool isJackPlugged()
-45
View File
@@ -83,7 +83,6 @@ void sig(int sgn)
#define __REV
#if defined(STM32)
extern GPIO_TypeDef gpioa, gpiob, gpioc, gpiod, gpioe, gpiof, gpiog, gpioh, gpioi, gpioj;
extern TIM_TypeDef tim1, tim2, tim3, tim4, tim5, tim6, tim7, tim8, tim9, tim10;
extern USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4;
@@ -175,48 +174,6 @@ extern RTC_TypeDef rtc;
#define ADC (&adc)
#undef RTC
#define RTC (&rtc)
#elif defined(PCBSKY9X)
extern Pmc pmc;
#undef PMC
#define PMC (&pmc)
extern Ssc ssc;
#undef SSC
#define SSC (&ssc)
extern Pmc pmc;
#undef PMC
#define PMC (&pmc)
extern Tc tc1;
#undef TC1
#define TC1 (&tc1)
extern Pio Pioa, Piob, Pioc;
extern Twi Twio;
extern Dacc dacc;
extern Usart Usart0;
extern Adc Adc0;
#undef ADC
#define ADC (&Adc0)
#undef USART0
#define USART0 (&Usart0)
#undef USART1
#define USART1 (&Usart0)
#undef USART2
#define USART2 (&Usart0)
#undef USART3
#define USART3 (&Usart0)
#undef PIOA
#define PIOA (&Pioa)
#undef PIOB
#define PIOB (&Piob)
#undef PIOC
#define PIOC (&Pioc)
#undef TWI0
#define TWI0 (&Twio)
#undef DACC
#define DACC (&dacc)
extern Pwm pwm;
#undef PWM
#define PWM (&pwm)
#endif
extern uint8_t * eeprom;
extern void startPdcUsartReceive() ;
@@ -276,7 +233,6 @@ void simuMain();
#define USART_GetITStatus(...) 0
#define USART_ClearFlag(...)
#if defined(STM32)
#define TIM_DeInit(...)
#define TIM_SetCompare2(...)
#define TIM_ClearFlag(...)
@@ -287,7 +243,6 @@ void simuMain();
#define GPIO_ReadInputDataBit(GPIOx, pin) (GPIOx->BSRRL & pin)
#define RCC_AHB1PeriphClockCmd(...)
#define RCC_APB2PeriphClockCmd(...)
#endif
// inline void delay_01us(uint32_t dummy) { }
-4
View File
@@ -609,9 +609,5 @@ FRESULT f_getfree (const TCHAR* path, DWORD* nclst, FATFS** fatfs)
return FR_OK;
}
#if defined(PCBSKY9X)
int32_t Card_state = SD_ST_MOUNTED;
uint32_t Card_CSD[4]; // TODO elsewhere
#endif
#endif // #if defined(SIMU_USE_SDCARD)