Added option to use_iso_8601_weeknumber

diff --git a/watch-library/shared/watch/watch_utility.c b/watch-library/shared/watch/watch_utility.c
index 6a8b408a7615e6d9a3bb2ffe268ad519075e1af5..9e52476242cc6992b22a06308f9f084cebc47696 100644 (file)
--- a/watch-library/shared/watch/watch_utility.c
+++ b/watch-library/shared/watch/watch_utility.c
@@ -46,7 +46,11 @@ uint8_t watch_utility_get_weeknumber(uint16_t year, uint8_t month, uint8_t day)
     uint8_t weekday;
     uint16_t days;
 
-    weekday = watch_utility_get_iso8601_weekday_number(year, month, day) % 7;
+    if (use_iso_8601_weeknumber == 1) {
+        weekday = ((watch_utility_get_iso8601_weekday_number(year, month, day) + 5) % 7) + 1;
+    } else {
+        weekday = watch_utility_get_iso8601_weekday_number(year, month, day) % 7;
+    }
     days = watch_utility_days_since_new_year(year, month, day);
 
        int val = (days + 7U - (weekday+6U)%7) / 7;

diff --git a/watch-library/shared/watch/watch_utility.h b/watch-library/shared/watch/watch_utility.h
index f96bd8c1ab4efd404c3cd7366adfe91c68251d6b..e2326d1318865fa34c7c3bba517a1def054b06ef 100644 (file)
--- a/watch-library/shared/watch/watch_utility.h
+++ b/watch-library/shared/watch/watch_utility.h
@@ -26,6 +26,11 @@
 #define _WATCH_UTILITY_H_INCLUDED
 ////< @file watch_utility.h
 
+/*
+ * Define use_iso_8601_weeknumber as 1 to let weeknumbers start on Monday, 0 to start on Sunday.
+ */
+#define use_iso_8601_weeknumber 0
+
 #include "watch.h"
 
 /** @addtogroup utility Utility Functions