Use temperature formula from reference manual code example.

This commit is contained in:
Renaud 2021-06-30 12:09:11 +08:00
parent e19475388d
commit a7cafdf989
2 changed files with 7 additions and 6 deletions

8
adc.c
View File

@ -1,5 +1,5 @@
/* adc.c -- system layer
** Copyright (c) 2020 Renaud Fivet
** Copyright (c) 2020-2021 Renaud Fivet
**
** ADC for temperature sensor and Vrefint
** gpioa low level API and usleep()
@ -118,7 +118,7 @@
/** SYSTEM MEMORY *************************************************************/
/* STM32F030 calibration addresses (at 3.3V and 30C) */
#define TS_CAL ((unsigned short *) 0x1FFFF7B8)
#define TS_CAL1 ((unsigned short *) 0x1FFFF7B8)
#define VREFINT_CAL ((unsigned short *) 0x1FFFF7BA)
@ -298,7 +298,7 @@ void adc_vnt( vnt_cmd_t cmd, short *ptrV, short *ptrC) {
if( cmd <= VNT_CAL) {
/* Calibration Values */
*ptrV = *VREFINT_CAL ;
*ptrC = *TS_CAL ;
*ptrC = *TS_CAL1 ;
return ;
}
@ -307,8 +307,8 @@ void adc_vnt( vnt_cmd_t cmd, short *ptrV, short *ptrC) {
*ptrV = adc_convert() ;
if( cmd == VNT_VNC) {
*ptrC = 300 + (*TS_CAL1 - *ptrC * *VREFINT_CAL / *ptrV) * 10000 / 5336 ;
*ptrV = 330 * *VREFINT_CAL / *ptrV ;
*ptrC = 850 + (1500 - *ptrC) * 10 / 4 ;
}
}

View File

@ -1,5 +1,5 @@
/* adcmain.c -- ADC reading of reference voltage and temperature sensor */
/* Copyright (c) 2020 Renaud Fivet */
/* Copyright (c) 2020-2021 Renaud Fivet */
#include <stdio.h>
#include "system.h"
@ -26,8 +26,9 @@ int main( void) {
#ifdef RAW
adc_vnt( VNT_RAW, &Vsample, &Csample) ;
printf( "%i, %i, %i, %i, ", calV, Vsample, calC, Csample) ;
Csample = 300 + (calC - (int) Csample * calV / Vsample)
* 10000 / 5336 ;
Vsample = 330 * calV / Vsample ;
Csample = 850 + (1500 - (int) Csample) * 10 / 4 ;
#else
adc_vnt( VNT_VNC, &Vsample, &Csample) ;
#endif