From d1b862a4f36f00a69a12729ef29e254d4f8c5d7b Mon Sep 17 00:00:00 2001 From: "bernet.andre@gmail.com" Date: Sun, 24 Feb 2013 18:06:09 +0000 Subject: [PATCH] [X9D] Telemetry view SIMU compilation --- src/frsky.cpp | 22 ++++++++++++++++++++++ src/simpgmspace.cpp | 3 +++ src/x9d/sport_driver.cpp | 3 ++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/frsky.cpp b/src/frsky.cpp index f390d0b69..2e431650b 100644 --- a/src/frsky.cpp +++ b/src/frsky.cpp @@ -1163,6 +1163,27 @@ enum FrskyViews { static uint8_t s_frsky_view = e_frsky_custom_screen_1; +#if LCD_W == 212 +void displayRssiLine() +{ + if (frskyStreaming > 0) { + lcd_hline(0, 55, 212, 0); // separator + uint8_t rssi = min((uint8_t)99, frskyData.rssi[1].value); + lcd_putsLeft(7*FH+1, STR_TX); lcd_outdezNAtt(4*FW, 7*FH+1, rssi, LEADING0, 2); + lcd_rect(25, 57, 78, 7); + lcd_filled_rect(26, 58, 17*rssi/33, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID); + rssi = min((uint8_t)99, frskyData.rssi[0].value); + lcd_puts(190, 7*FH+1, STR_RX); lcd_outdezNAtt(189+4*FW-1, 7*FH+1, rssi, LEADING0, 2); + lcd_rect(110, 57, 78, 7); + uint8_t v = 17*rssi/33; + lcd_filled_rect(111+76-v, 58, v, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID); + } + else { + lcd_putsAtt(7*FW, 7*FH+1, STR_NODATA, BLINK); + lcd_status_line(); + } +} +#else void displayRssiLine() { if (frskyStreaming > 0) { @@ -1182,6 +1203,7 @@ void displayRssiLine() lcd_status_line(); } } +#endif #if defined(FRSKY_HUB) void displayGpsTime() diff --git a/src/simpgmspace.cpp b/src/simpgmspace.cpp index d4f41f917..0b1a0a54c 100644 --- a/src/simpgmspace.cpp +++ b/src/simpgmspace.cpp @@ -586,6 +586,8 @@ ErrorStatus RTC_SetTime(uint32_t RTC_Format, RTC_TimeTypeDef* RTC_TimeStruct) { ErrorStatus RTC_SetDate(uint32_t RTC_Format, RTC_DateTypeDef* RTC_DateStruct) { return SUCCESS; } void RTC_GetTime(uint32_t RTC_Format, RTC_TimeTypeDef* RTC_TimeStruct) { } void RTC_GetDate(uint32_t RTC_Format, RTC_DateTypeDef* RTC_DateStruct) { } +void RTC_TimeStructInit(RTC_TimeTypeDef* RTC_TimeStruct) { } +void RTC_DateStructInit(RTC_DateTypeDef* RTC_DateStruct) { } void PWR_BackupAccessCmd(FunctionalState NewState) { } void RCC_RTCCLKConfig(uint32_t RCC_RTCCLKSource) { } void RCC_APB1PeriphClockCmd(uint32_t RCC_APB1Periph, FunctionalState NewState) { } @@ -596,6 +598,7 @@ FlagStatus USART_GetFlagStatus(USART_TypeDef* USARTx, uint16_t USART_FLAG) { ret void GPIO_PinAFConfig(GPIO_TypeDef* GPIOx, uint16_t GPIO_PinSource, uint8_t GPIO_AF) { } void USART_Init(USART_TypeDef* USARTx, USART_InitTypeDef* USART_InitStruct) { } void USART_Cmd(USART_TypeDef* USARTx, FunctionalState NewState) { } +void USART_ITConfig(USART_TypeDef* USARTx, uint16_t USART_IT, FunctionalState NewState) { } void RCC_PLLI2SConfig(uint32_t PLLI2SN, uint32_t PLLI2SR) { } void RCC_PLLI2SCmd(FunctionalState NewState) { } void RCC_I2SCLKConfig(uint32_t RCC_I2SCLKSource) { } diff --git a/src/x9d/sport_driver.cpp b/src/x9d/sport_driver.cpp index e3d7b0da7..84e533c9d 100644 --- a/src/x9d/sport_driver.cpp +++ b/src/x9d/sport_driver.cpp @@ -85,13 +85,14 @@ void sportPutc(const char c) GPIO_ResetBits(GPIO_PIN_SPORT_ON, PIN_SPORT_ON); } +#if !defined(SIMU) extern "C" void USART2_IRQHandler() { uint16_t data; while(USART_GetFlagStatus(SPORT, USART_FLAG_RXNE)){ data = USART_ReceiveData(SPORT); -// debugPutc(data); processSerialData((uint8_t) data); } } +#endif