scrape/ubitx-upr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ifshift store, cw mode shift change

Browse Source
This commit is contained in:
phdlee 2018-03-20 21:41:24 +09:00
parent d7858e35c3
commit 31a7f79569
2 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ubitx_20/ubitx_20.ino
View File

@ -181,6 +181,12 @@ int count = 0; //to generally count ticks, loops, etc
//(7:Enable / Disable //0: enable, 1:disable, (default is applied shift) //(7:Enable / Disable //0: enable, 1:disable, (default is applied shift)
//6 : 0 : Adjust Pulus, 1 : Adjust Minus //6 : 0 : Adjust Pulus, 1 : Adjust Minus
//0~5: Adjust Value : * 10 = Adjust Value (0~300) //0~5: Adjust Value : * 10 = Adjust Value (0~300)
#define COMMON_OPTION0 360 //0: Confirm : CW Frequency Shift
//1 : IF Shift Save
//
//
//
#define IF_SHIFTVALUE 363
#define DISPLAY_OPTION1 361 //Display Option1 #define DISPLAY_OPTION1 361 //Display Option1
#define DISPLAY_OPTION2 362 //Display Option2 #define DISPLAY_OPTION2 362 //Display Option2
@ -273,6 +279,7 @@ byte isTxType = 0; //000000[0 - isSplit] [0 - isTXStop]
long arTuneStep[5]; long arTuneStep[5];
byte tuneStepIndex; //default Value 0, start Offset is 0 because of check new user byte tuneStepIndex; //default Value 0, start Offset is 0 because of check new user
byte commonOption0 = 0;
byte displayOption1 = 0; byte displayOption1 = 0;
byte displayOption2 = 0; byte displayOption2 = 0;
@ -331,7 +338,7 @@ byte line2DisplayStatus = 0; //0:Clear, 1 : menu, 1: DisplayFrom Idle,
char lcdMeter[17]; char lcdMeter[17];
byte isIFShift = 0; //1 = ifShift, 2 extend byte isIFShift = 0; //1 = ifShift, 2 extend
long ifShiftValue = 0; // int ifShiftValue = 0; //
/** /**
* Below are the basic functions that control the uBitx. Understanding the functions before * Below are the basic functions that control the uBitx. Understanding the functions before
@ -896,6 +903,7 @@ void initSettings(){
} }
EEPROM.get(COMMON_OPTION0, commonOption0);
EEPROM.get(DISPLAY_OPTION1, displayOption1); EEPROM.get(DISPLAY_OPTION1, displayOption1);
EEPROM.get(DISPLAY_OPTION2, displayOption2); EEPROM.get(DISPLAY_OPTION2, displayOption2);
@ -983,18 +991,29 @@ void initSettings(){
//Display Type for CW mode //Display Type for CW mode
isShiftDisplayCWFreq = EEPROM.read(CW_DISPLAY_SHIFT); isShiftDisplayCWFreq = EEPROM.read(CW_DISPLAY_SHIFT);
//Adjust CW Mode Freq //Enable / Diable Check for CW Display Cofiguration Group
shiftDisplayAdjustVal = (isShiftDisplayCWFreq & 0x3F) * 10; if ((commonOption0 & 0x80) != 0x00)
{
//Adjust CW Mode Freq
shiftDisplayAdjustVal = (isShiftDisplayCWFreq & 0x3F) * 10;
//check Minus //check Minus
if ((isShiftDisplayCWFreq & 0x40) == 0x40) if ((isShiftDisplayCWFreq & 0x40) == 0x40)
shiftDisplayAdjustVal = shiftDisplayAdjustVal * -1; shiftDisplayAdjustVal = shiftDisplayAdjustVal * -1;
//Shift Display Check (Default : 0) //Shift Display Check (Default : 0)
if ((isShiftDisplayCWFreq & 0x80) == 0) //Enabled if ((isShiftDisplayCWFreq & 0x80) == 0) //Enabled
isShiftDisplayCWFreq = 1; isShiftDisplayCWFreq = 1;
else //Disabled else //Disabled
isShiftDisplayCWFreq = 0; isShiftDisplayCWFreq = 0;
}
//Stored IF Shift Option
if ((commonOption0 & 0x40) != 0x00)
{
EEPROM.get(IF_SHIFTVALUE, ifShiftValue);
isIFShift = ifShiftValue != 0;
}
//default Value (for original hardware) //default Value (for original hardware)
if (cwAdcSTFrom >= cwAdcSTTo) if (cwAdcSTFrom >= cwAdcSTTo)
@ -1120,7 +1139,7 @@ void setup()
//Serial.begin(9600); //Serial.begin(9600);
lcd.begin(16, 2); lcd.begin(16, 2);
//printLineF(1, F("CECBT v1.05")); //printLineF(1, F("CECBT v1.05"));
printLineF(1, F("CE v1.059W")); printLineF(1, F("CE v1.06"));
Init_Cat(38400, SERIAL_8N1); Init_Cat(38400, SERIAL_8N1);
initMeter(); //not used in this build initMeter(); //not used in this build

8
ubitx_20/ubitx_menu.ino
View File

@ -209,7 +209,7 @@ void menuIFSSetup(int btn){
knob = enc_read(); knob = enc_read();
if (knob != 0){ if (knob != 0){
if (knob < 0) if (knob < 0)
ifShiftValue -= 50l; ifShiftValue -= 50;
else if (knob > 0) else if (knob > 0)
ifShiftValue += 50; ifShiftValue += 50;
@ -222,6 +222,7 @@ void menuIFSSetup(int btn){
if (btnDown() || ifShiftValue == 0) if (btnDown() || ifShiftValue == 0)
{ {
isIFShift = 0; isIFShift = 0;
ifShiftValue = 0;
//printLineF2(F("IF Shift is OFF")); //printLineF2(F("IF Shift is OFF"));
//printLineF2(F("OFF")); //printLineF2(F("OFF"));
//clearLine2(); //clearLine2();
@ -230,8 +231,9 @@ void menuIFSSetup(int btn){
//delay_background(1500, 0); //delay_background(1500, 0);
} }
//menuOn = 0; //Store IF Shiift
//printLine2ClearAndUpdate(); EEPROM.put(IF_SHIFTVALUE, ifShiftValue);
menuClearExit(0); menuClearExit(0);
} }
} }