From 913f1d078166c48b93701ddc5eeb05004a54f1e6 Mon Sep 17 00:00:00 2001 From: Rob French Date: Tue, 28 Apr 2020 21:56:47 -0500 Subject: [PATCH] Misc small changes. --- ubitx_20/ubitx_keyer.ino | 6 ++++-- ubitx_20/ubitx_lcd_nextion.ino | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ubitx_20/ubitx_keyer.ino b/ubitx_20/ubitx_keyer.ino index e3477fb..c38d2e3 100644 --- a/ubitx_20/ubitx_keyer.ino +++ b/ubitx_20/ubitx_keyer.ino @@ -98,7 +98,9 @@ unsigned char keyerState = IDLE; char update_PaddleLatch(byte isUpdateKeyState) { unsigned char tmpKeyerControl = 0; int paddle = analogRead(ANALOG_KEYER); -/* KC4UPR: temporarily disabling keyer while doing ubitx_iop development. + + return 0; // KC4UPR: temporarily disabling keyer while doing ubitx_iop development. + if (paddle >= cwAdcDashFrom && paddle <= cwAdcDashTo) tmpKeyerControl |= DAH_L; else if (paddle >= cwAdcDotFrom && paddle <= cwAdcDotTo) @@ -120,7 +122,7 @@ char update_PaddleLatch(byte isUpdateKeyState) { return tmpKeyerControl; } -*/ + /***************************************************************************** // New logic, by RON // modified by KD8CEC diff --git a/ubitx_20/ubitx_lcd_nextion.ino b/ubitx_20/ubitx_lcd_nextion.ino index 4c0a91a..62667af 100644 --- a/ubitx_20/ubitx_lcd_nextion.ino +++ b/ubitx_20/ubitx_lcd_nextion.ino @@ -1041,7 +1041,7 @@ void SendUbitxData(void) EEPROM.get(EXTERNAL_DEVICE_OPT1, nextionDisplayOption); SendCommandUL(CMD_DISP_OPTION2, nextionDisplayOption); - SendCommandStr(CMD_VERSION, (char *)("+v1.122")); //Version + SendCommandStr(CMD_VERSION, (char *)("+v1.200")); //Version SendEEPromData(CMD_CALLSIGN, 0, userCallsignLength -1, 0); /*