cancel action in menu

cancel action in menu

brew.h

@@ -94,17 +94,18 @@ void backToStatus();
 
 // #################################################### Set Variables ##################################################################
 
-int getTimer( int initialValue, int defaultValue );
+boolean checkForEncoderSwitchPush( bool cancelable );
 
 int getTimer( int initialValue );
+int getTimer( int initialValue, int defaultValue );
 
-int getTemperature(int initialValue);
-
-int xSetGenericValue(int initialValue, int minimumValue, int maximumValue, const char *valueName, const char *unit);
+int getTemperature( int initialValue );
+int getTemperature( int initialValue, int defaultValue );
 
-int xSetTemperature( int initialValue );
+int getFinalYield( int initialValue );
+int getFinalYield( int initialValue, int defaultValue );
 
-int xSetFinalYield( int initialValue );
+int xSetGenericValue( int initialValue, int defaultValue, int minimumValue, int maximumValue, const char *valueName, const char *unit );
 
 unsigned long getInactivityTime();
 
@@ -112,6 +113,4 @@ unsigned long getInactivityTime();
 
 void xWaitForAction(String title, String message);
 
-boolean gotButtonPress(int iPin);
-
 #endif //__BREW

config.h

@@ -12,6 +12,7 @@
 #define SETTING_CLEANING_TEMPERATURE			  45 //45
 #define SETTING_MACHINE_YIELD_CAPACITY_MIN  0
 #define SETTING_MACHINE_YIELD_CAPACITY_MAX  50
+#define SETTING_MACHINE_YIELD_DEFAULT       25
 
 // ++++++++++++++++++++++++ Heating Element Relay ++++++++++++++++++++++++
 #define HEATING_ELEMENT_DEFAULT_WINDOW_SIZE       1000
@@ -26,33 +27,13 @@
 #define TEMPERATURE_MAX_VALUE                     120
 #define PT100_BASE_INPUT_PIN                      A4
 #define PT100_BASE_OUTPUT_PIN                     32
-//#define PT100_BASE_INPUT_R_PIN                    A7
-//#define PT100_BASE_OUTPUT_R_PIN                   7
 #define PT100_BASE_TIME_BETWEEN_READINGS          1
 #define PT100_UP_INPUT_PIN                        A5
 #define PT100_UP_OUTPUT_PIN                       30
-//#define PT100_UP_INPUT_R_PIN                      A8
-//#define PT100_UP_OUTPUT_R_PIN                     9
 #define PT100_UP_TIME_BETWEEN_READINGS            1
 #define PT100_DOWN_INPUT_PIN                      A6
 #define PT100_DOWN_OUTPUT_PIN                     31
-//#define PT100_DOWN_INPUT_R_PIN                    A9
-//#define PT100_DOWN_OUTPUT_R_PIN                   8
 #define PT100_DOWN_TIME_BETWEEN_READINGS          1
-/*
-#define PT100_BASE_DEFAULT_ADC_VMAX               1.1
-#define PT100_BASE_DEFAULT_VS                     5.0
-#define PT100_BASE_DEFAULT_R1_RESISTENCE          605.2
-#define PT100_BASE_DEFAULT_R2_RESISTENCE          605.2
-#define PT100_UP_DEFAULT_ADC_VMAX                 1.1
-#define PT100_UP_DEFAULT_VS                       5.0
-#define PT100_UP_DEFAULT_R1_RESISTENCE            630.0 //620.0
-#define PT100_UP_DEFAULT_R2_RESISTENCE            610.0
-#define PT100_DOWN_DEFAULT_ADC_VMAX               1.1
-#define PT100_DOWN_DEFAULT_VS                     5.0
-#define PT100_DOWN_DEFAULT_R1_RESISTENCE          616.0
-#define PT100_DOWN_DEFAULT_R2_RESISTENCE          611.0
-*/
 
 // ++++++++++++++++++++++++ Mixer ++++++++++++++++++++++++
 //#define MIXER_PIN     12
@@ -71,6 +52,7 @@
 #define PUMP_SPEED_FAST                           192
 #define PUMP_SPEED_MAX_MOSFET                     0
 #define PUMP_SPEED_MAX                            255
+#define PUMP_SPEED_DEFAULT                        0
 
 // ++++++++++++++++++++++++ Rotary Encoder ++++++++++++++++++++++++
 #define ROTARY_ENCODER_INTERRUPT_NUMBER           1    // On Mega2560 boards, interrupt 1 is on pin 3
@@ -83,11 +65,15 @@
 // ++++++++++++++++++++++++ State Machine ++++++++++++++++++++++++
 #define SETTING_WELCOME_TIMEOUT                   100
 #define SETTING_MAX_INACTIVITY_TIME               3000
+#define SETTING_CANCEL_TIMER                      2000
+#define MENU_INIT                                 eMenuType_Main
 #define MENU_SIZE_MAIN_MENU                       13
 #define MENU_SIZE_PROFILES_MENU                   9
 #define MENU_SIZE_STAGE_MENU                      13
 #define MENU_SIZE_MALT_MENU                    	  4
 #define MENU_SIZE_SETTINGS_MENU                   6
+#define SETTING_COOKING_STAGE_INIT                eCookingStage_Startpoint
+#define SETTING_BEER_PROFILE_INIT                 eBeerProfile_Basic
 
 // ++++++++++++++++++++++++ Menus ++++++++++++++++++++++++
 #define MENU_MAIN_TITLE                           "Brewery Menu"