Skip to content

fix(v14): restore correct RTC battery voltage reading #7621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
helloradiosky wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −28
Open

fix(v14): restore correct RTC battery voltage reading #7621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions radio/src/boards/hw_defs/v14.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,18 @@
"adcs": [
{
"name": "MAIN",
"adc": "ADC1",
"adc": "ADC2",
"dma": "DMA2",
"dma_channel": "LL_DMA_CHANNEL_0",
"dma_stream": "LL_DMA_STREAM_4",
"dma_stream_irq": "DMA2_Stream4_IRQn",
"dma_stream_irq_handler": "DMA2_Stream4_IRQHandler",
"dma_channel": "LL_DMA_CHANNEL_1",
"dma_stream": "LL_DMA_STREAM_3",
"dma_stream_irq": "DMA2_Stream3_IRQn",
"dma_stream_irq_handler": "DMA2_Stream3_IRQHandler",
"sample_time": "LL_ADC_SAMPLINGTIME_28CYCLES"
},
{
"name": "EXT",
"adc": "ADC3",
"dma": "DMA2",
"dma_channel": "LL_DMA_CHANNEL_2",
"dma_stream": "LL_DMA_STREAM_0",
"dma_stream_irq": "DMA2_Stream0_IRQn",
"dma_stream_irq_handler": "DMA2_Stream0_IRQHandler",
"adc": "ADC1",
"dma": null,
"sample_time": "LL_ADC_SAMPLINGTIME_56CYCLES"
}
],
Expand Down Expand Up @@ -84,7 +80,7 @@
{
"name": "P3",
"type": "FLEX",
"adc": "EXT",
"adc": "MAIN",
"gpio": "GPIOC",
"pin": "LL_GPIO_PIN_2",
"channel": "LL_ADC_CHANNEL_12",
Expand All @@ -95,7 +91,7 @@
{
"name": "RTC_BAT",
"type": "RTC_BAT",
"adc": "MAIN",
"adc": "EXT",
"gpio": null,
"pin": null,
"channel": "LL_ADC_CHANNEL_VBAT"
Expand Down
22 changes: 9 additions & 13 deletions radio/src/boards/hw_defs/v14lcd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,18 @@
"adcs": [
{
"name": "MAIN",
"adc": "ADC1",
"adc": "ADC2",
"dma": "DMA2",
"dma_channel": "LL_DMA_CHANNEL_0",
"dma_stream": "LL_DMA_STREAM_4",
"dma_stream_irq": "DMA2_Stream4_IRQn",
"dma_stream_irq_handler": "DMA2_Stream4_IRQHandler",
"dma_channel": "LL_DMA_CHANNEL_1",
"dma_stream": "LL_DMA_STREAM_3",
"dma_stream_irq": "DMA2_Stream3_IRQn",
"dma_stream_irq_handler": "DMA2_Stream3_IRQHandler",
"sample_time": "LL_ADC_SAMPLINGTIME_28CYCLES"
},
{
"name": "EXT",
"adc": "ADC3",
"dma": "DMA2",
"dma_channel": "LL_DMA_CHANNEL_2",
"dma_stream": "LL_DMA_STREAM_0",
"dma_stream_irq": "DMA2_Stream0_IRQn",
"dma_stream_irq_handler": "DMA2_Stream0_IRQHandler",
"adc": "ADC1",
"dma": null,
"sample_time": "LL_ADC_SAMPLINGTIME_56CYCLES"
}
],
Expand Down Expand Up @@ -84,7 +80,7 @@
{
"name": "P3",
"type": "FLEX",
"adc": "EXT",
"adc": "MAIN",
"gpio": "GPIOC",
"pin": "LL_GPIO_PIN_2",
"channel": "LL_ADC_CHANNEL_12",
Expand All @@ -95,7 +91,7 @@
{
"name": "RTC_BAT",
"type": "RTC_BAT",
"adc": "MAIN",
"adc": "EXT",
"gpio": null,
"pin": null,
"channel": "LL_ADC_CHANNEL_VBAT"
Expand Down
10 changes: 8 additions & 2 deletions radio/src/targets/common/arm/stm32/stm32_adc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,11 @@ static inline DMA_Stream_TypeDef* _dma_get_stream(DMA_TypeDef *DMAx, uint32_t St
#define DMA_Stream0_IT_MASK (uint32_t)(DMA_LISR_FEIF0 | DMA_LISR_DMEIF0 | \
DMA_LISR_TEIF0 | DMA_LISR_HTIF0 | \
DMA_LISR_TCIF0)


#define DMA_Stream3_IT_MASK (uint32_t)(DMA_LISR_FEIF3 | DMA_LISR_DMEIF3 | \
DMA_LISR_TEIF3 | DMA_LISR_HTIF3 | \
DMA_LISR_TCIF3)

#define DMA_Stream4_IT_MASK (uint32_t)(DMA_HISR_FEIF4 | DMA_HISR_DMEIF4 | \
DMA_HISR_TEIF4 | DMA_HISR_HTIF4 | \
DMA_HISR_TCIF4)
Expand All @@ -592,7 +596,9 @@ static void adc_dma_clear_flags(DMA_TypeDef* DMAx, uint32_t stream)
if (stream == LL_DMA_STREAM_4) {
/* Reset interrupt pending bits for DMA2 Stream4 */
WRITE_REG(DMAx->HIFCR, DMA_Stream4_IT_MASK);

} else if (stream == LL_DMA_STREAM_3) {
/* Reset interrupt pending bits for DMA2 Stream3 (ADC2 on F4) */
WRITE_REG(DMAx->LIFCR, DMA_Stream3_IT_MASK);
} else if (stream == LL_DMA_STREAM_0) {
/* Reset interrupt pending bits for DMA2 Stream0 */
WRITE_REG(DMAx->LIFCR, DMA_Stream0_IT_MASK);
Expand Down