Merge pull request #407 from tfry-git/work/constexpr2

Fix compilation problem in STM32ADC.h when using in -std=gnu++11
This commit is contained in:
Roger Clark 2018-01-21 14:37:40 +11:00 committed by GitHub
commit 98f1efdda3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -152,7 +152,7 @@ private:
voidFuncPtr _DMA_int;
voidFuncPtr _ADC_int;
voidFuncPtr _AWD_int;
static const float _AverageSlope = 4.3; // mV/oC //4.0 to 4.6
static const float _V25 = 1.43; //Volts //1.34 - 1.52
static constexpr float _AverageSlope = 4.3; // mV/oC //4.0 to 4.6
static constexpr float _V25 = 1.43; //Volts //1.34 - 1.52
};