Major refactor of RTC-related code

firmware/rtc.c

@@ -1,59 +1,126 @@
 #include <avr/interrupt.h>
 #include <avr/io.h>
+#include <stdlib.h>
 #include "rtc.h"
 #include "i2c.h"
 
-volatile struct TIME_HMS clock;
+#define DEC_2_BCD(dec) ((((dec) / 10) << 4) | ((dec) % 10))
+#define BCD_2_DEC(bcd) (((((bcd) >> 4) & 0x0F) * 10) + ((bcd) & 0x0F))
+
+static volatile struct RTC_DATA clock;
+static void (*rtc_handler)(struct RTC_DATA* clock);
+
+void rtc_read_datetime(struct RTC_DATA* data);
 
 void rtc_int0_init(void)
 {
+  MCUCR |= (1<<ISC01);
   INT0_DIR &= ~(1<<INT0_PIN);
-  INT0_PORT |= (1<<INT0_PIN);
-  GICR |= (1<<INT0);
+  INT0_PORT |= (1<<INT0_PIN);  
 }
 
-void rtc_int1_init(void)
+void rtc_bind_handler(void (*handler)(struct RTC_DATA* clock))
 {
-  INT1_DIR &= ~(1<<INT1_PIN);
-  INT1_PORT |= (1<<INT1_PIN);
-  GICR |= (1<<INT1);
+  rtc_handler = handler;
 }
 
-void rtc_set_clock_part(uint8_t part, uint8_t value) 
+void rtc_set_time(struct TIME_HMS* time)
 {  
-  uint8_t bcd = DEC_2_BCD(value);
-  i2c_writebuf(RTC_I2C_ADDR, part, 1, &bcd);
+  clock.buffer[0] = DEC_2_BCD(time->second);
+  clock.buffer[1] = DEC_2_BCD(time->minute);
+  clock.buffer[2] = DEC_2_BCD(time->hour);
+  i2c_writebuf(RTC_I2C_ADDR, 0x02, 3, &clock.buffer);
 }
 
-void rtc_set_clock(struct TIME_HMS* time)
-{  
-  uint8_t buf[] = { DEC_2_BCD(time->second), DEC_2_BCD(time->minute), DEC_2_BCD(time->hour) };
-  i2c_writebuf(RTC_I2C_ADDR, SECOND, 3, buf); // SECOND is the first memory cell (0x02)
-}
-
-void rtc_update_clock(void) 
+void rtc_set_date(struct DATE_YMD* date)
 {
-  uint8_t buffer[3];
-  i2c_readbuf(RTC_I2C_ADDR, 0x02, 3, buffer);
-
-  clock.hour = BCD_2_DEC(buffer[2]);
-  clock.minute = BCD_2_DEC(buffer[1]);
-  clock.second = BCD_2_DEC(buffer[0]);
+  clock.buffer[3] = ((date->year & 0x03) << 6) | DEC_2_BCD(date->day);
+  clock.buffer[4] = DEC_2_BCD(date->month);  
+  i2c_writebuf(RTC_I2C_ADDR, 0x05, 2, &clock.buffer[3]);
+  i2c_writebuf(RTC_I2C_ADDR, 0x10, 2, (uint8_t*) &date->year);
 }
 
-uint8_t rtc_handle_clock(void)
-{
-  if(!(GIFR & (1<<INTF0)))
+void rtc_inc_time(uint8_t part)
+{   
+  switch(part)
   {
-    rtc_update_clock();
-    GIFR |= 1<<INTF0;
-    return 1;
+    case SECOND:
+      clock.buffer[0] = clock.time.second + 1;
+      if(clock.buffer[0] >= 60) clock.buffer[0] = 0;
+    break;
+    case MINUTE:
+      clock.buffer[0] = clock.time.minute + 1;
+      if(clock.buffer[0] >= 60) clock.buffer[0] = 0;
+    break;
+    case HOUR:
+      clock.buffer[0] = clock.time.hour + 1;
+      if(clock.buffer[0] >= 24) clock.buffer[0] = 0;
+    break;    
   }
 
-  return 0;
+  clock.buffer[0] = DEC_2_BCD(clock.buffer[0]);
+
+  i2c_writebuf(RTC_I2C_ADDR, part, 1, &clock.buffer);
+  rtc_invoke_handler();
 }
 
-ISR(INT0_vect)
+void rtc_invoke_handler(void)
 {
+  if(rtc_handler)
+  {
+    rtc_read_datetime(&clock);
+    rtc_handler(&clock);
+  }   
+}
 
+void rtc_handle_event(void)
+{
+  if(GIFR & (1<<INTF0))
+  {
+    rtc_invoke_handler();
+    GIFR |= 1<<INTF0;
+  }
+}
+
+void rtc_read_datetime(struct RTC_DATA* data)
+{
+  i2c_readbuf(RTC_I2C_ADDR, 0x02, 5, data->buffer);
+  i2c_readbuf(RTC_I2C_ADDR, 0x10, 2, (uint8_t*) &(data->date.year));
+  
+  char* curr_char = data->time_str;
+  for(uint8_t i=0; i<3; ++i)
+  {        
+    // data->time_str
+    *(curr_char++) = ((data->buffer[2-i] & (!i ? 0x3F : 0x7F)) >> 4) + '0'; // Tens
+    *(curr_char++) = (data->buffer[2-i] & 0x0F) + '0'; // Ones    
+    *(curr_char++) = i==2 ? 0 : ':'; // Separator
+
+    // data->time structure
+    *((uint8_t*)(&data->time)+i) = BCD_2_DEC(data->buffer[2-i]);
+  }
+
+  // data->date structure
+  data->date.day = BCD_2_DEC(data->buffer[3] & 0x3F);
+  
+  // data->date.year
+  uint8_t year = data->buffer[3] >> 6;
+  if((data->date.year & 0x03) != year)
+  {
+    while((data->date.year & 0x03) != year) ++(data->date.year);
+    i2c_writebuf(RTC_I2C_ADDR, 0x10, 2, (uint8_t*) &(data->date.year));
+  }
+  
+  data->date.month = BCD_2_DEC(data->buffer[4] & 0x1F);
+  data->date.weekday = data->buffer[4] >> 5;  
+
+  // data->date_str
+  curr_char = data->date_str;    
+  *(curr_char++) = ((data->buffer[3] & 0x3F) >> 4) + '0';
+  *(curr_char++) = (data->buffer[3] & 0x0F) + '0';
+  *(curr_char++) = DATE_SEPARATOR;
+  *(curr_char++) = ((data->buffer[4] & 0x1F) >> 4) + '0';
+  *(curr_char++) = (data->buffer[4] & 0x0F) + '0';
+  *(curr_char++) = DATE_SEPARATOR;
+  itoa(data->date.year, curr_char, 10);
+  *(curr_char+4) = 0;
 }