diff ds1307.h @ 19:b5e4591b6570

- Satisfy new compiler - Put strings in PROGMEM - Add various time functions
author Daniel O'Connor <darius@dons.net.au>
date Sat, 31 Jan 2015 23:27:10 +1030
parents 119688bb743f
children
line wrap: on
line diff
--- a/ds1307.h	Sat Jan 31 23:26:21 2015 +1030
+++ b/ds1307.h	Sat Jan 31 23:27:10 2015 +1030
@@ -42,9 +42,6 @@
     uint8_t	hour;
     uint8_t	min;
     uint8_t	sec;
-
-    uint8_t	ctrl;
-    uint8_t	ram[56];
 } ds1307_t;
 
 typedef union {
@@ -85,10 +82,16 @@
 	uint8_t	out	: 1;	// Output control enable
     } split;
 } ds1307raw_t;
-	
+
+typedef int32_t time_t;
+
 int	ds1307_init(void);
 int8_t	iic_read(uint8_t *data, uint8_t len, uint8_t adr, uint8_t sla);
 int8_t	iic_write(uint8_t *data, uint8_t len, uint8_t adr, uint8_t sla);
 int8_t	ds1307_gettod(ds1307raw_t *time);
 int8_t	ds1307_settod(char *date);
-void	ds1307_printtime(char *leader, char *trailer);
+void	ds1307_printtime(ds1307_t *time, const char *leader, const char *trailer);
+void	ds1307_printnow(const char *leader, const char *trailer);
+void	ds1307_cook(ds1307raw_t *raw, ds1307_t *cooked);
+time_t	ds1307_totimet(ds1307_t *time);
+time_t	ds1307_time(void);