diff options
Diffstat (limited to 'main.c')
| -rwxr-xr-x | main.c | 90 |
1 files changed, 36 insertions, 54 deletions
@@ -1,6 +1,6 @@ #include "conf.h" //Configuration settings
#include "main.h" //Declarations for main
-#include "lcd.h" //Declaratons for LCD
+#include "display.h"
#include "i2c.h"
#include "ds3231.h" //Declarations for RTC
@@ -74,7 +74,7 @@ void main(void) { //Set_Time();
//Set_Date();
//Set_DayOfWeek(Get_DayOfWeek(year, month, date));
- Set_Sqwe(0x40); //1Hz
+ //Set_Sqwe(0x40); //1Hz
// Write default alarm values
@@ -100,39 +100,30 @@ void main(void) { if (update) {
update_Display();
}
- }
-
-#ifdef ADC
- // Get current LDR reading and calculate for brightness levels 0 - 3
- ldr = Adc_Read(0);
-
- if (brtlvl_chg != brtlvl) {
- Vfd_Set_Brightness(brtlvl);
- brtlvl_chg = brtlvl;
- }
-#endif
#ifdef DEBUG
- UART_send_string(CURSOR(19, 1));
- sprintf(buf, "%sTIME:%s\t%02d:%02d:%02d\t%sDATE:%s\t%02d/%02d/%02d\r\n", YELLOW, CLRATTR,
- hour, min, sec, YELLOW, CLRATTR, date, month, year);
- UART_send_string(buf);
- sprintf(buf, "%sAL1:%s\t%02d:%02d:%02d\t%sSTATUS:%s %d\r\n", YELLOW,
- CLRATTR, alarm1_hour, alarm1_min, alarm1_sec, YELLOW,
- CLRATTR, alarm1_status);
- UART_send_string(buf);
- sprintf(buf, "%sAL2:%s\t%02d:%02d\t\t%sSTATUS:%s %d\r\n", YELLOW,
- CLRATTR, alarm2_hour, alarm2_min, YELLOW, CLRATTR,
- alarm2_status);
- UART_send_string(buf);
- sprintf(buf, "%sWKDAY:%s\t%d\t\t%sDAY:%s\t%s\r\n", YELLOW, CLRATTR,
- day, YELLOW, CLRATTR, weekday);
- UART_send_string(buf);
- sprintf(buf, "%sTEMP:\t%s%c%c%c.%c%cC%s\t\t%sLDR:%s\t\%04d %d\r\n",
- YELLOW, CLRATTR, temp_sign, temp_2, temp_1, temp_0, 0xB0,
- CLRATTR, YELLOW, CLRATTR, ldr, brtlvl);
- UART_send_string(buf);
+ UART_send_string(CURSOR(19, 1));
+ sprintf(buf, "%sTIME:%s\t%02d:%02d:%02d\t%sDATE:%s\t%02d/%02d/%02d\r\n", YELLOW, CLRATTR,
+ hour, min, sec, YELLOW, CLRATTR, date, month, year);
+ UART_send_string(buf);
+ sprintf(buf, "%sAL1:%s\t%02d:%02d:%02d\t%sSTATUS:%s %d\r\n", YELLOW,
+ CLRATTR, alarm1_hour, alarm1_min, alarm1_sec, YELLOW,
+ CLRATTR, alarm1_status);
+ UART_send_string(buf);
+ sprintf(buf, "%sAL2:%s\t%02d:%02d\t\t%sSTATUS:%s %d\r\n", YELLOW,
+ CLRATTR, alarm2_hour, alarm2_min, YELLOW, CLRATTR,
+ alarm2_status);
+ UART_send_string(buf);
+ sprintf(buf, "%sWKDAY:%s\t%d\t\t%sDAY:%s\t%s\r\n", YELLOW, CLRATTR,
+ day, YELLOW, CLRATTR, weekday);
+ UART_send_string(buf);
+ sprintf(buf, "%sTEMP:\t%s%c%c%c.%c%cC%s\t\t%sLDR:%s\t\%04d %d\r\n",
+ YELLOW, CLRATTR, temp_sign, temp_2, temp_1, temp_0, 0xB0,
+ CLRATTR, YELLOW, CLRATTR, ldr, brtlvl);
+ UART_send_string(buf);
#endif
+
+ }
}
// Format unsigned int to unsigned chars
@@ -236,29 +227,10 @@ void Get_Alarm_Status() { alarm2_status = (control_reg >> 1) & 0x01; // Read alarm2 INT enable bit A2IE
}
-void display_Intro() {
- // Give an intro message on the LCD
- Lcd_Clear();
- Lcd_Set_Cursor(1, 1);
- Lcd_Write_String("RTC/LCD with PIC");
- Lcd_Set_Cursor(2, 1);
- Lcd_Write_String(" Circuit Digest");
- __delay_ms(1000); //display for 1sec
-}
+void display_Intro();
+void display_Lcd_Layout();
-void display_Lcd_Layout() {
- // Setup time date display format
- Lcd_Clear();
- Lcd_Set_Cursor(1, 1);
- Lcd_Write_String("HH:mm:ss -PP.P");
- Lcd_Write_Char(0xDF);
- Lcd_Write_Char('C');
- Lcd_Set_Cursor(2, 1);
- Lcd_Write_String("ddd, DD/MM/YY ");
- __delay_ms(1000);
-}
-
-void update_Display() {
+void update_Display(void) {
// Display Hours
Lcd_Set_Cursor(1, 1);
Lcd_Write_Char(hour_1);
@@ -308,6 +280,16 @@ void update_Display() { if (min == 30 && sec == 00) {
alarm(1);
}
+
+#ifdef ADC
+ // Get current LDR reading and calculate for brightness levels 0 - 3
+ ldr = Adc_Read(0);
+
+ if (brtlvl_chg != brtlvl) {
+ Vfd_Set_Brightness(brtlvl);
+ brtlvl_chg = brtlvl;
+ }
+#endif
}
void __interrupt() isr(void) {
|