Merge pull request #35 from phdlee/version1.080

Version1.080
This commit is contained in:
phdlee 2018-05-23 15:09:43 +09:00 committed by GitHub
commit 27092d23e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions

View File

@ -6,7 +6,7 @@
// So I put + in the sense that it was improved one by one based on Original Firmware.
// This firmware has been gradually changed based on the original firmware created by Farhan, Jack, Jerry and others.
#define FIRMWARE_VERSION_INFO F("+v1.075")
#define FIRMWARE_VERSION_INFO F("+v1.080")
#define FIRMWARE_VERSION_NUM 0x03 //1st Complete Project : 1 (Version 1.061), 2st Project : 2
/**

View File

@ -271,8 +271,10 @@ void menuCHMemory(int btn, byte isMemoryToVfo){
if (isMemoryToVfo == 1)
{
if (resultFreq > 3000 && resultFreq < 60000000)
setFrequency(resultFreq);
byteToMode(loadMode, 1);
{
byteToMode(loadMode, 1);
setFrequency(resultFreq);
}
}
else
{

View File

@ -199,7 +199,7 @@ int getBtnStatus(void){
readButtonValue = readButtonValue / 4;
//return FKEY_VFOCHANGE;
for (int i = 0; i < 16; i++)
if (KeyValues[i][0] <= readButtonValue && KeyValues[i][1] >= readButtonValue)
if (KeyValues[i][2] != 0 && KeyValues[i][0] <= readButtonValue && KeyValues[i][1] >= readButtonValue)
return KeyValues[i][2];
//return i;
}