Merge branch 'master' into pinecil

workspace/TS100/Core/BSP/Miniware/BSP.cpp

@@ -12,6 +12,14 @@
 volatile uint16_t PWMSafetyTimer = 0;
 volatile uint8_t pendingPWM = 0;
 
+const uint16_t powerPWM = 255;
+static const uint8_t holdoffTicks = 13; // delay of 7 ms
+static const uint8_t tempMeasureTicks = 17;
+
+uint16_t totalPWM; //htim2.Init.Period, the full PWM cycle
+
+static bool fastPWM;
+
 //2 second filter (ADC is PID_TIM_HZ Hz)
 history<uint16_t, PID_TIM_HZ> rawTempFilter = {{0}, 0, 0};
 void resetWatchdog()
@@ -206,6 +214,47 @@ void setTipPWM(uint8_t pulse)
 	pendingPWM = pulse;
 }
 
+static void switchToFastPWM(void)
+{
+	fastPWM = true;
+	totalPWM = powerPWM + tempMeasureTicks * 2;
+	htim2.Instance->ARR = totalPWM;
+	// ~3.5 Hz rate
+	htim2.Instance->CCR1 = powerPWM + holdoffTicks * 2;
+	// 2 MHz timer clock/2000 = 1 kHz tick rate
+	htim2.Instance->PSC = 2000;
+}
+
+static void switchToSlowPWM(void)
+{
+	fastPWM = false;
+	totalPWM = powerPWM + tempMeasureTicks;
+	htim2.Instance->ARR = totalPWM;
+	// ~1.84 Hz rate
+	htim2.Instance->CCR1 = powerPWM + holdoffTicks;
+	// 2 MHz timer clock/4000 = 500 Hz tick rate
+	htim2.Instance->PSC = 4000;
+}
+
+bool tryBetterPWM(uint8_t pwm)
+{
+	if (fastPWM && pwm == powerPWM)
+	{
+		// maximum power for fast PWM reached, need to go slower to get more
+		switchToSlowPWM();
+		return true;
+	}
+	else if (!fastPWM && pwm < 230)
+	{
+		// 254 in fast PWM mode gives the same power as 239 in slow
+		// allow for some reasonable hysteresis by switching only when it goes
+		// below 230 (equivalent to 245 in fast mode)
+		switchToFastPWM();
+		return true;
+	}
+	return false;
+}
+
 // These are called by the HAL after the corresponding events from the system
 // timers.
 
@@ -326,9 +375,13 @@ uint8_t getButtonB()
 	return HAL_GPIO_ReadPin(KEY_B_GPIO_Port, KEY_B_Pin) == GPIO_PIN_RESET ? 1 : 0;
 }
 
+void BSPInit(void)
+{
+	switchToFastPWM();
+}
+
 void reboot()
 {
-
 	NVIC_SystemReset();
 }
 

workspace/TS100/Core/BSP/Miniware/Setup.c

@@ -315,13 +315,15 @@ static void MX_TIM2_Init(void) {
 	// Timer 2 is fairly slow as its being used to run the PWM and trigger the ADC
 	// in the PWM off time.
 	htim2.Instance = TIM2;
-	htim2.Init.Prescaler = 4000; //1mhz tick rate/800 = 1.25 KHz tick rate
+	// dummy value, will be reconfigured by BSPInit()
+	htim2.Init.Prescaler = 2000; // 2 MHz timer clock/2000 = 1 kHz tick rate
 
 	// pwm out is 10k from tim3, we want to run our PWM at around 10hz or slower on the output stage
-	// These values give a rate of around 8Hz
+	// These values give a rate of around 3.5 Hz for "fast" mode and 1.84 Hz for "slow"
 	htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
-	htim2.Init.Period = 255 + 17;
-	htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4;  // 4mhz before divide
+	// dummy value, will be reconfigured by BSPInit()
+	htim2.Init.Period = 255 + 17 * 2;
+	htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4;  // 8 MHz (x2 APB1) before divide
 	htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
 	htim2.Init.RepetitionCounter = 0;
 	HAL_TIM_Base_Init(&htim2);
@@ -337,7 +339,8 @@ static void MX_TIM2_Init(void) {
 	HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig);
 
 	sConfigOC.OCMode = TIM_OCMODE_PWM1;
-	sConfigOC.Pulse = 255 + 13;  //13 -> Delay of 5ms
+	// dummy value, will be reconfigured by BSPInit()
+	sConfigOC.Pulse = 255 + 13 * 2;  // 13 -> Delay of 7 ms
 	//255 is the largest time period of the drive signal, and then offset ADC sample to be a bit delayed after this
 	/*
 	 * It takes 4 milliseconds for output to be stable after PWM turns off.

workspace/TS100/Core/BSP/Miniware/preRTOS.cpp

@@ -17,6 +17,7 @@ void preRToSInit() {
 	 */
 	HAL_Init();
 	Setup_HAL();  // Setup all the HAL objects
+	BSPInit();
 #ifdef I2C_SOFT
 	I2CBB::init();
 #endif