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

Merge pull request #44 from phdlee/version1.11

Browse Source 
Added Custom LPF Control
This commit is contained in:
phdlee 2018-09-22 19:14:22 +09:00 committed by GitHub
commit 37fcc5975a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ubitx_20/ubitx_20.ino
View File

@ -6,7 +6,7 @@
// So I put + in the sense that it was improved one by one based on Original Firmware. // 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. // This firmware has been gradually changed based on the original firmware created by Farhan, Jack, Jerry and others.
#define FIRMWARE_VERSION_INFO F("+v1.100") #define FIRMWARE_VERSION_INFO F("+v1.110")
#define FIRMWARE_VERSION_NUM 0x04 //1st Complete Project : 1 (Version 1.061), 2st Project : 2, 1.08: 3, 1.09 : 4 #define FIRMWARE_VERSION_NUM 0x04 //1st Complete Project : 1 (Version 1.061), 2st Project : 2, 1.08: 3, 1.09 : 4
/** /**
@ -327,7 +327,7 @@ void setTXFilters(unsigned long freq){
#ifdef USE_CUSTOM_LPF_FILTER #ifdef USE_CUSTOM_LPF_FILTER
freq = freq / 1000000UL; freq = freq / 1000000UL;
for (byte i = 0; i < 7; i++) { for (byte i = 0; i < 7; i++) {
if (freq > CustFilters[i][0]) if (freq >= CustFilters[i][0])
{ {
char aIn = CustFilters[i][1]; char aIn = CustFilters[i][1];
digitalWrite(TX_LPF_A, aIn & 0x01); digitalWrite(TX_LPF_A, aIn & 0x01);
@ -336,7 +336,10 @@ void setTXFilters(unsigned long freq){
if (isCustomFilter_A7 == 1) if (isCustomFilter_A7 == 1)
{ {
digitalWrite(A7, aIn & 0x08); digitalWrite(10, aIn & 0x08);
digitalWrite(11, aIn & 0x10);
digitalWrite(12, aIn & 0x20);
digitalWrite(13, aIn & 0x40);
} }
return; return;
} }
@ -1211,6 +1214,16 @@ void initPorts(){
pinMode(ANALOG_KEYER, INPUT_PULLUP); pinMode(ANALOG_KEYER, INPUT_PULLUP);
pinMode(ANALOG_SMETER, INPUT); //by KD8CEC pinMode(ANALOG_SMETER, INPUT); //by KD8CEC
#ifdef USE_CUSTOM_LPF_FILTER
if (isCustomFilter_A7)
{
pinMode(10, OUTPUT);
pinMode(11, OUTPUT);
pinMode(12, OUTPUT);
pinMode(13, OUTPUT);
}
#endif
pinMode(CW_TONE, OUTPUT); pinMode(CW_TONE, OUTPUT);
digitalWrite(CW_TONE, 0); digitalWrite(CW_TONE, 0);

2
ubitx_20/ubitx_lcd_nextion.ino
View File

@ -1041,7 +1041,7 @@ void SendUbitxData(void)
EEPROM.get(EXTERNAL_DEVICE_OPT1, nextionDisplayOption); EEPROM.get(EXTERNAL_DEVICE_OPT1, nextionDisplayOption);
SendCommandUL(CMD_DISP_OPTION2, nextionDisplayOption); SendCommandUL(CMD_DISP_OPTION2, nextionDisplayOption);
SendCommandStr(CMD_VERSION, (char *)("+v1.100")); //Version SendCommandStr(CMD_VERSION, (char *)("+v1.110")); //Version
SendEEPromData(CMD_CALLSIGN, 0, userCallsignLength -1, 0); SendEEPromData(CMD_CALLSIGN, 0, userCallsignLength -1, 0);
/* /*