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

test of extended key and dual lcd

Browse Source
This commit is contained in:
phdlee 2018-04-23 08:29:19 +09:00
parent 0aafe32e27
commit 5b13ede65b
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ubitx_20/ubitx.h
View File

@ -21,16 +21,16 @@
//==============================================================================
//Depending on the type of LCD mounted on the uBITX, uncomment one of the options below.
//You must select only one.
//#define UBITX_DISPLAY_LCD1602P //LCD mounted on unmodified uBITX
#define UBITX_DISPLAY_LCD1602P //LCD mounted on unmodified uBITX
//#define UBITX_DISPLAY_LCD1602I //I2C type 16 x 02 LCD
#define UBITX_DISPLAY_LCD1602I_DUAL
//#define UBITX_DISPLAY_LCD1602I_DUAL
//#define UBITX_DISPLAY_LCD2004P //24 x 04 LCD (Parallel)
//#define UBITX_DISPLAY_LCD2004I //I2C type 24 x 04 LCD
#define I2C_LCD_MASTER_ADDRESS_DEFAULT 0x3F //0x27 //DEFAULT, if Set I2C Address by uBITX Manager, read from EEProm
#define I2C_LCD_SECOND_ADDRESS_DEFAULT 0x27 //0x27 //only using Dual LCD Mode
//#define EXTEND_KEY_GROUP1 //MODE, BAND(-), BAND(+), STEP
#define EXTEND_KEY_GROUP1 //MODE, BAND(-), BAND(+), STEP
//#define EXTEND_KEY_GROUP2 //Numeric (0~9), Point(.), Enter //Not supported in Version 1.0x
#define ENABLE_FACTORYALIGN
@ -41,7 +41,7 @@ extern byte I2C_LCD_SECOND_ADDRESS; //only using Dual LCD Mode
#define SMeterLatency 3 //1 is 0.25 sec
#ifdef defined(UBITX_DISPLAY_LCD1602I)
#ifdef UBITX_DISPLAY_LCD1602I
#define USE_I2C_LCD
#elif defined(UBITX_DISPLAY_LCD1602I_DUAL)
#define USE_I2C_LCD
@ -122,7 +122,7 @@ extern byte I2C_LCD_SECOND_ADDRESS; //only using Dual LCD Mode
extern unsigned long frequency;
extern byte WsprMSGCount;
extern byte sMeterLevels[9];
extern int KeyValues[16][2]; //ADC value Ranges for Extend Key
extern byte KeyValues[16][2]; //ADC value Ranges for Extend Key
extern void printLine1(const char *c);
extern void printLine2(const char *c);

2
ubitx_20/ubitx_20.ino
View File

@ -186,7 +186,7 @@ byte I2C_LCD_MASTER_ADDRESS; //0x27 //if Set I2C Address by uBITX Manage
byte I2C_LCD_SECOND_ADDRESS; //only using Dual LCD Mode
int KeyValues[16][2];
byte KeyValues[16][2];
/*= {
{1023, 1025}, //1
{707, 711}, //5

3
ubitx_20/ubitx_lcd_1602Dual.ino
View File

@ -721,7 +721,8 @@ void idle_process()
newSMeter = analogRead(ANALOG_SMETER);
//Faster attack, Slower release
currentSMeter = (newSMeter > currentSMeter ? ((currentSMeter * 3 + newSMeter * 7) + 5) / 10 : ((currentSMeter * 7 + newSMeter * 3) + 5) / 10);
//currentSMeter = (newSMeter > currentSMeter ? ((currentSMeter * 3 + newSMeter * 7) + 5) / 10 : ((currentSMeter * 7 + newSMeter * 3) + 5) / 10);
currentSMeter = (currentSMeter * 3 + newSMeter * 7) / 10; //remarked becaused of have already Latency time
scaledSMeter = 0;
for (byte s = 8; s >= 1; s--) {

2
ubitx_20/ubitx_ui.ino
View File

@ -184,6 +184,8 @@ int getBtnStatus(void){
return FKEY_PRESS;
else
{
readButtonValue = readButtonValue / 4;
for (int i = 0; i < 16; i++)
if (KeyValues[i][0] <= readButtonValue && KeyValues[i][1] >= readButtonValue)
return i;