me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add detailed soldering screen

Browse Source 
This adds a detailed soldering screen to take a step towards #181
This commit is contained in:
Ben V. Brown
2018-03-03 16:20:01 +11:00
parent aef8f5f5bb
commit f14ea321a7
3 changed files with 91 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workspace/TS100/inc/Translation.h
View File

@@ -35,6 +35,7 @@ extern const char* SleepingTipAdvancedString;
extern const char* IdleTipString;
extern const char* IdleSetString;
extern const char* TipDisconnectedString;
extern const char* SolderingAdvancedPowerPrompt;
extern const char SettingTrueChar;
extern const char SettingFalseChar;

15
workspace/TS100/src/Translation.c
View File

@@ -86,6 +86,7 @@ const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars
const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'R';
const char SettingLeftChar = 'L';
@@ -149,6 +150,7 @@ cconst char* SleepingTipAdvancedString = "Tip:"; // <=6 chars
const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
/*
* #TODO change support for multibyte constants here
@@ -218,6 +220,7 @@ const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars
const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'R';
const char SettingLeftChar = 'L';
@@ -281,6 +284,7 @@ const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars
const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'R';
const char SettingLeftChar = 'L';
@@ -344,6 +348,7 @@ const char* SleepingTipAdvancedString = "Punta:"; // <=6 chars
const char* IdleTipString = "Pun:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Prev:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "PUNTA ASSENTE"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'D';
const char SettingLeftChar = 'S';
@@ -407,6 +412,7 @@ const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars
const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'D';
const char SettingLeftChar = 'G';
@@ -470,6 +476,7 @@ const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars
const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'R';
const char SettingLeftChar = 'L';
@@ -533,6 +540,7 @@ const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars
const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'R';
const char SettingLeftChar = 'L';
@@ -596,6 +604,7 @@ const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars
const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'R';
const char SettingLeftChar = 'L';
@@ -659,6 +668,7 @@ const char* SleepingTipAdvancedString = "Vrh: "; // <=6 chars
const char* IdleTipString = "Vrh: "; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " / "; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "VRH NIJE SPOJEN!"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'D';
const char SettingLeftChar = 'L';
@@ -722,6 +732,7 @@ const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars
const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'P';
const char SettingLeftChar = 'L';
@@ -785,6 +796,7 @@ const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars
const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'R';
const char SettingLeftChar = 'L';
@@ -848,6 +860,7 @@ const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars
const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'H';
const char SettingLeftChar = 'V';
@@ -911,6 +924,7 @@ const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars
const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'P';
const char SettingLeftChar = 'L';
@@ -975,6 +989,7 @@ const char* SleepingTipAdvancedString = "Ponta:"; // <=6 chars
const char* IdleTipString = "Ponta:"; // IdleTipString+IdleSetString <= 10
const char* IdleSetString = " Aj:"; // preferably start with a space; IdleTipString+IdleSetString <= 10
const char* TipDisconnectedString = "SEM PONTA"; // <=16 chars
const char* SolderingAdvancedPowerPrompt = "Power: ";
const char SettingRightChar = 'D';
const char SettingLeftChar = 'C';

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

@@ -312,7 +312,7 @@ static void gui_solderingTempAdjust() {
if (xTaskGetTickCount() - lastChange > 200)
return; // exit if user just doesn't press anything for a bit
lcd.drawChar('<');
lcd.drawChar('-');
lcd.drawChar(' ');
lcd.printNumber(systemSettings.SolderingTemp, 3);
if (systemSettings.temperatureInF)
@@ -320,7 +320,7 @@ static void gui_solderingTempAdjust() {
else
lcd.drawSymbol(1);
lcd.drawChar(' ');
lcd.drawChar('>');
lcd.drawChar('+');
lcd.refresh();
GUIDelay();
}
@@ -591,6 +591,34 @@ static void gui_solderingMode() {
currentlyActiveTemperatureTarget = 0;
waitForButtonPress();
return;
} else {
if (systemSettings.detailedSoldering) {
lcd.setFont(1);
lcd.print(SolderingAdvancedPowerPrompt); //Power:
lcd.printNumber(getTipPWM(), 3);
lcd.print("%");
lcd.setCursor(0, 8);
lcd.print(SleepingTipAdvancedString);
uint16_t Temp = getTipRawTemp(0);
if (systemSettings.temperatureInF)
Temp = tipMeasurementToF(Temp);
else
Temp = tipMeasurementToC(Temp);
lcd.printNumber(Temp, 3);
if (systemSettings.temperatureInF)
lcd.print("F");
else
lcd.print("C");
lcd.print(" ");
lcd.printNumber(
getInputVoltageX10(systemSettings.voltageDiv) / 10, 2);
lcd.drawChar('.');
lcd.printNumber(
getInputVoltageX10(systemSettings.voltageDiv) % 10, 1);
lcd.drawChar('V');
} else {
// We switch the layout direction depending on the orientation of the lcd.
if (lcd.getRotation()) {
@@ -644,7 +672,7 @@ static void gui_solderingMode() {
gui_drawBatteryIcon();
}
}
}
// Update the setpoints for the temperature
if (boostModeOn) {
if (systemSettings.temperatureInF)