sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Add limiter for setpoint > ADC range

Browse Source
This commit is contained in:
Ben V. Brown
2020-01-18 13:01:51 +11:00
parent 03d3a20f9d
commit 0a671a97ba
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workspace/TS100/Core/Src/TipThermoModel.cpp
View File

@@ -119,3 +119,10 @@ uint32_t TipThermoModel::getTipInF(bool sampleNow) {
currentTipTempInF += convertCtoF(getHandleTemperature() / 10); //Add handle offset currentTipTempInF += convertCtoF(getHandleTemperature() / 10); //Add handle offset
return currentTipTempInF; return currentTipTempInF;
} }
uint32_t TipThermoModel::getTipMaxInC() {
uint32_t maximumTipTemp = TipThermoModel::convertTipRawADCToDegC(
0x7FFF - 10);
maximumTipTemp += getHandleTemperature() / 10; //Add handle offset
return maximumTipTemp;
}

6
workspace/TS100/Core/Src/TipThermoModel.h
View File

@@ -12,9 +12,11 @@
class TipThermoModel { class TipThermoModel {
public: public:
//These are the main two functions //These are the main two functions
static uint32_t getTipInC(bool sampleNow=false); static uint32_t getTipInC(bool sampleNow = false);
static uint32_t getTipInF(bool sampleNow=false); static uint32_t getTipInF(bool sampleNow = false);
//Calculates the maximum temperature can can be read by the ADC range
static uint32_t getTipMaxInC();
static uint32_t convertTipRawADCToDegC(uint16_t rawADC); static uint32_t convertTipRawADCToDegC(uint16_t rawADC);
static uint32_t convertTipRawADCToDegF(uint16_t rawADC); static uint32_t convertTipRawADCToDegF(uint16_t rawADC);

20
workspace/TS100/Core/Src/main.cpp
View File

@@ -138,6 +138,9 @@ void startPIDTask(void const *argument __unused) {
//Maximum allowed output //Maximum allowed output
currentTempTargetDegC = (450); currentTempTargetDegC = (450);
} }
if (currentTempTargetDegC > TipThermoModel::getTipMaxInC()) {
currentTempTargetDegC = TipThermoModel::getTipMaxInC();
}
// Convert the current tip to degree's C // Convert the current tip to degree's C
// As we get close to our target, temp noise causes the system // As we get close to our target, temp noise causes the system
@@ -190,7 +193,8 @@ void startPIDTask(void const *argument __unused) {
} }
#endif #endif
if (systemSettings.powerLimitEnable && x10WattsOut > (systemSettings.powerLimit * 10)) if (systemSettings.powerLimitEnable
&& x10WattsOut > (systemSettings.powerLimit * 10))
setTipX10Watts(systemSettings.powerLimit * 10); setTipX10Watts(systemSettings.powerLimit * 10);
else else
setTipX10Watts(x10WattsOut); setTipX10Watts(x10WattsOut);
@@ -289,17 +293,17 @@ void startMOVTask(void const *argument __unused) {
/* The header value is (0xAA,0x55,0xF0,0x0D) but is stored in little endian 16 /* The header value is (0xAA,0x55,0xF0,0x0D) but is stored in little endian 16
* bits words on the flash */ * bits words on the flash */
const uint8_t LOGO_HEADER_VALUE[] = {0x55, 0xAA, 0x0D, 0xF0}; const uint8_t LOGO_HEADER_VALUE[] = { 0x55, 0xAA, 0x0D, 0xF0 };
bool showBootLogoIfavailable() { bool showBootLogoIfavailable() {
uint8_t *header = (uint8_t*) (FLASH_LOGOADDR); uint8_t *header = (uint8_t*) (FLASH_LOGOADDR);
// check if the header is correct. // check if the header is correct.
for(int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
if(header[i] != LOGO_HEADER_VALUE[i]) { if (header[i] != LOGO_HEADER_VALUE[i]) {
return false; return false;
} }
} }
OLED::drawAreaSwapped(0, 0, 96, 16, (uint8_t*) (FLASH_LOGOADDR + 4)); OLED::drawAreaSwapped(0, 0, 96, 16, (uint8_t*) (FLASH_LOGOADDR + 4));
OLED::refresh(); OLED::refresh();