Fixed adc config, to read internal reference voltage to get cpu temperature #13152

dinomani · 2019-10-10T14:17:22Z

Adc is reading the wrong channel for temperature on stm32f42xxxx, stm32f7. Channel should be 18.
Also, it does not set the bit to enable and chose the according reference voltage. The register does not refer to the base of ADCx but to the ADCCommon register.
The intended prescaler value of 2 is also not set because of the wrong adc base address.

Tested on fmuv5, reading channel 18 gives now plausible values.

dagar · 2019-10-14T14:48:30Z

Looks good. Do you have plans to expose this somewhere it can be logged?

davids5 · 2019-10-19T17:07:24Z

boards/px4/fmu-v5/src/board_config.h

@@ -260,6 +260,8 @@
 #define ADC_HW_REV_SENSE_CHANNEL            /* PC3 */  ADC1_CH(13)
 #define ADC1_SPARE_1_CHANNEL                /* PC4 */  ADC1_CH(14)

+#define ADC_INTERNAL_TEMP_SENSOR_CHANNEL (18) /* No Gpio assigned, internal channel*/


nit - Comment is missing trailing space

I think we should look at putting this in <px4_platform/adc.h>
This is a chip dependent as to what ADC and what channel and is not not a board attribute.

F4:
Temperature sensor, VREFINT and VBAT internal channels
• For the STM32F40x and STM32F41x devices, the temperature sensor is internally
connected to channel ADC1_IN16.
The internal reference voltage VREFINT is connected to ADC1_IN17.
• For the STM32F42x and STM32F43x devices, the temperature sensor is internally
connected to ADC1_IN18 channel which is shared with VBAT. Only one conversion,
temperature sensor or VBAT, must be selected at a time. When the temperature sensor
and VBAT conversion are set simultaneously, only the VBAT conversion is performed.
The internal reference voltage VREFINT is connected to ADC1_IN17.
The VBAT channel (connected to channel ADC1_IN18) can also be converted as an injected
or regular channel.
Note: The temperature sensor, VREFINT and the VBAT channel are available only on the master
ADC1 peripheral
F7:
• The temperature sensor is internally connected to ADC1_IN18 channel which is shared
with VBAT. Only one conversion, temperature sensor or VBAT, must be selected at a
time. When the temperature sensor and VBAT conversion are set simultaneously, only
the VBAT conversion is performed.
The internal reference voltage VREFINT is connected to ADC1_IN17.
The VBAT channel is connected to ADC1_IN18 channel. It can also be converted as an
injected or regular channel.
H7:

The ADCs are connected to 5 internal analog inputs:
– the internal temperature sensor (VSENSE) is connected to ADC3 VINP/VINN[18]
– the internal reference voltage (VREFINT) is connected to ADC3 VINP/VINN[19]
– the VBAT monitoring channel (VBAT/4) is connected to ADC3 VINP/VINN[17]
– DAC internal channel 1, connected to ADC2 VINP/VINN[16]

platforms/nuttx/src/px4/stm/stm32_common/adc/adc.cpp

stale · 2020-01-19T01:09:33Z

This issue has been automatically marked as stale because it has not had recent activity. Thank you for your contributions.

LorenzMeier · 2020-03-08T20:52:51Z

@dinomani @davids5 This should really be wrapped up.

stale · 2020-06-06T21:41:40Z

This issue has been automatically marked as stale because it has not had recent activity. Thank you for your contributions.

LorenzMeier · 2021-01-10T17:44:38Z

Needs a rebase.

mrpollo · 2021-01-20T17:08:53Z

Next steps

rebase
address comments from @davids5

MaEtUgR · 2021-01-21T08:56:38Z

Rebased, thanks to @dinomani for the nice collaboration 👍

davids5

This is the composition: BOARD has CHIP, CHIP has ADC
Once the board select the chip the the ADC should be configured.
Since this is an attribute of the SoC it goes in the micro hal.

If it is in all micro hal's, then the Top of file #if !defined goes away.

davids5 · 2021-01-21T11:17:25Z

platforms/nuttx/src/px4/stm/stm32_common/adc/adc.cpp

@@ -237,7 +237,7 @@ uint32_t px4_arch_adc_temp_sensor_mask()
 {
 #ifdef ADC_INTERNAL_TEMP_SENSOR_CHANNEL


Please consider this:
Top of File

#if !defined(ADC_INTERNAL_TEMP_SENSOR_CHANNEL) # define ADC_INTERNAL_TEMP_SENSOR_CHANNEL 16 #end in code return 1 << ADC_INTERNAL_TEMP_SENSOR_CHANNEL; In micro_hal for IC #define ADC_INTERNAL_TEMP_SENSOR_CHANNEL nn

dagar · 2021-01-26T14:20:07Z

Can we get the data captured somewhere so it can actually be monitored? Either added to cpuload or a new message?

PX4-Autopilot/msg/cpuload.msg

Line 3 in f45b67a

float32 ram_usage # RAM usage from 0 to 1

LorenzMeier · 2021-01-31T11:28:13Z

@dinomani Could you please take the review comments into consideration? Let's wrap this up and get your fix in!

mrpollo · 2021-02-24T16:57:43Z

@dinomani do you have any updates on this PR, do you have time to continue working on this feature or would you rather someone from the team help you take this to the finish line?

davids5

@dinomani See in line - I am assuming the updates we discussed on the call today are coming. If not, let me know and I can can finish this.

davids5 · 2021-03-10T17:52:02Z

platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/micro_hal.h

@@ -65,5 +65,6 @@ int stm32h7_flash_lock(size_t addr);
 int stm32h7_flash_unlock(size_t addr);
 int stm32h7_flash_writeprotect(size_t block, bool enabled);
 #define  stm32_flash_lock() stm32h7_flash_lock(PX4_FLASH_BASE)
+#define APX4_ADC_INTERNAL_TEMP_SENSOR_CHANNEL 17 //Valid for ADC3 on H7x3


Once this is corrected and the code to support it is added this should come in.

@dagar said add the temperature to top for the next PR. From there as a subcategory of system integrity like we discussed today.

I was talking about either ORB_ID(cpuload) or a new standalone topic (if there's more relevant data).

PX4-Autopilot/src/modules/load_mon/LoadMon.cpp

Lines 220 to 229 in 3ad0da5

cpuload.load = interval_spent_time / interval;

#elif defined(__PX4_NUTTX)

// get ram usage

struct mallinfo mem = mallinfo();

cpuload.ram_usage = (float)mem.uordblks / mem.arena;

cpuload.load = 1.f - interval_idletime / interval;

#endif

cpuload.timestamp = hrt_absolute_time();

_cpuload_pub.publish(cpuload);

davids5 · 2021-03-17T15:00:05Z

platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/micro_hal.h

@@ -65,6 +65,8 @@ int stm32h7_flash_lock(size_t addr);
 int stm32h7_flash_unlock(size_t addr);
 int stm32h7_flash_writeprotect(size_t block, bool enabled);
 #define  stm32_flash_lock() stm32h7_flash_lock(PX4_FLASH_BASE)
-#define APX4_ADC_INTERNAL_TEMP_SENSOR_CHANNEL 17 //Valid for ADC3 on H7x3
+#define PX4_ADC_ADC3_CHANNEL_OFFSET 7


This is artificial. We should just compare for == PX4_ADC_INTERNAL_TEMP_SENSOR_CHANNEL

platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/micro_hal.h

davids5

@dinomani - Thank you

one delete

…channels were verified with ST_CUBE header files. For the H7 its a simplification for the current used H7x3. Other devices in that family expect the temperarture on channel 18. F1: channel 16 F3: channel 16 F4: channel 18 F7: channel 18 H7: channel 17, on STMf32Hx3

Co-authored-by: David Sidrane <David.Sidrane@Nscdg.com>

weekly-digest bot mentioned this pull request Oct 13, 2019

Weekly Digest (6 October, 2019 - 13 October, 2019) #13171

Closed

dagar requested a review from davids5 October 14, 2019 14:48

dagar added Admin: Enhancement (improvement) 💡 Board: Pixhawk fmu-v5 FMU-v5 including pixhawk 4, pixhack v5, etc Board: Pixhawk fmu-v5x labels Oct 14, 2019

davids5 requested changes Oct 19, 2019

View reviewed changes

weekly-digest bot mentioned this pull request Oct 20, 2019

Weekly Digest (13 October, 2019 - 20 October, 2019) #13236

Closed

stale bot added the stale label Jan 19, 2020

stale bot removed the stale label Mar 8, 2020

stale bot added the stale label Jun 6, 2020

LorenzMeier previously approved these changes Jan 10, 2021

View reviewed changes

stale bot removed the stale label Jan 10, 2021

LorenzMeier marked this pull request as ready for review January 10, 2021 17:44

MaEtUgR dismissed LorenzMeier’s stale review via b6beab3 January 21, 2021 08:46

MaEtUgR force-pushed the temperature_sensor_fix branch from 6978b95 to b6beab3 Compare January 21, 2021 08:46

MaEtUgR force-pushed the temperature_sensor_fix branch from b6beab3 to 438a41a Compare January 21, 2021 08:49

davids5 requested changes Jan 21, 2021

View reviewed changes

MaEtUgR force-pushed the temperature_sensor_fix branch from 438a41a to e84edd8 Compare February 10, 2021 13:04

dinomani force-pushed the temperature_sensor_fix branch from e84edd8 to 0192285 Compare March 10, 2021 09:48

dinomani requested a review from davids5 March 10, 2021 09:50

davids5 requested changes Mar 10, 2021

View reviewed changes

davids5 requested changes Mar 17, 2021

View reviewed changes

davids5 reviewed Mar 17, 2021

View reviewed changes

platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/micro_hal.h Outdated Show resolved Hide resolved

davids5 requested changes Mar 17, 2021

View reviewed changes

davids5 previously approved these changes Mar 17, 2021

View reviewed changes

dinomani and others added 6 commits March 17, 2021 17:28

Fixed adc config, to read internal reference to get cpu temperature

794be36

changed #elif to #else, to build on all targets

3c43d79

Fixed typo and added support for H7 temperature sense on ADC3

b7572c4

As David request

200efd7

Update platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/micro_hal.h

50ced81

Co-authored-by: David Sidrane <David.Sidrane@Nscdg.com>

dinomani dismissed davids5’s stale review via 50ced81 March 17, 2021 17:03

dinomani force-pushed the temperature_sensor_fix branch from f920c98 to 50ced81 Compare March 17, 2021 17:03

davids5 approved these changes Mar 18, 2021

View reviewed changes

davids5 merged commit 4bf894a into PX4:master Mar 18, 2021

davids5 mentioned this pull request Mar 22, 2022

stm32h7 ADC and board_hw_rev_ver fixes #19370

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed adc config, to read internal reference voltage to get cpu temperature #13152

Fixed adc config, to read internal reference voltage to get cpu temperature #13152

dinomani commented Oct 10, 2019

dagar commented Oct 14, 2019

davids5 Oct 19, 2019

stale bot commented Jan 19, 2020

LorenzMeier commented Mar 8, 2020

stale bot commented Jun 6, 2020

LorenzMeier commented Jan 10, 2021

mrpollo commented Jan 20, 2021 •

edited by MaEtUgR

Loading

MaEtUgR commented Jan 21, 2021

davids5 left a comment •

edited

Loading

davids5 Jan 21, 2021

dagar commented Jan 26, 2021

LorenzMeier commented Jan 31, 2021

mrpollo commented Feb 24, 2021

davids5 left a comment

davids5 Mar 10, 2021

dagar Mar 10, 2021

davids5 Mar 17, 2021

davids5 left a comment

		@@ -237,7 +237,7 @@ uint32_t px4_arch_adc_temp_sensor_mask()
		{
		#ifdef ADC_INTERNAL_TEMP_SENSOR_CHANNEL

	cpuload.load = interval_spent_time / interval;
	#elif defined(__PX4_NUTTX)
	// get ram usage
	struct mallinfo mem = mallinfo();
	cpuload.ram_usage = (float)mem.uordblks / mem.arena;
	cpuload.load = 1.f - interval_idletime / interval;
	#endif
	cpuload.timestamp = hrt_absolute_time();

	_cpuload_pub.publish(cpuload);

Fixed adc config, to read internal reference voltage to get cpu temperature #13152

Fixed adc config, to read internal reference voltage to get cpu temperature #13152

Conversation

dinomani commented Oct 10, 2019

dagar commented Oct 14, 2019

davids5 Oct 19, 2019

Choose a reason for hiding this comment

stale bot commented Jan 19, 2020

LorenzMeier commented Mar 8, 2020

stale bot commented Jun 6, 2020

LorenzMeier commented Jan 10, 2021

mrpollo commented Jan 20, 2021 • edited by MaEtUgR Loading

MaEtUgR commented Jan 21, 2021

davids5 left a comment • edited Loading

Choose a reason for hiding this comment

davids5 Jan 21, 2021

Choose a reason for hiding this comment

dagar commented Jan 26, 2021

LorenzMeier commented Jan 31, 2021

mrpollo commented Feb 24, 2021

davids5 left a comment

Choose a reason for hiding this comment

davids5 Mar 10, 2021

Choose a reason for hiding this comment

dagar Mar 10, 2021

Choose a reason for hiding this comment

davids5 Mar 17, 2021

Choose a reason for hiding this comment

davids5 left a comment

Choose a reason for hiding this comment

mrpollo commented Jan 20, 2021 •

edited by MaEtUgR

Loading

davids5 left a comment •

edited

Loading