Merge from 2.3

This commit is contained in:
Bertrand Songis
2019-12-05 09:29:11 +01:00
161 changed files with 3682 additions and 10305 deletions
+3 -2
View File
@@ -51,6 +51,7 @@ DMA_TypeDef dma2;
USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4;
SysTick_Type systick;
ADC_Common_TypeDef adc;
RTC_TypeDef rtc;
#else
Pio Pioa, Piob, Pioc;
Pmc pmc;
@@ -682,7 +683,7 @@ void lockFlash()
{
}
void flashWrite(uint32_t *address, uint32_t *buffer)
void flashWrite(uint32_t *address, const uint32_t *buffer)
{
simuSleep(100);
}
@@ -706,7 +707,7 @@ void serialPutc(char c) { }
uint16_t getBatteryVoltage()
{
return (BATTERY_MAX + BATTERY_WARN) * 5;
return (g_eeGeneral.vBatWarn * 10) + 50; // 0.5 volt above alerm (value is PREC1)
}
void boardOff()
+3
View File
@@ -86,6 +86,7 @@ extern DMA_Stream_TypeDef dma1_stream0, dma1_stream1, dma1_stream2, dma1_stream3
extern DMA_TypeDef dma2;
extern SysTick_Type systick;
extern ADC_Common_TypeDef adc;
extern RTC_TypeDef rtc;
#undef SysTick
#define SysTick (&systick)
#undef GPIOA
@@ -166,6 +167,8 @@ extern ADC_Common_TypeDef adc;
#define DMA2 (&dma2)
#undef ADC
#define ADC (&adc)
#undef RTC
#define RTC (&rtc)
#elif defined(PCBSKY9X)
extern Pmc pmc;
#undef PMC