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

Update Settings reset to always zero,

Browse Source 
Update GUI for temp setting to round to 10 increments.
This commit is contained in:
Ben V. Brown
2018-04-11 09:58:35 +10:00
parent a062317e7a
commit 79477685bd
4 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
workspace/TS100/..cproject.swp Normal file
View File

Binary file not shown.

66
workspace/TS100/.vscode/c_cpp_properties.json vendored Normal file
View File

@@ -0,0 +1,66 @@
{
"configurations": [
{
"name": "Mac",
"includePath": [
"/usr/include",
"/usr/local/include",
"${workspaceFolder}"
],
"defines": ["STM32F103T8Ux","STM32F1","STM32","USE_HAL_DRIVER","STM32F103xB","USE_RTOS_SYSTICK"],
"intelliSenseMode": "clang-x64",
"browse": {
"path": [
"/usr/include",
"/usr/local/include",
"${workspaceFolder}"
],
"limitSymbolsToIncludedHeaders": true,
"databaseFilename": ""
},
"macFrameworkPath": [
"/System/Library/Frameworks",
"/Library/Frameworks"
]
},
{
"name": "STM32",
"includePath": [
"${workspaceFolder}",
"/usr/include/c++/5",
"/usr/include/x86_64-linux-gnu/c++/5",
"/usr/include/c++/5/backward",
"/usr/lib/llvm-5.0/lib/clang/5.0.0/include",
"/usr/local/include",
"/usr/include/x86_64-linux-gnu",
"/usr/include",
"${workspaceFolder}/inc",
"${workspaceFolder}/HAL_Driver/Inc",
"${workspaceFolder}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS",
"${workspaceFolder}/CMSIS/device",
"${workspaceFolder}/Middlewares/Third_Party/FreeRTOS/Source/include",
"${workspaceFolder}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3"
],
"defines": [],
"intelliSenseMode": "clang-x64",
"browse": {
"path": [
"${workspaceFolder}",
"/usr/include/c++/5",
"/usr/include/x86_64-linux-gnu/c++/5",
"/usr/include/c++/5/backward",
"/usr/lib/llvm-5.0/lib/clang/5.0.0/include",
"/usr/local/include",
"/usr/include/x86_64-linux-gnu",
"/usr/include"
],
"limitSymbolsToIncludedHeaders": true,
"databaseFilename": ""
},
"compilerPath": "/usr/bin/clang++-5.0",
"cStandard": "c11",
"cppStandard": "c++17"
}
],
"version": 3
}

2
workspace/TS100/src/Settings.cpp
View File

@@ -71,7 +71,7 @@ uint8_t lookupVoltageLevel(uint8_t level) {
return (level * 33) + (33 * 2); return (level * 33) + (33 * 2);
} }
void resetSettings() { void resetSettings() {
memset((void*)&systemSettings,0,sizeof(systemSettingsType));
systemSettings.SleepTemp = 150; //Temperature the iron sleeps at - default 150.0 C systemSettings.SleepTemp = 150; //Temperature the iron sleeps at - default 150.0 C
systemSettings.SleepTime = 6; //How many seconds/minutes we wait until going to sleep - default 1 min systemSettings.SleepTime = 6; //How many seconds/minutes we wait until going to sleep - default 1 min
systemSettings.SolderingTemp = 320; //Default soldering temp is 320.0 C systemSettings.SolderingTemp = 320; //Default soldering temp is 320.0 C

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

@@ -362,6 +362,14 @@ static void settings_setTempF(void) {
systemSettings.SleepTemp = ((systemSettings.SleepTemp - 32) * 5) / 9; systemSettings.SleepTemp = ((systemSettings.SleepTemp - 32) * 5) / 9;
} }
// Rescale both to be multiples of 10
systemSettings.BoostTemp = systemSettings.BoostTemp/10;
systemSettings.BoostTemp *=10;
systemSettings.SolderingTemp = systemSettings.SolderingTemp/10;
systemSettings.SolderingTemp *=10;
systemSettings.SleepTemp = systemSettings.SleepTemp/10;
systemSettings.SleepTemp *=10;
} }
static void settings_displayTempF(void) { static void settings_displayTempF(void) {