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

Long overdue additions

Browse Source 
Closes #329
Closes #324
Closes #331
Should Close #321
Should Close #301
This commit is contained in:
Ben V. Brown
2018-07-27 19:21:12 +10:00
parent e598d1cbbb
commit 3d1d47acee
5 changed files with 624 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workspace/TS100/build.sh
View File

@@ -35,3 +35,5 @@ make -j16 lang=LT
rm -rf Objects/src rm -rf Objects/src
make -j16 lang=UA make -j16 lang=UA
rm -rf Objects/src rm -rf Objects/src
make -j16 lang=SR
rm -rf Objects/src

1113
workspace/TS100/src/Translation.cpp
View File

File diff suppressed because it is too large Load Diff

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

@@ -191,14 +191,14 @@ const menuitem advancedMenu[] = {
settings_displayCalibrateVIN } }, /*Voltage input cal*/ settings_displayCalibrateVIN } }, /*Voltage input cal*/
#ifdef PIDSETTINGS #ifdef PIDSETTINGS
{ (const char*) SettingsDescriptions[17], { settings_setPIDP }, { { (const char*) SettingsDescriptions[17], {settings_setPIDP}, {
settings_displayPIDP } }, /*Voltage input cal*/ settings_displayPIDP}}, /*Voltage input cal*/
{ (const char*) SettingsDescriptions[18], { settings_setPIDI }, { { (const char*) SettingsDescriptions[18], {settings_setPIDI}, {
settings_displayPIDI } }, /*Voltage input cal*/ settings_displayPIDI}}, /*Voltage input cal*/
{ (const char*) SettingsDescriptions[19], { settings_setPIDD }, { { (const char*) SettingsDescriptions[19], {settings_setPIDD}, {
settings_displayPIDD } }, /*Voltage input cal*/ settings_displayPIDD}}, /*Voltage input cal*/
#endif #endif
{ NULL, { NULL }, { NULL } } // end of menu marker. DO NOT REMOVE { NULL, { NULL }, { NULL } } // end of menu marker. DO NOT REMOVE
}; };
static void printShortDescriptionSingleLine(uint32_t shortDescIndex) { static void printShortDescriptionSingleLine(uint32_t shortDescIndex) {
@@ -628,7 +628,7 @@ static void settings_setCalibrateVIN(void) {
case BUTTON_B_LONG: case BUTTON_B_LONG:
saveSettings(); saveSettings();
return; return;
break;
case BUTTON_NONE: case BUTTON_NONE:
default: default:
break; break;

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

@@ -63,12 +63,15 @@ uint16_t getTipRawTemp(uint8_t instant) {
static int64_t filterFP = 0; static int64_t filterFP = 0;
const uint8_t filterBeta = 5; //higher values smooth out more, but reduce responsiveness const uint8_t filterBeta = 5; //higher values smooth out more, but reduce responsiveness
if (instant) { if (instant == 1) {
uint16_t itemp = getTipInstantTemperature(); uint16_t itemp = getTipInstantTemperature();
filterFP = (filterFP << filterBeta) - filterFP; filterFP = (filterFP << filterBeta) - filterFP;
filterFP += (itemp << 9); filterFP += (itemp << 9);
filterFP = filterFP >> filterBeta; filterFP = filterFP >> filterBeta;
return itemp; return itemp;
} else if (instant == 2) {
filterFP = (getTipInstantTemperature() << 9);
return filterFP >> 9;
} else { } else {
return filterFP >> 9; return filterFP >> 9;
} }

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

@@ -581,14 +581,7 @@ static void gui_solderingMode() {
} }
static const char *HEADERS[] = { static const char *HEADERS[] = {
__DATE__, __DATE__, "Heap: ", "HWMG: ", "HWMP: ", "HWMM: ", "Time: ", "Move: ","Rtip: ","Ctip: ","Vin :" };
"Heap: ",
"HWMG: ",
"HWMP: ",
"HWMM: ",
"Time: ",
"Move: "
};
void showVersion(void) { void showVersion(void) {
uint8_t screen = 0; uint8_t screen = 0;
@@ -620,6 +613,15 @@ void showVersion(void) {
case 6: case 6:
lcd.printNumber(lastMovementTime / 100, 5); lcd.printNumber(lastMovementTime / 100, 5);
break; break;
case 7:
lcd.printNumber(getTipRawTemp(0),5);
break;
case 8:
lcd.printNumber(tipMeasurementToC(getTipRawTemp(0)),5);
break;
case 9:
printVoltage();
break;
default: default:
break; break;
} }
@@ -630,7 +632,7 @@ void showVersion(void) {
return; return;
else if (b == BUTTON_F_SHORT) { else if (b == BUTTON_F_SHORT) {
screen++; screen++;
screen = screen % 7; screen = screen % 10;
} }
GUIDelay(); GUIDelay();
} }
@@ -642,6 +644,7 @@ void startGUITask(void const *argument) {
uint8_t tempWarningState = 0; uint8_t tempWarningState = 0;
bool buttonLockout = false; bool buttonLockout = false;
bool tempOnDisplay = false; bool tempOnDisplay = false;
getTipRawTemp(2); //reset filter
lcd.setRotation(systemSettings.OrientationMode & 1); lcd.setRotation(systemSettings.OrientationMode & 1);
uint32_t ticks = xTaskGetTickCount(); uint32_t ticks = xTaskGetTickCount();
ticks += 400; //4 seconds from now ticks += 400; //4 seconds from now