* Add SDK * fork * massaging makefile * Drop git module * Bring in sdk as its broken Far, Far to much crap to fix with regex now * Remove bl706 * rf_para_flash_t is missing defs * Remove crapton of junk * Remove yet more * Poking I2C * Update peripheral_config.h * Update pinmux_config.h * Update preRTOS.cpp * Update main.hpp * Setup template * Verbose boot * I2C ish * Update I2C_Wrapper.cpp * Update main.cpp * Turn off I2C reading for now * Display running * Roughing out scheduling timer0 * Starting ADC setup * Working scheduling of ADC 🎉 * Format adc headers * Update IRQ.cpp * Buttons working * Slow down I2C * Poking IRQ * Larger stack required * Accel on * Trying to chase down why __libc_init_array isnt working yet * Working c++ * Cleanup * Bump stacks * I2C wake part workaround * Cleanup * Working PWM init * qc draft * Hookup PWM * Stable enough ADC * ADC timing faster + timer without HAL * Silence * Remove boot banner * Tuning in ADC * Wake PID after ADC * Remove unused hal * Draft flash settings * Working settings save & restore * Update to prod model * Cleanup * NTC thermistor * Correct adc gain * Rough tip resistance progress * Scratch out resistance awareness of the tip * better adc settings * Tweaking ADC * ADC tweaking * Make adc range scalable * Update Dockerfile * Update configuration.h * Can read same ADC twice in a row * ADC Setup * Update PIDThread.cpp * Lesser adc backoff * Update USBPD.h * Add device ID * Update BSP_Power.h * Update BSP.cpp * DrawHex dynamicLength * Shorter ID padding * Show validation code * tip measurement * Create access for w0w1 * Expose w0 w1 * Enable debug * crc32 * Device validation * wip starting epr * Logic refactor * Safer PWM Init * PD cleanups * Update bl702_pwm.c * Update power.cpp * Update usb-pd * io * EPR decode * Better gui for showing pd specs * Rough handler for capabilities * EPR * Fix > 25V input * Perform pow step after PPS * Update BSP.cpp * Fix timer output * QC3 * Add tip resistance view * Hold PD negotiation until detection is done for tip res * Get Thermal mass * Tip res =0 protection * Update PIDThread.cpp * Update GUIThread.cpp * Rewrite tip resistance measurement * Update GUIThread.cpp * Fix fallback * Far better tip resistance measurement * Fix QC 0.6V D- * Convert the interpolator to int32 * Correct the NTC lookup * Update BSP.cpp * Update Setup.cpp * . Update configuration #defines More backported functions * Update usb-pd * More missed updates * Refactor BSP Magic BSP -> PinecilV2 Pine64 BSP -> Pinecil Update Makefile * Add Pinecilv2 to CI * Pinecil v2 multi-lang Update push.yml * Update HallSensor.md * Update README.md * Fix wrong prestartcheck default * Fix logo mapping * Update Makefile * Remove unused font block * Style * Style * Remove unused timer funcs * More culling TS80P * Revert "More culling TS80P" This reverts commit2078b89be7. * Revert "Remove unused timer funcs" This reverts commit0c693a89cc. * Make VBus check maskable * Remove DMA half transfer * Drop using brightness and invert icons and go back to text Saves flash space * Refactor settings UI drawing descriptions * Shorten setting function names * Store bin file assets * Fix MHP prestart
90 lines
3.0 KiB
C++
90 lines
3.0 KiB
C++
/*
|
|
* power.cpp
|
|
*
|
|
* Created on: 28 Oct, 2018
|
|
* Authors: Ben V. Brown, David Hilton <- Mostly David
|
|
*/
|
|
|
|
#include <BSP.h>
|
|
#include <Settings.h>
|
|
#include <power.hpp>
|
|
|
|
static int32_t PWMToX10Watts(uint8_t pwm, uint8_t sample);
|
|
const int fastPWMChangeoverPoint = 128;
|
|
const int fastPWMChangeoverTolerance = 16;
|
|
|
|
expMovingAverage<uint32_t, wattHistoryFilter> x10WattHistory = {0};
|
|
|
|
bool shouldBeUsingFastPWMMode(const uint8_t pwmTicks) {
|
|
// Determine if we should use slow or fast PWM mode
|
|
// Crossover between modes set around the midpoint of the PWM control point
|
|
static bool lastPWMWasFast = true;
|
|
if (pwmTicks > (fastPWMChangeoverPoint + fastPWMChangeoverTolerance) && lastPWMWasFast) {
|
|
lastPWMWasFast = false;
|
|
} else if (pwmTicks < (fastPWMChangeoverPoint - fastPWMChangeoverTolerance) && !lastPWMWasFast) {
|
|
lastPWMWasFast = true;
|
|
}
|
|
return lastPWMWasFast;
|
|
}
|
|
|
|
int32_t tempToX10Watts(int32_t rawTemp) {
|
|
// mass is in x10J/*C, rawC is raw per degree C
|
|
// returns x10Watts needed to raise/lower a mass by rawTemp
|
|
// degrees in one cycle.
|
|
int32_t x10Watts = TIP_THERMAL_MASS * rawTemp;
|
|
return x10Watts;
|
|
}
|
|
|
|
void setTipX10Watts(int32_t mw) {
|
|
int32_t outputPWMLevel = X10WattsToPWM(mw, 1);
|
|
const bool shouldUseFastPWM = shouldBeUsingFastPWMMode(outputPWMLevel);
|
|
setTipPWM(outputPWMLevel, shouldUseFastPWM);
|
|
uint32_t actualMilliWatts = PWMToX10Watts(outputPWMLevel, 0);
|
|
|
|
x10WattHistory.update(actualMilliWatts);
|
|
}
|
|
|
|
uint32_t availableW10(uint8_t sample) {
|
|
// P = V^2 / R, v*v = v^2 * 100
|
|
// R = R*10
|
|
// P therefore is in V^2*100/R*10 = W*10.
|
|
uint32_t v = getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), sample); // 100 = 10v
|
|
uint32_t tipResistance = getTipResistanceX10();
|
|
if (tipResistance == 0) {
|
|
return 100; // say 100 watt to force scale down
|
|
}
|
|
uint32_t availableWattsX10 = (v * v) / tipResistance;
|
|
// However, 100% duty cycle is not possible as there is a dead time while the ADC takes a reading
|
|
// Therefore need to scale available milliwats by this
|
|
|
|
// avMw=(AvMw*powerPWM)/totalPWM.
|
|
availableWattsX10 = availableWattsX10 * powerPWM;
|
|
availableWattsX10 /= totalPWM;
|
|
|
|
// availableMilliWattsX10 is now an accurate representation
|
|
return availableWattsX10;
|
|
}
|
|
uint8_t X10WattsToPWM(int32_t x10Watts, uint8_t sample) {
|
|
// Scale input x10Watts to the pwm range available
|
|
if (x10Watts <= 0) {
|
|
// keep the battery voltage updating the filter
|
|
getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), sample);
|
|
return 0;
|
|
}
|
|
|
|
// Calculate desired x10Watts as a percentage of availableW10
|
|
uint32_t pwm;
|
|
pwm = (powerPWM * x10Watts) / availableW10(sample);
|
|
if (pwm > powerPWM) {
|
|
// constrain to max PWM counter
|
|
pwm = powerPWM;
|
|
}
|
|
return pwm;
|
|
}
|
|
|
|
static int32_t PWMToX10Watts(uint8_t pwm, uint8_t sample) {
|
|
uint32_t maxMW = availableW10(sample); // Get the milliwatts for the max pwm period
|
|
// Then convert pwm into percentage of powerPWM to get the percentage of the max mw
|
|
return (((uint32_t)pwm) * maxMW) / powerPWM;
|
|
}
|