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

V1.10.2

Browse Source 
Closes #16
Fixes pressing a button to exit the settings prompts
This commit is contained in:
Ben V. Brown
2017-07-08 18:12:28 +10:00
parent 7b4f467eec
commit 0a7b6145af
3 changed files with 98 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workspace/ts100/inc/Modes.h
View File

@@ -29,7 +29,7 @@ enum {
TEMPCAL, //Cal tip temp offset TEMPCAL, //Cal tip temp offset
} operatingMode; } operatingMode;
#define SETTINGSOPTIONSCOUNT 9 /*Number of settings in the settings menu*/ #define SETTINGSOPTIONSCOUNT 9 /*Number of settings in the settings menu-1*/
enum { enum {
UVCO = 0, UVCO = 0,

162
workspace/ts100/src/Modes.c
View File

@@ -5,16 +5,16 @@
* Author: Ralim <ralim@ralimtek.com> * Author: Ralim <ralim@ralimtek.com>
*/ */
#include "Modes.h" #include "Modes.h"
const char *SettingsLongNames[] = { " Undervoltage Cutout (V)", const char *SettingsLongNames[] = { " Undervoltage Cutout <V>",
" Sleep Temperature (C)", " Sleep Timeout (Minutes)", " Sleep Temperature <C>", " Sleep Timeout <Minutes>",
" Shutdown Timeout (Minutes)", " Motion Detection", " Shutdown Timeout <Minutes>", " Motion Detection",
" Motion Sensitivity", " Temperature Unit", " Motion Sensitivity", " Temperature Unit",
" Temperature Rounding Amount", " Temperature Rounding Amount",
" Temperature Display Update Rate", " Temperature Display Update Rate",
" Flip Display for Left Hand" }; " Flip Display for Left Hand" };
const uint8_t SettingsLongNamesLengths[] = { 29, 27, 29, 32, 22, 24, 22, 33, 37, const uint8_t SettingsLongNamesLengths[] = { 29, 27, 29, 32, 22, 24, 22, 33, 37,
25 }; 25 };
uint8_t CalStatus = 0; uint8_t StatusFlags = 0;
//This does the required processing and state changes //This does the required processing and state changes
void ProcessUI() { void ProcessUI() {
uint8_t Buttons = getButtons(); //read the buttons status uint8_t Buttons = getButtons(); //read the buttons status
@@ -94,70 +94,75 @@ void ProcessUI() {
case SETTINGS: case SETTINGS:
//Settings is the mode with the most logic //Settings is the mode with the most logic
//Here we are in the menu so we need to increment through the sub menus / increase the value //Here we are in the menu so we need to increment through the sub menus / increase the value
if (StatusFlags == 4 && Buttons!=0) {
//The user pressed the button to breakout of the settings help prompt
StatusFlags=0;
} else {
if (Buttons & BUT_A) {
//A key iterates through the menu
if (settingsPage == SETTINGSOPTIONSCOUNT) {
//Roll off the end
settingsPage = 0; //reset
operatingMode = STARTUP; //reset back to the startup
saveSettings(); //Save the settings
} else {
++settingsPage; //move to the next option
}
} else if (Buttons & BUT_B) {
//B changes the value selected
switch (settingsPage) {
case UVCO:
//we are incrementing the cutout voltage
systemSettings.cutoutVoltage += 1; //Go up 1V at a jump
if (systemSettings.cutoutVoltage > 24)
systemSettings.cutoutVoltage = 10;
break;
case SLEEP_TEMP:
systemSettings.SleepTemp += 100; //Go up 10C at a time
if (systemSettings.SleepTemp > 3000)
systemSettings.SleepTemp = 1000;//cant sleep higher than 300
break;
case SLEEP_TIME:
++systemSettings.SleepTime; //Go up 1 minute at a time
if (systemSettings.SleepTime > 30)
systemSettings.SleepTime = 1;//cant set time over 30 mins
//Remember that ^ is the time of no movement
break;
case SHUTDOWN_TIME:
++systemSettings.ShutdownTime;
if (systemSettings.ShutdownTime > 60)
systemSettings.ShutdownTime = 0; //wrap to off
break;
case MOTIONDETECT:
systemSettings.movementEnabled =
!systemSettings.movementEnabled;
break;
case TEMPDISPLAY:
systemSettings.displayTempInF =
!systemSettings.displayTempInF;
break;
case LEFTY:
systemSettings.flipDisplay = !systemSettings.flipDisplay;
break;
case MOTIONSENSITIVITY:
systemSettings.sensitivity++;
systemSettings.sensitivity = systemSettings.sensitivity % 3;
if (Buttons & BUT_A) { break;
//A key iterates through the menu case TEMPROUNDING:
if (settingsPage == SETTINGSOPTIONSCOUNT) { systemSettings.temperatureRounding++;
//Roll off the end systemSettings.temperatureRounding =
settingsPage = 0; //reset systemSettings.temperatureRounding % 3;
operatingMode = STARTUP; //reset back to the startup break;
saveSettings(); //Save the settings case DISPUPDATERATE:
} else { systemSettings.displayUpdateSpeed++;
++settingsPage; //move to the next option systemSettings.displayUpdateSpeed =
} systemSettings.displayUpdateSpeed % 3;
} else if (Buttons & BUT_B) { break;
//B changes the value selected
switch (settingsPage) {
case UVCO:
//we are incrementing the cutout voltage
systemSettings.cutoutVoltage += 1; //Go up 1V at a jump
if (systemSettings.cutoutVoltage > 24)
systemSettings.cutoutVoltage = 10;
break;
case SLEEP_TEMP:
systemSettings.SleepTemp += 100; //Go up 10C at a time
if (systemSettings.SleepTemp > 3000)
systemSettings.SleepTemp = 1000;//cant sleep higher than 300
break;
case SLEEP_TIME:
++systemSettings.SleepTime; //Go up 1 minute at a time
if (systemSettings.SleepTime > 30)
systemSettings.SleepTime = 1; //cant set time over 30 mins
//Remember that ^ is the time of no movement
break;
case SHUTDOWN_TIME:
++systemSettings.ShutdownTime;
if (systemSettings.ShutdownTime > 60)
systemSettings.ShutdownTime = 0; //wrap to off
break;
case MOTIONDETECT:
systemSettings.movementEnabled =
!systemSettings.movementEnabled;
break;
case TEMPDISPLAY:
systemSettings.displayTempInF = !systemSettings.displayTempInF;
break;
case LEFTY:
systemSettings.flipDisplay = !systemSettings.flipDisplay;
break;
case MOTIONSENSITIVITY:
systemSettings.sensitivity++;
systemSettings.sensitivity = systemSettings.sensitivity % 3;
break; default:
case TEMPROUNDING: break;
systemSettings.temperatureRounding++; }
systemSettings.temperatureRounding =
systemSettings.temperatureRounding % 3;
break;
case DISPUPDATERATE:
systemSettings.displayUpdateSpeed++;
systemSettings.displayUpdateSpeed =
systemSettings.displayUpdateSpeed % 3;
break;
default:
break;
} }
} }
break; break;
@@ -217,10 +222,10 @@ void ProcessUI() {
if (Buttons == BUT_A) { if (Buttons == BUT_A) {
//Single button press, cycle over to the DC display //Single button press, cycle over to the DC display
CalStatus = 0; StatusFlags = 0;
operatingMode = DCINDISP; operatingMode = DCINDISP;
} else if (Buttons == BUT_B) { } else if (Buttons == BUT_B) {
CalStatus = 0; StatusFlags = 0;
operatingMode = TEMPCAL; operatingMode = TEMPCAL;
} else if (Buttons == (BUT_A | BUT_B)) { } else if (Buttons == (BUT_A | BUT_B)) {
//If the user is holding both button, exit the screen //If the user is holding both button, exit the screen
@@ -231,13 +236,13 @@ void ProcessUI() {
break; break;
case DCINDISP: { case DCINDISP: {
//This lets the user check the input voltage //This lets the user check the input voltage
if (CalStatus == 0) { if (StatusFlags == 0) {
if (Buttons == BUT_A) { if (Buttons == BUT_A) {
//Single button press, cycle over to the temp display //Single button press, cycle over to the temp display
operatingMode = THERMOMETER; operatingMode = THERMOMETER;
} else if (Buttons == BUT_B) { } else if (Buttons == BUT_B) {
//dc cal mode //dc cal mode
CalStatus = 1; StatusFlags = 1;
} else if (Buttons == (BUT_A | BUT_B)) { } else if (Buttons == (BUT_A | BUT_B)) {
//If the user is holding both button, exit the screen //If the user is holding both button, exit the screen
operatingMode = STARTUP; operatingMode = STARTUP;
@@ -255,7 +260,7 @@ void ProcessUI() {
else else
systemSettings.voltageDiv++; systemSettings.voltageDiv++;
} else if (Buttons == (BUT_A | BUT_B)) { } else if (Buttons == (BUT_A | BUT_B)) {
CalStatus = 0; StatusFlags = 0;
saveSettings(); saveSettings();
} }
if (systemSettings.voltageDiv < 120) if (systemSettings.voltageDiv < 120)
@@ -272,13 +277,13 @@ void ProcessUI() {
operatingMode = THERMOMETER; operatingMode = THERMOMETER;
} else if (Buttons == BUT_A) { } else if (Buttons == BUT_A) {
//Try and calibrate //Try and calibrate
if (CalStatus == 0) { if (StatusFlags == 0) {
if ((readTipTemp() < 300) && (readSensorTemp() < 300)) { if ((readTipTemp() < 300) && (readSensorTemp() < 300)) {
CalStatus = 1; StatusFlags = 1;
systemSettings.tempCalibration = readTipTemp(); systemSettings.tempCalibration = readTipTemp();
saveSettings(); saveSettings();
} else { } else {
CalStatus = 2; StatusFlags = 2;
} }
} }
} else if (Buttons == (BUT_A | BUT_B)) { } else if (Buttons == (BUT_A | BUT_B)) {
@@ -394,6 +399,7 @@ void DrawUI() {
case SETTINGS: case SETTINGS:
//We are prompting the user the setting name //We are prompting the user the setting name
if (millis() - getLastButtonPress() > 3000) { if (millis() - getLastButtonPress() > 3000) {
StatusFlags=4;
//If the user has idled for > 3 seconds, show the long name for the selected setting instead //If the user has idled for > 3 seconds, show the long name for the selected setting instead
//draw from settingsLongTestScrollPos through to end of screen //draw from settingsLongTestScrollPos through to end of screen
uint8_t lengthLeft = SettingsLongNamesLengths[settingsPage] uint8_t lengthLeft = SettingsLongNamesLengths[settingsPage]
@@ -543,7 +549,7 @@ void DrawUI() {
case DCINDISP: { case DCINDISP: {
uint16_t voltage = readDCVoltage(systemSettings.voltageDiv); //get X10 voltage uint16_t voltage = readDCVoltage(systemSettings.voltageDiv); //get X10 voltage
if (CalStatus == 0 || ((millis() % 1000) > 500)) { if (StatusFlags == 0 || ((millis() % 1000) > 500)) {
OLED_DrawString("IN", 2); OLED_DrawString("IN", 2);
OLED_DrawChar((voltage / 100) % 10, 2); OLED_DrawChar((voltage / 100) % 10, 2);
voltage -= (voltage / 100) * 100; voltage -= (voltage / 100) * 100;
@@ -560,11 +566,11 @@ void DrawUI() {
break; break;
case TEMPCAL: { case TEMPCAL: {
if (CalStatus == 0) { if (StatusFlags == 0) {
OLED_DrawString("CAL TEMP", 8); OLED_DrawString("CAL TEMP", 8);
} else if (CalStatus == 1) { } else if (StatusFlags == 1) {
OLED_DrawString("CAL OK ", 8); OLED_DrawString("CAL OK ", 8);
} else if (CalStatus == 2) { } else if (StatusFlags == 2) {
OLED_DrawString("CAL FAIL", 8); OLED_DrawString("CAL FAIL", 8);
} }
} }

16
workspace/ts100/ts100.xml
View File

@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8"?>
<targetDefinitions xmlns="http://openstm32.org/stm32TargetDefinitions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://openstm32.org/stm32TargetDefinitions stm32TargetDefinitions.xsd"> <!DOCTYPE targetDefinitions [
<!ELEMENT targetDefinitions (board)>
<!ELEMENT board (name, dbgIF+, dbgDEV, mcuId)>
<!ELEMENT name (#PCDATA)>
<!ELEMENT dbgIF (#PCDATA)>
<!ELEMENT dbgDEV (#PCDATA)>
<!ELEMENT mcuId (#PCDATA)>
<!ATTLIST board id CDATA #REQUIRED>
]>
<targetDefinitions>
<board id="ts100"> <board id="ts100">
<name>ts100</name> <name>ts100</name>
<mcuId>stm32f103t8ux</mcuId>
<dbgIF>SWD</dbgIF> <dbgIF>SWD</dbgIF>
<dbgDEV>ST-Link</dbgDEV> <dbgDEV>ST-Link</dbgDEV>
<mcuId>stm32f103t8ux</mcuId>
</board> </board>
</targetDefinitions> </targetDefinitions>