From fe44c703c5f8bb12f8f88d262888a2e3bb4cab8d Mon Sep 17 00:00:00 2001 From: phdlee Date: Tue, 19 Jun 2018 11:17:58 +0900 Subject: [PATCH] define eeprom map for external device and send eeprom data to nextion lcd --- ubitx_20/ubitx_20.ino | 2 +- ubitx_20/ubitx_eemap.h | 3 ++- ubitx_20/ubitx_lcd_nextion.ino | 9 ++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ubitx_20/ubitx_20.ino b/ubitx_20/ubitx_20.ino index 670f3d8..5d31c8d 100644 --- a/ubitx_20/ubitx_20.ino +++ b/ubitx_20/ubitx_20.ino @@ -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.093") +#define FIRMWARE_VERSION_INFO F("+v1.094") #define FIRMWARE_VERSION_NUM 0x04 //1st Complete Project : 1 (Version 1.061), 2st Project : 2, 1.08: 3, 1.09 : 4 /** diff --git a/ubitx_20/ubitx_eemap.h b/ubitx_20/ubitx_eemap.h index e799187..0e15e2b 100644 --- a/ubitx_20/ubitx_eemap.h +++ b/ubitx_20/ubitx_eemap.h @@ -112,7 +112,8 @@ #define CHANNEL_FREQ 630 //Channel 1 ~ 20, 1 Channel = 4 bytes #define CHANNEL_DESC 710 //Channel 1 ~ 20, 1 Channel = 4 bytes -#define RESERVE3 770 //Reserve3 between Channel and Firmware id check +#define EXTERNAL_DEVICE_OPT1 770 //for External Deivce 4byte +#define EXTERNAL_DEVICE_OPT2 774 //for External Deivce 2byte //Check Firmware type and version #define FIRMWAR_ID_ADDR 776 //776 : 0x59, 777 :0x58, 778 : 0x68 : Id Number, if not found id, erase eeprom(32~1023) for prevent system error. diff --git a/ubitx_20/ubitx_lcd_nextion.ino b/ubitx_20/ubitx_lcd_nextion.ino index d78247d..5aa46ac 100644 --- a/ubitx_20/ubitx_lcd_nextion.ino +++ b/ubitx_20/ubitx_lcd_nextion.ino @@ -969,14 +969,17 @@ void SendUbitxData(void) SendCommandL(CMD_AR_TUNE3, arTuneStep[2]); SendCommandL(CMD_AR_TUNE4, arTuneStep[3]); SendCommandL(CMD_AR_TUNE5, arTuneStep[4]); - + SendCommandL(CMD_IS_CW_SHIFT_DISPLAY, isShiftDisplayCWFreq); SendCommandL(CMD_CW_SHIFT_ADJUST, shiftDisplayAdjustVal); SendCommandL(CMD_COMM_OPTION, commonOption0); SendCommandL(CMD_DISP_OPTION1, displayOption1); - SendCommandL(CMD_DISP_OPTION2, displayOption2); - SendCommandStr(CMD_VERSION, "+v1.093"); //Version + unsigned long nextionDisplayOption; + EEPROM.get(EXTERNAL_DEVICE_OPT1, nextionDisplayOption); + SendCommandUL(CMD_DISP_OPTION2, nextionDisplayOption); + + SendCommandStr(CMD_VERSION, "+v1.094"); //Version SendEEPromData(CMD_CALLSIGN, 0, userCallsignLength -1, 0); /*