1 files changed, 47 insertions, 43 deletions
diff --git a/main.h b/main.h
index 3429b15..92f369d 100755
--- a/main.h
+++ b/main.h
@@ -1,70 +1,74 @@
+#include "lcd.h"                           //Declaratons for LCD
+#include "i2c.h"
+#include "ds3231.h"                        //Declarations for RTC
+
 #ifdef ADC
-// Initialize variable for LDR
-unsigned int ldr = 0;
+#include "adc.h"                           //Declarations for ADC
 #endif
 
-// Initialize variables for VFD brightness level
+#include "beep.h"                          //Declarations for BEEP
+
+#ifdef DEBUG
+#include "uart.h"                          //Declarations for UART
+#include "term.h"                          //Declarations for Escape codes
+#endif
+
+#ifdef ADC
+// Declare variable for LDR
+unsigned int ldr;
+#endif
+
+// Declare variables for VFD brightness level
 #define brtlvl ldr/256
-unsigned int brtlvl_chg = 0;
+unsigned int brtlvl_chg;
 
 // Update to 1 if RB0 interrupt occurs, otherwise 0
-unsigned int update = 0;
-
-// Initialize variables for date time and alarms
-unsigned int sec = 0;
-unsigned int min = 37;
-unsigned int hour = 21;
-unsigned int day = 4;
-unsigned int date = 31;
-unsigned int month = 7;
-unsigned int year = 19;
-unsigned int century = 20;
+unsigned int update;
+
+// Boolean if setting time manually with user input
+unsigned int edit_datetime;
+
+// Declare variables for date time and alarms
+unsigned int sec;
+unsigned int min;
+unsigned int hour;
+unsigned int day;
+unsigned int date;
+unsigned int month;
+unsigned int year;
+unsigned int century;
 unsigned int alarm1_sec, alarm1_min, alarm1_hour;
 unsigned int alarm2_min, alarm2_hour;
 unsigned int status_reg, alarm1_status, alarm2_status;
 unsigned int control_reg;
 
-// Initialize variables for temperature
-unsigned int temperature_lsb = 0;
-int temperature_msb = 0;
-unsigned char temp_sign = ' ';
-
-// Initialize variable for week day
-char* weekday;
-
-// Initialize variable for detecting seconds change
-unsigned int sec_chg = 0;
-
-// Initialize variables for splitting decimal digits to characters
-unsigned char sec_0, sec_1;
-unsigned char min_0, min_1;
-unsigned char hour_0, hour_1;
-unsigned char day_0, day_1;
-unsigned char month_0, month_1;
-unsigned char year_0, year_1;
-unsigned char temp_0, temp_1, temp_2;
-unsigned char alarm1_sec_0, alarm1_sec_1, alarm1_min_0, alarm1_min_1,
-alarm1_hour_0, alarm1_hour_1;
-unsigned char alarm2_min_0, alarm2_min_1, alarm2_hour_0, alarm2_hour_1;
+// Declare variables for temperature
+unsigned int temperature_lsb;
+int temperature_msb;
+unsigned char temp_sign;
+
+// Declare variables for splitting decimal digit to character
+unsigned char temp_0;
+
+// Define MSB / LSB
+#define LSB(x) ((x % 10) + '0') // x >> 4
+#define MSB(x) ((x / 10) + '0') // x & 0x0F
 
 #ifdef DEBUG
 #include <stdio.h>                         // included for sprintf
-// Initialize a variable to use as a buffer for sprintf
+// Declare a variable to use as a buffer for sprintf
 char buf[40];
 #endif
 
+void display_Digit(unsigned int);
 void display_Intro(void);
 void display_Lcd_Layout(void);
 
-// Format unsigned int to unsigned chars
-void format_DateTimeChars(void);
+void edit_Date_Time(void);
 
 // Format msb and lsb for temperature display
 void format_Temperature(void);
 
-// Determine day of week from DS3231
-void getWeekDay(unsigned int);
-
 // Determine Alarm status from control registers
 void Get_Alarm_Status(void);