/*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
* (C) Copyright 2001
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0
*/
/*
* RTC, Date & Time support: get and set date & time
*/
-#include <common.h>
-#include <string.h>
-#include <command.h>
-#include <rtc.h>
-#include <i2c.h>
-
-
-static const FLASH char * const FLASH weekdays[] = {
- FSTR("Mon"),
- FSTR("Tues"),
- FSTR("Wednes"),
- FSTR("Thurs"),
- FSTR("Fri"),
- FSTR("Satur"),
- FSTR("Sun")
-};
-
-int mk_date (const char *, struct rtc_time *);
-
-command_ret_t do_date(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
- struct rtc_time tm;
- int rcode = CMD_RET_SUCCESS;
+#include "cmd_date.h"
+#include "time.h"
+#include "rtc.h"
- (void) cmdtp; (void) flag;
-
- switch (argc) {
- case 2: /* set date & time */
- /* initialize tm with current time */
- rcode = rtc_get (&tm);
-
- if(!rcode) {
- /* insert new date & time */
- if (mk_date (argv[1], &tm) != 0) {
- my_puts_P(PSTR("## Bad date format\n"));
- break;
- }
- /* and write to RTC */
- rcode = rtc_set (&tm);
- if(rcode)
- my_puts_P(PSTR("## Set date failed\n"));
- } else {
- my_puts_P(PSTR("## Get date failed\n"));
- }
- /* FALL TROUGH */
- case 1: /* get date & time */
- rcode = rtc_get (&tm);
-
- if (rcode) {
- my_puts_P(PSTR("## Get date failed\n"));
- break;
- }
- printf_P(PSTR("Date: %4d-%02d-%02d ("),
- tm.tm_year, tm.tm_mon, tm.tm_mday);
- my_puts_P( (tm.tm_wday<0 || tm.tm_wday>6) ?
- PSTR("unknown ") : weekdays[tm.tm_wday]);
- printf_P(PSTR("day) Time: %2d:%02d:%02d\n"),
- tm.tm_hour, tm.tm_min, tm.tm_sec);
- break;
-
- default:
- rcode = CMD_RET_USAGE;
- }
-
- return rcode;
-}
/*
* simple conversion of two-digit string with error checking
* Some basic checking for valid values is done, but this will not catch
* all possible error conditions.
*/
-int mk_date (const char *datestr, struct rtc_time *tmp)
+int mk_date (const char *datestr, struct tm *tmp)
{
int len, val;
char *ptr;
tmp->tm_sec = 0;
}
- if (len == 12) { /* MMDDhhmmCCYY */
+ if (len == 12) { /* MMDDhhmmCCYY */
int year, century;
if (cnvrt2 (datestr+ 8, ¢ury) ||
cnvrt2 (datestr+10, &year) ) {
return (-1);
}
- tmp->tm_year = 100 * century + year;
+ tmp->tm_year = 100 * century + year - 1900;
} else if (len == 10) { /* MMDDhhmmYY */
int year, century;
- century = tmp->tm_year / 100;
+ century = (tmp->tm_year + 1900) / 100;
if (cnvrt2 (datestr+ 8, &year))
return (-1);
- tmp->tm_year = 100 * century + year;
+ tmp->tm_year = 100 * century + year -1900;
}
switch (len) {
- case 8: /* MMDDhhmm */
+ case 8: /* MMDDhhmm */
/* fall thru */
- case 10: /* MMDDhhmmYY */
+ case 10: /* MMDDhhmmYY */
/* fall thru */
- case 12: /* MMDDhhmmCCYY */
+ case 12: /* MMDDhhmmCCYY */
if (cnvrt2 (datestr+0, &val) ||
val > 12) {
break;
}
- tmp->tm_mon = val;
+ tmp->tm_mon = val - 1;
if (cnvrt2 (datestr+2, &val) ||
- val > ((tmp->tm_mon==2) ? 29 : 31)) {
+ val > ((tmp->tm_mon==2-1) ? 29 : 31)) {
break;
}
tmp->tm_mday = val;
}
tmp->tm_min = val;
- /* calculate day of week */
- GregorianDay (tmp);
-
return (0);
default:
break;
return (-1);
}
+
+command_ret_t do_date(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
+{
+ struct tm t;
+ char buf[30];
+ int rc;
+ command_ret_t rcode = CMD_RET_FAILURE;
+
+ switch (argc) {
+ case 2: /* set date & time */
+ /* initialize t with current time */
+ if(rtc_get(&t) < 0) {
+ my_puts_P(PSTR("## Get date failed\n"));
+ break;
+ } else {
+ /* insert new date & time */
+ if (mk_date (argv[1], &t) != 0) {
+ my_puts_P(PSTR("## Bad date format\n"));
+ break;
+ }
+
+ time_t time;
+ time = mk_gmtime(&t);
+ gmtime_r(&time, &t);
+
+ /* and write to RTC */
+ if(rtc_set(&t) < 0) {
+ my_puts_P(PSTR("## Set date failed\n"));
+ break;
+ }
+ }
+ /* FALL TROUGH */
+ case 1: /* get date & time */
+ rc = rtc_get(&t);
+ if (rc >= 0) {
+ asctime_r(&t, buf);
+ printf_P(PSTR("%s"), buf);
+ if (rc == 1)
+ printf_P(PSTR(" (Invalid)"));
+ putchar('\n');
+ rcode = CMD_RET_SUCCESS;
+ } else {
+ my_puts_P(PSTR("## Get date failed\n"));
+ }
+ break;
+
+ default:
+ rcode = CMD_RET_USAGE;
+ }
+
+ return rcode;
+}