Rename day/date for clarity

Nixie_Firmware_Mbed/ds3231.cpp

@@ -43,8 +43,8 @@ void DS3231_SetTime(int Second, int Minute, int Hour) {
 void DS3231_SetDate(int Day, int Date, int Month, int Year, int Century) {
     DS3231_REGS regs = {0};
 
-    regs.Day.Value = DecimalToBCD(Day);
-    regs.Date.Value = DecimalToBCD(Date);
+    regs.DayOfWeek.Value = DecimalToBCD(Day);
+    regs.Day.Value = DecimalToBCD(Date);
     regs.Month.Value = DecimalToBCD(Month);
     regs.Month.Century = DecimalToBCD(Century);
     regs.Year.Value = DecimalToBCD(Year);
@@ -73,26 +73,26 @@ void DS3231_GetDate(int *Day, int *Date, int *Month, int *Year) {
         regs.AS_BYTE + FIELD_OFFSET(DS3231_REGS, Day),
         FIELD_SIZE_THROUGH(DS3231_REGS, Day, Year));
 
-    *Day = BCDToDecimal(regs.Day.Value);
-    *Date = BCDToDecimal(regs.Date.Value);
+    *Day = BCDToDecimal(regs.DayOfWeek.Value);
+    *Date = BCDToDecimal(regs.Day.Value);
     *Month = BCDToDecimal(regs.Month.Value);
     *Year = BCDToDecimal(regs.Year.Value);
 }
 
-bool IsDst(int Day, int Date, int Month, int Hour_24) {
+bool IsDst(int DayOfWeek, int Day, int Month, int Hour_24) {
     // December through Feburary are always outside DST
     if (Month < 3 || Month > 11) return false;
     // April through October are always in DST
     if (Month > 3 && Month < 11) return true;
 
-    int prevSunday = Date - Day;
+    int prevSunday = Day - DayOfWeek;
     // In March, in DST if previous sunday is between 8th and 14th
     if (Month == 3) {
         if (prevSunday < 8) return false;
         if (prevSunday > 14) return true;
-        return (Date == prevSunday) ? Hour_24 >= 2 : true;
+        return (Day == prevSunday) ? Hour_24 >= 2 : true;
     } 
     // In November, in DST if before the first Sunday           
     if (prevSunday <= 0) return true;
-    return (prevSunday == Date && Date <= 7) ? (Hour_24 < 2) : false;
+    return (prevSunday == Day && Day <= 7) ? (Hour_24 < 2) : false;
 }

Nixie_Firmware_Mbed/ds3231.h

@@ -149,8 +149,8 @@ typedef union {
         T_SECOND Second;            // 0x00
         T_MINUTE Minute;            // 0x01
         T_HOUR Hour;                // 0x02
-        T_DAY Day;                  // 0x03
-        T_DATE Date;                // 0x04
+        T_DAY DayOfWeek;            // 0x03
+        T_DATE Day;                 // 0x04
         T_MONTH Month;              // 0x05
         T_YEAR Year;                // 0x06
         A_SECOND A1_Second;         // 0x07
@@ -181,9 +181,9 @@ enum {
 
 void DS3231_Init(void (*Callback)());
 void DS3231_SetTime(int Second, int Minute, int Hour);
-void DS3231_SetDate(int Day, int Date, int Month, int Year, int Century);
+void DS3231_SetDate(int DayOfWeek, int Day, int Month, int Year, int Century);
 void DS3231_GetTime(int *Second, int *Minute, int *Hour);
-void DS3231_GetDate(int *Day, int *Date, int *Month, int *Year);
-bool IsDst(int Day, int Date, int Month, int Hour_24);
+void DS3231_GetDate(int *DayOfWeek, int *Day, int *Month, int *Year);
+bool IsDst(int DayOfWeek, int Day, int Month, int Hour_24);
 
 #endif