From 53deac02e78d96eed082def9839b576a07b898fd Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Mon, 28 Dec 2020 16:12:18 +1100 Subject: [PATCH] Bring in ADC timing a tad --- workspace/TS100/Core/BSP/Miniware/BSP.cpp | 2 +- workspace/TS100/Core/BSP/Miniware/Setup.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workspace/TS100/Core/BSP/Miniware/BSP.cpp b/workspace/TS100/Core/BSP/Miniware/BSP.cpp index c6066df7..62b5e6e2 100644 --- a/workspace/TS100/Core/BSP/Miniware/BSP.cpp +++ b/workspace/TS100/Core/BSP/Miniware/BSP.cpp @@ -14,7 +14,7 @@ volatile uint8_t pendingPWM = 0; const uint16_t powerPWM = 255; static const uint8_t holdoffTicks = 14; // delay of 8 ms -static const uint8_t tempMeasureTicks = 25; +static const uint8_t tempMeasureTicks = 14; uint16_t totalPWM; //htim2.Init.Period, the full PWM cycle diff --git a/workspace/TS100/Core/BSP/Miniware/Setup.c b/workspace/TS100/Core/BSP/Miniware/Setup.c index d3d4bff8..0c368c30 100644 --- a/workspace/TS100/Core/BSP/Miniware/Setup.c +++ b/workspace/TS100/Core/BSP/Miniware/Setup.c @@ -161,7 +161,7 @@ static void MX_ADC1_Init(void) { sConfigInjected.InjectedChannel = TIP_TEMP_ADC1_CHANNEL; sConfigInjected.InjectedRank = 1; sConfigInjected.InjectedNbrOfConversion = 4; - sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_7CYCLES_5; + sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_1CYCLE_5; sConfigInjected.ExternalTrigInjecConv = ADC_EXTERNALTRIGINJECCONV_T2_CC1; sConfigInjected.AutoInjectedConv = DISABLE; sConfigInjected.InjectedDiscontinuousConvMode = DISABLE; @@ -214,7 +214,7 @@ static void MX_ADC2_Init(void) { sConfigInjected.InjectedChannel = TIP_TEMP_ADC2_CHANNEL; sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1; sConfigInjected.InjectedNbrOfConversion = 4; - sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_7CYCLES_5; + sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_1CYCLE_5; sConfigInjected.ExternalTrigInjecConv = ADC_EXTERNALTRIGINJECCONV_T2_CC1; sConfigInjected.AutoInjectedConv = DISABLE; sConfigInjected.InjectedDiscontinuousConvMode = DISABLE;