Tidy up ifdef blocks for VFD and ADC.

1 files changed, 14 insertions, 1 deletions

diff --git a/main.c b/main.c
index e749e43..76787e5 100755
--- a/main.c
+++ b/main.c
@@ -25,6 +25,15 @@ unsigned int date = 0;
 unsigned int month = 0;

 unsigned int year = 00;

 unsigned int century = 20;

+unsigned int alarm1_sec = 0;

+unsigned int alarm1_min = 0;

+unsigned int alarm1_hour = 0;

+unsigned int alarm2_min = 0;

+unsigned int alarm2_hour = 0;

+unsigned int status_reg = 0;

+unsigned int alarm1_status = 0;

+unsigned int alarm2_status = 0;

+unsigned int control_reg = 0;

 

 // Initialize variables for temperature

 unsigned int temperature_lsb = 0;

@@ -32,7 +41,9 @@ int temperature_msb = 0;
 unsigned char temp_sign = ' ';

 

 void main(void) {

+#ifdef ADC

     TRISA0 = 0x01; // RA is input (ADC)

+#endif

     TRISBbits.TRISB2 = 1;

     TRISBbits.TRISB4 = 1;

     TRISBbits.TRISB5 = 1;

@@ -84,7 +95,7 @@ void main(void) {
 #endif

 

 #ifdef VFD

-    Vfd_Set_Brightness(0); //Max brightness 3 - minimum

+    Vfd_Set_Brightness(0); // Maximum 0 - Minimum 3

 #endif

 

     display_Intro();

@@ -137,6 +148,7 @@ void main(void) {
         }

 

 #ifdef ADC

+  #ifdef VFD

         // Get current LDR reading and calculate for brightness levels 0 - 3

         ldr = Adc_Read(0);

 

@@ -144,6 +156,7 @@ void main(void) {
             Vfd_Set_Brightness(brtlvl);

             brtlvl_chg = brtlvl;

         }

+  #endif

 #endif

 

 #ifdef DEBUG