upd

Author: GyverLibs

README.md

@@ -1,4 +1,4 @@
-[![Foo](https://img.shields.io/badge/Version-1.0-brightgreen.svg?style=flat-square)](#versions)
+[![Foo](https://img.shields.io/badge/Version-1.1-brightgreen.svg?style=flat-square)](#versions)
 [![Foo](https://img.shields.io/badge/Website-AlexGyver.ru-blue.svg?style=flat-square)](https://alexgyver.ru/)
 [![Foo](https://img.shields.io/badge/%E2%82%BD$%E2%82%AC%20%D0%9D%D0%B0%20%D0%BF%D0%B8%D0%B2%D0%BE-%D1%81%20%D1%80%D1%8B%D0%B1%D0%BA%D0%BE%D0%B9-orange.svg?style=flat-square)](https://alexgyver.ru/support_alex/)
 
@@ -100,6 +100,7 @@ void loop() {
 <a id="versions"></a>
 ## Версии
 - v1.0
+- v1.1 - оптимизация
 
 <a id="feedback"></a>
 ## Баги и обратная связь

library.properties

@@ -1,5 +1,5 @@
 name=UnixTime
-version=1.0
+version=1.1
 author=AlexGyver <[email protected]>
 maintainer=AlexGyver <[email protected]>
 sentence=Unix time stamp to date time conversion and vice versa

src/UnixTime.h

@@ -5,70 +5,85 @@
 
     основано на https://www.oryx-embedded.com/doc/date__time_8c_source.html
     и https://stackoverflow.com/questions/7960318/math-to-convert-seconds-since-1970-into-date-and-vice-versa
+    и http://howardhinnant.github.io/date_algorithms.html#civil_from_days
 
     AlexGyver, [email protected]
     https://alexgyver.ru/
     MIT License
 
     Версии:
     v1.0 - релиз
+    v1.1 - оптимизация
 */
 
-#ifndef UnixTime_h
-#define UnixTime_h
+#ifndef _UnixTime_h
+#define _UnixTime_h
 class UnixTime {
 public:
     // указать GMT
     UnixTime (int8_t gmt) {
         _gmt = gmt;
     }
-    
+
     // получить unix stamp из установленной даты и времени
     uint32_t getUnix() {
-        int mdays[] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
-        int yearB = year;
-        yearB -= 1970;
-        int minusYear = 0;
-        if (month >= 3) {
-            yearB++;
-            minusYear = 1;
-        }
-        return ( ( (day - 1 + mdays[month - 1] + ( ( yearB + 1 ) >> 2 ) - ( ( yearB + 69 ) / 100 ) + ( ( yearB + 369 ) / 100 / 4 ) + 365 * ( yearB - minusYear )) * 24ul + hour - _gmt) * 60ul + minute ) * 60ul + second;
+        int8_t my = (month >= 3) ? 1 : 0;
+        uint16_t y = year + my - 1970;
+        uint16_t dm = 0;
+        for (int i = 0; i < month - 1; i++) dm += (i<7)?((i==1)?28:((i&1)?30:31)):((i&1)?31:30);
+        return (((day-1+dm+((y+1)>>2)-((y+69)/100)+((y+369)/100/4)+365*(y-my))*24ul+hour-_gmt)*60ul+minute)*60ul+second;
     }
 
     // конвертировать unix stamp дату и время (в переменные члены  класса)
     void getDateTime(uint32_t t) {
+        // http://howardhinnant.github.io/date_algorithms.html#civil_from_days
+        t += _gmt * 3600ul;
+        second = t % 60ul;
+        t /= 60ul;
+        minute = t % 60ul;
+        t /= 60ul;
+        hour = t % 24ul;
+        t /= 24ul;
+        dayOfWeek = (t + 4) % 7;
+        if (!dayOfWeek) dayOfWeek = 7;
+        uint32_t z = t + 719468;
+        uint8_t era = z / 146097ul;
+        uint16_t doe = z - era * 146097ul;
+        uint16_t yoe = (doe - doe / 1460 + doe / 36524 - doe / 146096) / 365;
+        uint16_t y = yoe + era * 400;
+        uint16_t doy = doe - (yoe * 365 + yoe / 4 - yoe / 100);
+        uint16_t mp = (doy * 5 + 2) / 153;
+        day = doy - (mp * 153 + 2) / 5 + 1;
+        month = mp + (mp < 10 ? 3 : -9);
+        y += (month <= 2);
+        year = y;
+        /*
+        //https://www.oryx-embedded.com/doc/date__time_8c_source.html
         uint32_t a, b, c, d, e, f;
         int h, j, k;
-
-        t += _gmt * 3600;
+        t += _gmt * 3600ul;
         second = t % 60ul;
         t /= 60;
         minute = t % 60ul;
         t /= 60;
         hour = t % 24ul;
         t /= 24;
-
         a = (uint32_t)((4ul * t + 102032) / 146097 + 15);
         b = (uint32_t)(t + 2442113 + a - (a / 4));
         c = (20 * b - 2442) / 7305;
         d = b - 365 * c - (c / 4);
         e = d * 1000 / 30601;
         f = d - e * 30 - e * 601 / 1000;
-
-        // январь и февраль как 13 и 14 месяцы
         if (e <= 13) {
             c -= 4716;
             e -= 1;
         } else {
             c -= 4715;
             e -= 13;
         }
-
         year = c;
         month = e;
         day = f;
-
         if (e <= 2) {
             e += 12;
             c -= 1;
@@ -77,6 +92,7 @@ class UnixTime {
         k = c % 100;
         h = f + (26 * (e + 1) / 10) + k + (k / 4) + (5 * j) + (j / 4);  // Уравнение Зеллера
         dayOfWeek = ((h + 5) % 7) + 1;
+        */
     }
 
     // установка даты и времени (удобнее чем писать переменные вурчную)
@@ -101,4 +117,4 @@ class UnixTime {
 private:
     int8_t _gmt = 0;
 };
-#endif
+#endif