2.0.2015122801

Bug fixes involving OPTION_CLOCK_ALWAYS_HAVE_HOUR_LEADING_ZERO (Thanks, UA9OLB)
This commit is contained in:
Anthony Good 2015-12-28 21:21:55 -05:00
parent 181da074b6
commit 27e5031320
3 changed files with 15 additions and 10 deletions

View File

@ -429,10 +429,13 @@
2.0.2015122001 2.0.2015122001
Created OPTION_REVERSE_AZ_HH12_AS5045 and OPTION_REVERSE_EL_HH12_AS5045 Created OPTION_REVERSE_AZ_HH12_AS5045 and OPTION_REVERSE_EL_HH12_AS5045
2.0.2015122801
Bug fixes involving OPTION_CLOCK_ALWAYS_HAVE_HOUR_LEADING_ZERO (Thanks, UA9OLB)
*/ */
#define CODE_VERSION "2.0.2015122001" #define CODE_VERSION "2.0.2015122801"
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include <EEPROM.h> #include <EEPROM.h>
@ -3602,10 +3605,10 @@ void update_display(){
update_time(); update_time();
#ifdef OPTION_CLOCK_ALWAYS_HAVE_HOUR_LEADING_ZERO #ifdef OPTION_CLOCK_ALWAYS_HAVE_HOUR_LEADING_ZERO
if (clock_hours < 10) { if (clock_hours < 10) {
strcat(workstring, "0"); strcpy(workstring, "0");
} }
dtostrf(clock_hours, 0, 0, workstring2); dtostrf(clock_hours, 0, 0, workstring2);
strcat(workstring,workstring2); strcpy(workstring,workstring2);
#else #else
dtostrf(clock_hours, 0, 0, workstring2); dtostrf(clock_hours, 0, 0, workstring2);
strcpy(workstring,workstring2); strcpy(workstring,workstring2);
@ -3642,10 +3645,10 @@ void update_display(){
update_time(); update_time();
#ifdef OPTION_CLOCK_ALWAYS_HAVE_HOUR_LEADING_ZERO #ifdef OPTION_CLOCK_ALWAYS_HAVE_HOUR_LEADING_ZERO
if (clock_hours < 10) { if (clock_hours < 10) {
strcat(workstring, "0"); strcpy(workstring, "0");
} }
dtostrf(clock_hours, 0, 0, workstring2); dtostrf(clock_hours, 0, 0, workstring2);
strcat(workstring,workstring2); strcpy(workstring,workstring2);
#else #else
dtostrf(clock_hours, 0, 0, workstring2); dtostrf(clock_hours, 0, 0, workstring2);
strcpy(workstring,workstring2); strcpy(workstring,workstring2);
@ -3783,7 +3786,7 @@ void update_display(){
strcpy(workstring, "0"); strcpy(workstring, "0");
} }
dtostrf(clock_hours, 0, 0, workstring2); dtostrf(clock_hours, 0, 0, workstring2);
strcat(workstring,workstring2); strcpy(workstring,workstring2);
#else #else
dtostrf(clock_hours, 0, 0, workstring2); dtostrf(clock_hours, 0, 0, workstring2);
strcpy(workstring,workstring2); strcpy(workstring,workstring2);
@ -3818,10 +3821,10 @@ void update_display(){
update_time(); update_time();
#ifdef OPTION_CLOCK_ALWAYS_HAVE_HOUR_LEADING_ZERO #ifdef OPTION_CLOCK_ALWAYS_HAVE_HOUR_LEADING_ZERO
if (clock_hours < 10) { if (clock_hours < 10) {
strcat(workstring, "0"); strcpy(workstring, "0");
} }
dtostrf(clock_hours, 0, 0, workstring2); dtostrf(clock_hours, 0, 0, workstring2);
strcat(workstring,workstring2); strcpy(workstring,workstring2);
#else #else
dtostrf(clock_hours, 0, 0, workstring2); dtostrf(clock_hours, 0, 0, workstring2);
strcpy(workstring,workstring2); strcpy(workstring,workstring2);
@ -10695,6 +10698,8 @@ Not implemented yet:
} // switch } // switch
return(0);
} // process_backslash_command } // process_backslash_command
//----------------------------------------------------------------------- //-----------------------------------------------------------------------

View File

@ -62,7 +62,7 @@
// #define FEATURE_EL_POSITION_A2_ABSOLUTE_ENCODER // #define FEATURE_EL_POSITION_A2_ABSOLUTE_ENCODER
// All displays require k3ngdisplay.h and k3ngdisplay.cpp in the ino directory! // All displays require k3ngdisplay.h and k3ngdisplay.cpp in the ino directory!
//#define FEATURE_4_BIT_LCD_DISPLAY // Uncomment for classic 4 bit LCD display (most common) #define FEATURE_4_BIT_LCD_DISPLAY // Uncomment for classic 4 bit LCD display (most common)
//#define FEATURE_ADAFRUIT_I2C_LCD //#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 //#define FEATURE_ADAFRUIT_BUTTONS // Uncomment this to use Adafruit I2C LCD buttons for manual AZ/EL instead of normal buttons
//#define FEATURE_YOURDUINO_I2C_LCD //#define FEATURE_YOURDUINO_I2C_LCD

View File

@ -61,7 +61,7 @@
//#define FEATURE_EL_POSITION_A2_ABSOLUTE_ENCODER //#define FEATURE_EL_POSITION_A2_ABSOLUTE_ENCODER
// All displays require k3ngdisplay.h and k3ngdisplay.cpp in the ino directory! // All displays require k3ngdisplay.h and k3ngdisplay.cpp in the ino directory!
// #define FEATURE_4_BIT_LCD_DISPLAY // Uncomment for classic 4 bit LCD display (most common) #define FEATURE_4_BIT_LCD_DISPLAY // Uncomment for classic 4 bit LCD display (most common)
//#define FEATURE_ADAFRUIT_I2C_LCD //#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 //#define FEATURE_ADAFRUIT_BUTTONS // Uncomment this to use Adafruit I2C LCD buttons for manual AZ/EL instead of normal buttons
//#define FEATURE_YOURDUINO_I2C_LCD //#define FEATURE_YOURDUINO_I2C_LCD