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

Fix reading of handle compensation to fix offset tip temperatures

Browse Source
This commit is contained in:
Ben V. Brown
2019-01-26 20:35:39 +11:00
parent 9514d3a1db
commit 3182440854
8 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workspace/TS100/inc/Font.h
View File

@@ -10,7 +10,11 @@
#ifndef FONT_H_ #ifndef FONT_H_
#define FONT_H_ #define FONT_H_
#include "Translation.h" #include "Translation.h"
#ifdef LANG_RU
#ifndef CYRILLIC_GLYPHS
#define CYRILLIC_GLYPHS
#endif
#endif
#define FONT_12_WIDTH 12 #define FONT_12_WIDTH 12
/* /*

6
workspace/TS100/inc/Settings.h
View File

@@ -11,8 +11,8 @@
#define SETTINGS_H_ #define SETTINGS_H_
#include <stdint.h> #include <stdint.h>
#include "stm32f1xx_hal.h" #include "stm32f1xx_hal.h"
#define SETTINGSVERSION \ #define SETTINGSVERSION ( 0x19 )
0x18 /*Change this if you change the struct below to prevent people getting \ /*Change this if you change the struct below to prevent people getting \
out of sync*/ out of sync*/
/* /*
@@ -23,7 +23,7 @@ typedef struct {
uint16_t SolderingTemp; // current set point for the iron uint16_t SolderingTemp; // current set point for the iron
uint16_t SleepTemp; // temp to drop to in sleep uint16_t SleepTemp; // temp to drop to in sleep
uint8_t SleepTime; // minutes timeout to sleep uint8_t SleepTime; // minutes timeout to sleep
uint8_t cutoutSetting; // The voltage we cut out at for under voltage OR Power level for TS80 uint8_t cutoutSetting; // The voltage we cut out at for under voltage OR Power level for TS80
uint8_t OrientationMode :2; // If true we want to invert the display for lefties uint8_t OrientationMode :2; // If true we want to invert the display for lefties
uint8_t sensitivity :4; // Sensitivity of accelerometer (5 bits) uint8_t sensitivity :4; // Sensitivity of accelerometer (5 bits)
uint8_t autoStartMode :2; // Should the unit automatically jump straight uint8_t autoStartMode :2; // Should the unit automatically jump straight

20
workspace/TS100/src/gui.cpp
View File

@@ -652,22 +652,28 @@ static void setTipOffset() {
uint32_t offset = 0; uint32_t offset = 0;
for (uint8_t i = 0; i < 15; i++) { for (uint8_t i = 0; i < 15; i++) {
offset += getTipRawTemp(1); offset += getTipRawTemp(0);
// cycle through the filter a fair bit to ensure we're stable. // cycle through the filter a fair bit to ensure we're stable.
OLED::clearScreen(); OLED::clearScreen();
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
OLED::print(".");
for (uint8_t x = 0; x < i / 4; x++) for (uint8_t x = 0; x < i / 4; x++)
OLED::print("."); OLED::print(".");
OLED::refresh(); OLED::refresh();
osDelay(333); osDelay(100);
} }
systemSettings.CalibrationOffset = offset / 15; systemSettings.CalibrationOffset = offset / 15;
// Need to remove from this the ambient temperature offset // Need to remove from this the ambient temperature offset
uint32_t ambientoffset = getHandleTemperature(); // Handle temp in C uint32_t ambientoffset = getHandleTemperature(); // Handle temp in C x10
ambientoffset *=1000; ambientoffset *= 100;
ambientoffset /= tipGainCalValue; ambientoffset /= tipGainCalValue;
systemSettings.CalibrationOffset -= ambientoffset;
setCalibrationOffset(systemSettings.CalibrationOffset); // store the error setCalibrationOffset(systemSettings.CalibrationOffset); // store the error
osDelay(100); OLED::clearScreen();
OLED::setCursor(0, 0);
OLED::print("OK");
OLED::refresh();
osDelay(1000);
} }
static void calibration_enterSimpleCal(void) { static void calibration_enterSimpleCal(void) {
// User has entered into the simple cal routine // User has entered into the simple cal routine
@@ -816,10 +822,10 @@ static void settings_setCalibrateVIN(void) {
for (;;) { for (;;) {
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv,0) / 10, OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv, 0) / 10,
2); 2);
OLED::print("."); OLED::print(".");
OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv,0) % 10, OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv, 0) % 10,
1); 1);
OLED::print("V"); OLED::print("V");

2
workspace/TS100/src/hardware.c
View File

@@ -34,7 +34,7 @@ uint16_t getHandleTemperature() {
result -= 4965; // remove 0.5V offset result -= 4965; // remove 0.5V offset
// 10mV per C // 10mV per C
// 99.29 counts per Deg C above 0C // 99.29 counts per Deg C above 0C
result *= 10; result *= 100;
result /= 993; result /= 993;
return result; return result;
} }

4
workspace/TS100/src/main.cpp
View File

@@ -939,7 +939,7 @@ void startPIDTask(void const *argument __unused) {
#ifdef MODEL_TS80 #ifdef MODEL_TS80
//Set power management code to the tip resistance in ohms * 10 //Set power management code to the tip resistance in ohms * 10
setupPower(calculateTipR() / 100); setupPower(calculateTipR() / 100);
size_t lastPowerPulse = 0; //size_t lastPowerPulse = 0;
#else #else
setupPower(85); setupPower(85);
@@ -987,7 +987,7 @@ void startPIDTask(void const *argument __unused) {
const uint16_t mass = 2020 / 20; // divide here so division is compile-time. const uint16_t mass = 2020 / 20; // divide here so division is compile-time.
#endif #endif
#ifdef MODEL_TS80 #ifdef MODEL_TS80
const uint16_t mass = 2020 / 50; const uint16_t mass = 2020 / 60;
#endif #endif
int32_t milliWattsNeeded = tempToMilliWatts(tempError.average(), int32_t milliWattsNeeded = tempToMilliWatts(tempError.average(),

1
workspace/TS100A/.cproject
View File

@@ -485,6 +485,7 @@
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope" versionNumber="2"> <storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="TS100"/> <configuration configurationName="TS100"/>
<configuration configurationName="TS100_LOCAL"/>
<configuration configurationName="Release"> <configuration configurationName="Release">
<resource resourceType="PROJECT" workspacePath="/TS100A"/> <resource resourceType="PROJECT" workspacePath="/TS100A"/>
</configuration> </configuration>

6
workspace/TS100A/.settings/language.settings.xml
View File

@@ -4,7 +4,7 @@
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider"> <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1636694427566673783" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-167355215276254258" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@@ -14,7 +14,7 @@
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider"> <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1636694427566673783" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-167355215276254258" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@@ -24,7 +24,7 @@
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider"> <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1636694427566673783" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-167355215276254258" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

1
workspace/TS100A/.settings/org.eclipse.core.resources.prefs
View File

@@ -1,2 +1,3 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
encoding//inc/Font.h=UTF-8
encoding//src/Translation.cpp=UTF-8 encoding//src/Translation.cpp=UTF-8