diff --git a/software/original/sources/SolderingStation2_u8glib_v1.8.ino b/software/original/sources/SolderingStation2_u8glib_v1.8.ino index 9689387..20d7c14 100644 --- a/software/original/sources/SolderingStation2_u8glib_v1.8.ino +++ b/software/original/sources/SolderingStation2_u8glib_v1.8.ino @@ -19,6 +19,7 @@ // - Tip change detection // - Can be used with either N or P channel mosfets // - Screen flip support +// - Rotary encoder reverse support // // Power supply should be in the range of 16V/2A to 24V/3A and well // stabilized. @@ -101,6 +102,7 @@ #define PID_ENABLE false // enable PID control #define BEEP_ENABLE true // enable/disable buzzer #define BODYFLIP false // enable/disable screen flip +#define ECREVERSE false // enable/disable rotary encoder reverse #define MAINSCREEN 0 // type of main screen (0: big numbers; 1: more infos) // EEPROM identifier @@ -134,6 +136,7 @@ uint8_t MainScrType = MAINSCREEN; bool PIDenable = PID_ENABLE; bool beepEnable = BEEP_ENABLE; bool BodyFlip = BODYFLIP; +bool ECReverse = ECREVERSE; // Default values for tips uint16_t CalTemp[TIPMAX][4] = {TEMP200, TEMP280, TEMP360, TEMPCHP}; @@ -144,7 +147,7 @@ uint8_t NumberOfTips = 1; // Menu items const char *SetupItems[] = { "Setup Menu", "Tip Settings", "Temp Settings", "Timer Settings", "Control Type", "Main Screen", - "Buzzer", "Screen Flip", "Information", "Return" }; + "Buzzer", "Screen Flip", "EC Reverse", "Information", "Return" }; const char *TipItems[] = { "Tip:", "Change Tip", "Calibrate Tip", "Rename Tip", "Delete Tip", "Add new Tip", "Return" }; const char *TempItems[] = { "Temp Settings", "Default Temp", "Sleep Temp", @@ -157,6 +160,7 @@ const char *StoreItems[] = { "Store Settings ?", "No", "Yes" }; const char *SureItems[] = { "Are you sure ?", "No", "Yes" }; const char *BuzzerItems[] = { "Buzzer", "Disable", "Enable" }; const char *FlipItems[] = { "Screen Flip", "Disable", "Enable" }; +const char *ECReverseItems[] = { "EC Reverse", "Disable", "Enable" }; const char *DefaultTempItems[] = { "Default Temp", "deg C" }; const char *SleepTempItems[] = { "Sleep Temp", "deg C" }; const char *BoostTempItems[] = { "Boost Temp", "deg C" }; @@ -430,7 +434,7 @@ void beep(){ void setRotary(int rmin, int rmax, int rstep, int rvalue) { countMin = rmin << ROTARY_TYPE; countMax = rmax << ROTARY_TYPE; - countStep = rstep; + countStep = ECReverse ? -rstep : rstep; count = rvalue << ROTARY_TYPE; } @@ -455,11 +459,12 @@ void getEEPROM() { PIDenable = EEPROM.read(11); beepEnable = EEPROM.read(12); BodyFlip = EEPROM.read(13); - CurrentTip = EEPROM.read(14); - NumberOfTips = EEPROM.read(15); + ECReverse = EEPROM.read(14); + CurrentTip = EEPROM.read(15); + NumberOfTips = EEPROM.read(16); uint8_t i, j; - uint16_t counter = 16; + uint16_t counter = 17; for (i = 0; i < NumberOfTips; i++) { for (j = 0; j < TIPNAMELENGTH; j++) { TipName[i][j] = EEPROM.read(counter++); @@ -491,11 +496,12 @@ void updateEEPROM() { EEPROM.update(11, PIDenable); EEPROM.update(12, beepEnable); EEPROM.update(13, BodyFlip); - EEPROM.update(14, CurrentTip); - EEPROM.update(15, NumberOfTips); + EEPROM.update(14, ECReverse); + EEPROM.update(15, CurrentTip); + EEPROM.update(16, NumberOfTips); uint8_t i, j; - uint16_t counter = 16; + uint16_t counter = 17; for (i = 0; i < NumberOfTips; i++) { for (j = 0; j < TIPNAMELENGTH; j++) EEPROM.update(counter++, TipName[i][j]); for (j = 0; j < 4; j++) { @@ -574,7 +580,8 @@ void SetupScreen() { case 4: MainScrType = MenuScreen(MainScreenItems, sizeof(MainScreenItems), MainScrType); break; case 5: beepEnable = MenuScreen(BuzzerItems, sizeof(BuzzerItems), beepEnable); break; case 6: BodyFlip = MenuScreen(FlipItems, sizeof(FlipItems), BodyFlip); SetFlip(); break; - case 7: InfoScreen(); break; + case 7: ECReverse = MenuScreen(ECReverseItems, sizeof(ECReverseItems), ECReverse); break; + case 8: InfoScreen(); break; default: repeat = false; break; } }