diff --git a/k3ng_rotator_controller.ino b/k3ng_rotator_controller.ino index 3fb32cc..dab6d96 100644 --- a/k3ng_rotator_controller.ino +++ b/k3ng_rotator_controller.ino @@ -476,6 +476,10 @@ OPTION_DISPLAY_HEADING_AZ_ONLY with settings LCD_AZ_ONLY_HEADING_ROW, LCD_AZ_ONLY_HEADING_FIELD_SIZE OPTION_DISPLAY_HEADING_EL_ONLY with settings LCD_EL_ONLY_HEADING_ROW, LCD_EL_ONLY_HEADING_FIELD_SIZE + 2.0.2016032901 + Fixed issues with FEATURE_RFROBOT_I2C_DISPLAY compiling + Corrected notes in features files about customizing features in rotator_k3ngdisplay.h + All library files should be placed in directories likes \sketchbook\libraries\library1\ , \sketchbook\libraries\library2\ , etc. in order to compile in Arduino IDE 1.6.7 Anything rotator_*.* should be in the ino directory! @@ -984,7 +988,7 @@ byte current_az_speed_voltage = 0; DebugClass debug; -#if defined(FEATURE_4_BIT_LCD_DISPLAY) || defined(FEATURE_ADAFRUIT_I2C_LCD) || defined(FEATURE_YOURDUINO_I2C_LCD) || defined(FEATURE_YWROBOT_I2C_DISPLAY) || defined(FEATURE_SAINSMART_I2C_LCD) +#if defined(FEATURE_LCD_DISPLAY) K3NGdisplay k3ngdisplay(LCD_COLUMNS,LCD_ROWS,LCD_UPDATE_TIME); #endif @@ -10652,7 +10656,7 @@ byte process_backslash_command(byte input_buffer[], int input_buffer_index, byte } } - if ((input_buffer[2] == 'D') && ((input_buffer[3] == 'H') || (input_buffer[3] == 'L'))) { // \?DLxx - digital pin write low; xx = pin # \\DHxx - digital pin write high; xx = pin # + if ((input_buffer[2] == 'D') && ((input_buffer[3] == 'H') || (input_buffer[3] == 'L'))) { // \?DLxx - digital pin write low; xx = pin # \?DHxx - digital pin write high; xx = pin # if ((((input_buffer[4] > 47) && (input_buffer[4] < 58)) || (toupper(input_buffer[4]) == 'A')) && (input_buffer[5] > 47) && (input_buffer[5] < 58)) { byte pin_value = 0; if (toupper(input_buffer[4]) == 'A') { diff --git a/rotator_features.h b/rotator_features.h index 07596d2..c051178 100755 --- a/rotator_features.h +++ b/rotator_features.h @@ -60,9 +60,8 @@ // #define FEATURE_EL_POSITION_INCREMENTAL_ENCODER // #define FEATURE_EL_POSITION_MEMSIC_2125 // #define FEATURE_EL_POSITION_A2_ABSOLUTE_ENCODER - -// All displays require k3ngdisplay.h and k3ngdisplay.cpp in a directory in \sketchbook\libraries\ -// And if you are using an Adafruit, Yourduino, RFRobot, YWRobot, or SainSmart display, you must also change the feature setting in k3ngdisplay.h!!!! + +// If you are using an Adafruit, Yourduino, RFRobot, YWRobot, or SainSmart display, you must also change the feature setting in rotator_k3ngdisplay.h!!!! // #define FEATURE_4_BIT_LCD_DISPLAY // Uncomment for classic 4 bit LCD display (most common) // #define FEATURE_ADAFRUIT_I2C_LCD // #define FEATURE_ADAFRUIT_BUTTONS // Uncomment this to use Adafruit I2C LCD buttons for manual AZ/EL instead of normal buttons (also set this feature in rotator_k3ngdisplay.h) diff --git a/rotator_features_ea4tx_ars_usb.h b/rotator_features_ea4tx_ars_usb.h index 7e9e47c..ed6126f 100644 --- a/rotator_features_ea4tx_ars_usb.h +++ b/rotator_features_ea4tx_ars_usb.h @@ -18,7 +18,6 @@ #define FEATURE_EL_POSITION_POTENTIOMETER -// LCD display requires k3ngdisplay.h and k3ngdisplay.cpp in a directory in \sketchbook\libraries\ #define FEATURE_4_BIT_LCD_DISPLAY //Uncomment for classic 4 bit LCD display (most common) diff --git a/rotator_features_m0upu.h b/rotator_features_m0upu.h index e1ca340..123aecb 100755 --- a/rotator_features_m0upu.h +++ b/rotator_features_m0upu.h @@ -59,8 +59,7 @@ //#define FEATURE_EL_POSITION_INCREMENTAL_ENCODER //#define FEATURE_EL_POSITION_MEMSIC_2125 -// All displays require k3ngdisplay.h and k3ngdisplay.cpp in a directory in \sketchbook\libraries\ -// And if you are using an Adafruit, Yourduino, RFRobot, YWRobot, or SainSmart display, you must also change the feature setting in k3ngdisplay.h!!!! +// If you are using an Adafruit, Yourduino, RFRobot, YWRobot, or SainSmart display, you must also change the feature setting in rotator_k3ngdisplay.h!!!! // #define FEATURE_4_BIT_LCD_DISPLAY // Uncomment for classic 4 bit LCD display (most common) // #define FEATURE_ADAFRUIT_I2C_LCD // #define FEATURE_ADAFRUIT_BUTTONS // Uncomment this to use Adafruit I2C LCD buttons for manual AZ/EL instead of normal buttons (also set this feature in rotator_k3ngdisplay.h) diff --git a/rotator_features_test.h b/rotator_features_test.h index 6aff6f0..a8549ef 100755 --- a/rotator_features_test.h +++ b/rotator_features_test.h @@ -66,10 +66,8 @@ // #define FEATURE_EL_POSITION_MEMSIC_2125 // #define FEATURE_EL_POSITION_A2_ABSOLUTE_ENCODER - -// All displays require k3ngdisplay.h and k3ngdisplay.cpp in a directory in \sketchbook\libraries\ -// And if you are using an Adafruit, Yourduino, RFRobot, YWRobot, or SainSmart display, you must also change the feature setting in k3ngdisplay.h!!!! -#define FEATURE_4_BIT_LCD_DISPLAY // Uncomment for classic 4 bit LCD display (most common) +// And if you are using an Adafruit, Yourduino, RFRobot, YWRobot, or SainSmart display, you must also change the feature setting in rotator_k3ngdisplay.h!!!! +// #define FEATURE_4_BIT_LCD_DISPLAY // Uncomment for classic 4 bit LCD display (most common) // #define FEATURE_ADAFRUIT_I2C_LCD // #define FEATURE_ADAFRUIT_BUTTONS // Uncomment this to use Adafruit I2C LCD buttons for manual AZ/EL instead of normal buttons (also set this feature in rotator_k3ngdisplay.h) // #define FEATURE_YOURDUINO_I2C_LCD diff --git a/rotator_features_wb6kcn.h b/rotator_features_wb6kcn.h index 5570169..4392017 100755 --- a/rotator_features_wb6kcn.h +++ b/rotator_features_wb6kcn.h @@ -60,8 +60,7 @@ #define FEATURE_EL_POSITION_INCREMENTAL_ENCODER //#define FEATURE_EL_POSITION_MEMSIC_2125 -// All displays require k3ngdisplay.h and k3ngdisplay.cpp in a directory in \sketchbook\libraries\ -// And if you are using an Adafruit, Yourduino, RFRobot, YWRobot, or SainSmart display, you must also change the feature setting in k3ngdisplay.h!!!! +// If you are using an Adafruit, Yourduino, RFRobot, YWRobot, or SainSmart display, you must also change the feature setting in rotator_k3ngdisplay.h!!!! // #define FEATURE_4_BIT_LCD_DISPLAY // Uncomment for classic 4 bit LCD display (most common) // #define FEATURE_ADAFRUIT_I2C_LCD // #define FEATURE_ADAFRUIT_BUTTONS // Uncomment this to use Adafruit I2C LCD buttons for manual AZ/EL instead of normal buttons (also set this feature in rotator_k3ngdisplay.h) diff --git a/rotator_k3ngdisplay.cpp b/rotator_k3ngdisplay.cpp index 9c6aac2..f3b1ffa 100644 --- a/rotator_k3ngdisplay.cpp +++ b/rotator_k3ngdisplay.cpp @@ -1,7 +1,7 @@ #ifndef K3NG_DISPLAY_H #define K3NG_DISPLAY_H -// K3NG_DISPLAY_LIBRARY_VERSION "1.0.2016030501" +// K3NG_DISPLAY_LIBRARY_VERSION "1.0.2016032901" #if defined(ARDUINO) && ARDUINO >= 100 @@ -47,6 +47,7 @@ #if defined(FEATURE_RFROBOT_I2C_DISPLAY) LiquidCrystal_I2C lcd(0x27,16,2); + // LiquidCrystal_I2C lcd(0x27, 2, 1, 0, 4, 5, 6, 7, 3, POSITIVE); #endif //FEATURE_RFROBOT_I2C_DISPLAY diff --git a/rotator_k3ngdisplay.h b/rotator_k3ngdisplay.h index 75e9d2d..511392a 100644 --- a/rotator_k3ngdisplay.h +++ b/rotator_k3ngdisplay.h @@ -65,7 +65,7 @@ #include "rotator.h" #endif -#define K3NG_DISPLAY_LIBRARY_VERSION "1.0.2016030501" +#define K3NG_DISPLAY_LIBRARY_VERSION "1.0.2016032901" #define MAX_SCREEN_BUFFER_COLUMNS 20 #define MAX_SCREEN_BUFFER_ROWS 4 @@ -76,6 +76,7 @@ #define I2C_LCD_COLOR WHITE // default color of I2C LCD display, including Adafruit and Yourduino; some Yourduino units may want this as LED_ON // #define I2C_LCD_COLOR GREEN +// #define I2C_LCD_COLOR LED_ON class K3NGdisplay {