fix dates

lib/calsol.h

@@ -5,3 +5,306 @@
  * http://ptaff.ca/soleil/?l1pays=France&l1etat=Haute-Vienne&l1ville=Limoges&l2pays=&l2etat=&l1cityname=Limoges%2C+Haute-Vienne%2C+France&l1ltd=45&l1ltm=50&l1lts=07&l1ltx=N&l1lgd=1&l1lgm=15&l1lgs=45&l1lgx=E&l1tz=0.0&l1dst=&l2cityname=&l2ltd=&l2ltm=&l2lts=&l2ltx=N&l2lgd=&l2lgm=&l2lgs=&l2lgx=E&l2tz=0&l2dst=&year=19&month=02&day=15&lang=fr_CA&go=Voir+le+graphe%21
  * */
 const uint8_t DateSol_t[][9] ={
+
+
+  {22, 3, 10, 6, 17, 17, 54, 11, 37},
+  {22, 3, 11, 6, 15, 17, 55, 11, 40},
+  {22, 3, 12, 6, 13, 17, 56, 11, 43},
+  {22, 3, 13, 6, 11, 17, 58, 11, 47},
+  {22, 3, 14, 6, 9, 17, 59, 11, 50},
+  {22, 3, 15, 6, 7, 18, 0, 11, 53},
+  {22, 3, 16, 6, 5, 18, 2, 11, 56},
+  {22, 3, 17, 6, 4, 18, 3, 12, 0},
+  {22, 3, 18, 6, 2, 18, 4, 12, 3},
+  {22, 3, 19, 6, 0, 18, 6, 12, 6},
+  {22, 3, 20, 5, 58, 18, 7, 12, 9},
+  {22, 3, 21, 5, 56, 18, 8, 12, 13},
+  {22, 3, 22, 5, 54, 18, 10, 12, 16},
+  {22, 3, 23, 5, 52, 18, 11, 12, 19},
+  {22, 3, 24, 5, 50, 18, 12, 12, 22},
+  {22, 3, 25, 5, 48, 18, 14, 12, 26},
+  {22, 3, 26, 5, 46, 18, 15, 12, 29},
+  {22, 3, 27, 5, 44, 18, 16, 12, 32},
+  {22, 3, 28, 5, 42, 18, 18, 12, 35},
+  {22, 3, 29, 5, 40, 18, 19, 12, 39},
+  {22, 3, 30, 5, 39, 18, 20, 12, 42},
+  {22, 3, 31, 5, 37, 18, 22, 12, 45},
+  {22, 4, 1, 5, 35, 18, 23, 12, 48},
+  {22, 4, 2, 5, 33, 18, 24, 12, 51},
+  {22, 4, 3, 5, 31, 18, 26, 12, 55},
+  {22, 4, 4, 5, 29, 18, 27, 12, 58},
+  {22, 4, 5, 5, 27, 18, 28, 13, 1},
+  {22, 4, 6, 5, 25, 18, 29, 13, 4},
+  {22, 4, 7, 5, 23, 18, 31, 13, 7},
+  {22, 4, 8, 5, 21, 18, 32, 13, 11},
+  {22, 4, 9, 5, 20, 18, 33, 13, 14},
+  {22, 4, 10, 5, 18, 18, 35, 13, 17},
+  {22, 4, 11, 5, 16, 18, 36, 13, 20},
+  {22, 4, 12, 5, 14, 18, 37, 13, 23},
+  {22, 4, 13, 5, 12, 18, 39, 13, 26},
+  {22, 4, 14, 5, 10, 18, 40, 13, 29},
+  {22, 4, 15, 5, 9, 18, 41, 13, 33},
+  {22, 4, 16, 5, 7, 18, 43, 13, 36},
+  {22, 4, 17, 5, 5, 18, 44, 13, 39},
+  {22, 4, 18, 5, 3, 18, 45, 13, 42},
+  {22, 4, 19, 5, 2, 18, 46, 13, 45},
+  {22, 4, 20, 5, 0, 18, 48, 13, 48},
+  {22, 4, 21, 4, 58, 18, 49, 13, 51},
+  {22, 4, 22, 4, 56, 18, 50, 13, 54},
+  {22, 4, 23, 4, 55, 18, 52, 13, 57},
+  {22, 4, 24, 4, 53, 18, 53, 14, 0},
+  {22, 4, 25, 4, 51, 18, 54, 14, 3},
+  {22, 4, 26, 4, 50, 18, 56, 14, 6},
+  {22, 4, 27, 4, 48, 18, 57, 14, 9},
+  {22, 4, 28, 4, 47, 18, 58, 14, 12},
+  {22, 4, 29, 4, 45, 19, 00, 14, 14},
+  {22, 4, 30, 4, 44, 19, 01, 14, 17},
+  {22, 5, 1, 4, 42, 19, 02, 14, 20},
+  {22, 5, 2, 4, 40, 19, 03, 14, 23},
+  {22, 5, 3, 4, 39, 19, 05, 14, 26},
+  {22, 5, 4, 4, 38, 19, 06, 14, 28},
+  {22, 5, 5, 4, 36, 19, 07, 14, 31},
+  {22, 5, 6, 4, 35, 19, 8, 14, 34},
+  {22, 5, 7, 4, 33, 19, 10, 14, 36},
+  {22, 5, 8, 4, 32, 19, 11, 14, 39},
+  {22, 5, 9, 4, 31, 19, 12, 14, 42},
+  {22, 5, 10, 4, 29, 19, 13, 14, 44},
+  {22, 5, 11, 4, 28, 19, 15, 14, 47},
+  {22, 5, 12, 4, 27, 19, 16, 14, 49},
+  {22, 5, 13, 4, 25, 19, 17, 14, 52},
+  {22, 5, 14, 4, 24, 19, 18, 14, 54},
+  {22, 5, 15, 4, 23, 19, 20, 14, 56},
+  {22, 5, 16, 4, 22, 19, 21, 14, 59},
+  {22, 5, 17, 4, 21, 19, 22, 15, 1},
+  {22, 5, 18, 4, 20, 19, 23, 15, 3},
+  {22, 5, 19, 4, 19, 19, 24, 15, 5},
+  {22, 5, 20, 4, 18, 19, 25, 15, 8},
+  {22, 5, 21, 4, 17, 19, 26, 15, 10},
+  {22, 5, 22, 4, 16, 19, 27, 15, 12},
+  {22, 5, 23, 4, 15, 19, 29, 15, 14},
+  {22, 5, 24, 4, 14, 19, 30, 15, 16},
+  {22, 5, 25, 4, 13, 19, 31, 15, 18},
+  {22, 5, 26, 4, 12, 19, 32, 15, 19},
+  {22, 5, 27, 4, 11, 19, 33, 15, 21},
+  {22, 5, 28, 4, 11, 19, 34, 15, 23},
+  {22, 5, 29, 4, 10, 19, 35, 15, 25},
+  {22, 5, 30, 4, 9, 19, 36, 15, 26},
+  {22, 5, 31, 4, 9, 19, 36, 15, 28},
+  {22, 6, 1, 4, 8, 19, 37, 15, 29},
+  {22, 6, 2, 4, 8, 19, 38, 15, 31},
+  {22, 6, 3, 4, 7, 19, 39, 15, 32},
+  {22, 6, 4, 4, 7, 19, 40, 15, 33},
+  {22, 6, 5, 4, 6, 19, 41, 15, 34},
+  {22, 6, 6, 4, 6, 19, 41, 15, 36},
+  {22, 6, 7, 4, 5, 19, 42, 15, 37},
+  {22, 6, 8, 4, 5, 19, 43, 15, 38},
+  {22, 6, 9, 4, 5, 19, 43, 15, 39},
+  {22, 6, 10, 4, 5, 19, 44, 15, 39},
+  {22, 6, 11, 4, 4, 19, 45, 15, 40},
+  {22, 6, 12, 4, 4, 19, 45, 15, 41},
+  {22, 6, 13, 4, 4, 19, 46, 15, 42},
+  {22, 6, 14, 4, 4, 19, 46, 15, 42},
+  {22, 6, 15, 4, 4, 19, 47, 15, 43},
+  {22, 6, 16, 4, 4, 19, 47, 15, 43},
+  {22, 6, 17, 4, 4, 19, 48, 15, 43},
+  {22, 6, 18, 4, 4, 19, 48, 15, 44},
+  {22, 6, 19, 4, 4, 19, 48, 15, 44},
+  {22, 6, 20, 4, 5, 19, 48, 15, 44},
+  {22, 6, 21, 4, 5, 19, 49, 15, 44},
+  {22, 6, 22, 4, 5, 19, 49, 15, 44},
+  {22, 6, 23, 4, 5, 19, 49, 15, 44},
+  {22, 6, 24, 4, 6, 19, 49, 15, 44},
+  {22, 6, 25, 4, 6, 19, 49, 15, 43},
+  {22, 6, 26, 4, 6, 19, 49, 15, 43},
+  {22, 6, 27, 4, 7, 19, 49, 15, 43},
+  {22, 6, 28, 4, 7, 19, 49, 15, 42},
+  {22, 6, 29, 4, 8, 19, 49, 15, 41},
+  {22, 6, 30, 4, 8, 19, 49, 15, 41},
+  {22, 7, 1, 4, 9, 19, 49, 15, 40},
+  {22, 7, 2, 4, 9, 19, 49, 15, 39},
+  {22, 7, 3, 4, 10, 19, 48, 15, 38},
+  {22, 7, 4, 4, 11, 19, 48, 15, 37},
+  {22, 7, 5, 4, 11, 19, 48, 15, 36},
+  {22, 7, 6, 4, 12, 19, 47, 15, 35},
+  {22, 7, 7, 4, 13, 19, 47, 15, 34},
+  {22, 7, 8, 4, 14, 19, 47, 15, 33},
+  {22, 7, 9, 4, 14, 19, 46, 15, 32},
+  {22, 7, 10, 4, 15, 19, 46, 15, 30},
+  {22, 7, 11, 4, 16, 19, 45, 15, 29},
+  {22, 7, 12, 4, 17, 19, 44, 15, 27},
+  {22, 7, 13, 4, 18, 19, 44, 15, 26},
+  {22, 7, 14, 4, 19, 19, 43, 15, 24},
+  {22, 7, 15, 4, 20, 19, 42, 15, 23},
+  {22, 7, 16, 4, 21, 19, 41, 15, 21},
+  {22, 7, 17, 4, 22, 19, 41, 15, 19},
+  {22, 7, 18, 4, 23, 19, 40, 15, 17},
+  {22, 7, 19, 4, 24, 19, 39, 15, 15},
+  {22, 7, 20, 4, 25, 19, 38, 15, 13},
+  {22, 7, 21, 4, 26, 19, 37, 15, 11},
+  {22, 7, 22, 4, 27, 19, 36, 15, 9},
+  {22, 7, 23, 4, 28, 19, 35, 15, 7},
+  {22, 7, 24, 4, 29, 19, 34, 15, 5},
+  {22, 7, 25, 4, 30, 19, 33, 15, 3},
+  {22, 7, 26, 4, 31, 19, 32, 15, 1},
+  {22, 7, 27, 4, 32, 19, 31, 14, 59},
+  {22, 7, 28, 4, 33, 19, 30, 14, 56},
+  {22, 7, 29, 4, 34, 19, 28, 14, 54},
+  {22, 7, 30, 4, 36, 19, 27, 14, 52},
+  {22, 7, 31, 4, 37, 19, 26, 14, 49},
+  {22, 8, 1, 4, 38, 19, 25, 14, 47},
+  {22, 8, 2, 4, 39, 19, 23, 14, 44},
+  {22, 8, 3, 4, 40, 19, 22, 14, 42},
+  {22, 8, 4, 4, 42, 19, 21, 14, 39},
+  {22, 8, 5, 4, 43, 19, 19, 14, 36},
+  {22, 8, 6, 4, 44, 19, 18, 14, 34},
+  {22, 8, 7, 4, 45, 19, 16, 14, 31},
+  {22, 8, 8, 4, 46, 19, 15, 14, 29},
+  {22, 8, 9, 4, 48, 19, 13, 14, 26},
+  {22, 8, 10, 4, 49, 19, 12, 14, 23},
+  {22, 8, 11, 4, 50, 19, 10, 14, 20},
+  {22, 8, 12, 4, 51, 19, 9, 14, 18},
+  {22, 8, 13, 4, 52, 19, 7, 14, 15},
+  {22, 8, 14, 4, 54, 19, 6, 14, 12},
+  {22, 8, 15, 4, 55, 19, 4, 14, 9},
+  {22, 8, 16, 4, 56, 19, 2, 14, 6},
+  {22, 8, 17, 4, 57, 19, 1, 14, 3},
+  {22, 8, 18, 4, 59, 18, 59, 14, 0},
+  {22, 8, 19, 5, 0, 18, 57, 13, 57},
+  {22, 8, 20, 5, 1, 18, 56, 13, 54},
+  {22, 8, 21, 5, 2, 18, 54, 13, 52},
+  {22, 8, 22, 5, 4, 18, 52, 13, 49},
+  {22, 8, 23, 5, 5, 18, 50, 13, 46},
+  {22, 8, 24, 5, 6, 18, 49, 13, 43},
+  {22, 8, 25, 5, 7, 18, 47, 13, 39},
+  {22, 8, 26, 5, 9, 18, 45, 13, 36},
+  {22, 8, 27, 5, 10, 18, 43, 13, 33},
+  {22, 8, 28, 5, 11, 18, 41, 13, 30},
+  {22, 8, 29, 5, 12, 18, 40, 13, 27},
+  {22, 8, 30, 5, 13, 18, 38, 13, 24},
+  {22, 8, 31, 5, 15, 18, 36, 13, 21},
+  {22, 9, 1, 5, 16, 18, 34, 13, 18},
+  {22, 9, 2, 5, 17, 18, 32, 13, 15},
+  {22, 9, 3, 5, 18, 18, 30, 13, 12},
+  {22, 9, 4, 5, 20, 18, 28, 13, 9},
+  {22, 9, 5, 5, 21, 18, 26, 13, 6},
+  {22, 9, 6, 5, 22, 18, 24, 13, 2},
+  {22, 9, 7, 5, 23, 18, 23, 12, 59},
+  {22, 9, 8, 5, 25, 18, 21, 12, 56},
+  {22, 9, 9, 5, 26, 18, 19, 12, 53},
+  {22, 9, 10, 5, 27, 18, 17, 12, 50},
+  {22, 9, 11, 5, 28, 18, 15, 12, 47},
+  {22, 9, 12, 5, 30, 18, 13, 12, 43},
+  {22, 9, 13, 5, 31, 18, 11, 12, 40},
+  {22, 9, 14, 5, 32, 18, 9, 12, 37},
+  {22, 9, 15, 5, 33, 18, 07, 12, 34},
+  {22, 9, 16, 5, 34, 18, 05, 12, 31},
+  {22, 9, 17, 5, 36, 18, 03, 12, 27},
+  {22, 9, 18, 5, 37, 18, 01, 12, 24},
+  {22, 9, 19, 5, 38, 17, 59, 12, 21},
+  {22, 9, 20, 5, 39, 17, 57, 12, 18},
+  {22, 9, 21, 5, 41, 17, 55, 12, 15},
+  {22, 9, 22, 5, 42, 17, 53, 12, 11},
+  {22, 9, 23, 5, 43, 17, 51, 12, 8},
+  {22, 9, 24, 5, 44, 17, 49, 12, 05},
+  {22, 9, 25, 5, 46, 17, 48, 12, 02},
+  {22, 9, 26, 5, 47, 17, 46, 11, 59},
+  {22, 9, 27, 5, 48, 17, 44, 11, 55},
+  {22, 9, 28, 5, 49, 17, 42, 11, 52},
+  {22, 9, 29, 5, 51, 17, 40, 11, 49},
+  {22, 9, 30, 5, 52, 17, 38, 11, 46},
+  {22, 10, 1, 5, 53, 17, 36, 11, 43},
+  {22, 10, 2, 5, 55, 17, 34, 11, 39},
+  {22, 10, 3, 5, 56, 17, 32, 11, 36},
+  {22, 10, 4, 5, 57, 17, 30, 11, 33},
+  {22, 10, 5, 5, 58, 17, 28, 11, 30},
+  {22, 10, 6, 6, 00, 17, 26, 11, 27},
+  {22, 10, 7, 6, 01, 17, 25, 11, 23},
+  {22, 10, 8, 6, 02, 17, 23, 11, 20},
+  {22, 10, 9, 6, 04, 17, 21, 11, 17},
+  {22, 10, 10, 6, 05, 17, 19, 11, 14},
+  {22, 10, 11, 6, 06, 17, 17, 11, 11},
+  {22, 10, 12, 6, 8, 17, 15, 11, 8},
+  {22, 10, 13, 6, 9, 17, 13, 11, 4},
+  {22, 10, 14, 6, 10, 17, 12, 11, 01},
+  {22, 10, 15, 6, 12, 17, 10, 10, 58},
+  {22, 10, 16, 6, 13, 17, 8, 10, 55},
+  {22, 10, 17, 6, 14, 17, 06, 10, 52},
+  {22, 10, 18, 6, 16, 17, 05, 10, 49},
+  {22, 10, 19, 6, 17, 17, 03, 10, 46},
+  {22, 10, 20, 6, 18, 17, 01, 10, 43},
+  {22, 10, 21, 6, 20, 16, 59, 10, 40},
+  {22, 10, 22, 6, 21, 16, 58, 10, 37},
+  {22, 10, 23, 6, 23, 16, 56, 10, 33},
+  {22, 10, 24, 6, 24, 16, 54, 10, 30},
+  {22, 10, 25, 6, 25, 16, 53, 10, 27},
+  {22, 10, 26, 6, 27, 16, 51, 10, 24},
+  {22, 10, 27, 6, 28, 16, 50, 10, 21},
+  {22, 10, 28, 6, 29, 16, 48, 10, 18},
+  {22, 10, 29, 6, 31, 16, 46, 10, 16},
+  {22, 10, 30, 6, 32, 16, 45, 10, 13},
+  {22, 10, 31, 6, 34, 16, 43, 10, 10},
+  {22, 11, 01, 6, 35, 16, 42, 10, 07},
+  {22, 11, 02, 6, 37, 16, 40, 10, 04},
+  {22, 11, 03, 6, 38, 16, 39, 10, 01},
+  {22, 11, 04, 6, 39, 16, 38, 9, 58},
+  {22, 11, 05, 6, 41, 16, 36, 9, 55},
+  {22, 11, 06, 6, 42, 16, 35, 9, 53},
+  {22, 11, 07, 6, 44, 16, 34, 9, 50},
+  {22, 11, 8, 6, 45, 16, 32, 9, 47},
+  {22, 11, 9, 6, 46, 16, 31, 9, 45},
+  {22, 11, 10, 6, 48, 16, 30, 9, 42},
+  {22, 11, 11, 6, 49, 16, 29, 9, 39},
+  {22, 11, 12, 6, 51, 16, 27, 9, 37},
+  {22, 11, 13, 6, 52, 16, 26, 9, 34},
+  {22, 11, 14, 6, 53, 16, 25, 9, 32},
+  {22, 11, 15, 6, 55, 16, 24, 9, 29},
+  {22, 11, 16, 6, 56, 16, 23, 9, 27},
+  {22, 11, 17, 6, 58, 16, 22, 9, 24},
+  {22, 11, 18, 6, 59, 16, 21, 9, 22},
+  {22, 11, 19, 7, 0, 16, 20, 9, 20},
+  {22, 11, 20, 7, 2, 16, 19, 9, 18},
+  {22, 11, 21, 7, 3, 16, 19, 9, 15},
+  {22, 11, 22, 7, 4, 16, 18, 9, 13},
+  {22, 11, 23, 7, 6, 16, 17, 9, 11},
+  {22, 11, 24, 7, 7, 16, 16, 9, 9},
+  {22, 11, 25, 7, 8, 16, 16, 9, 7},
+  {22, 11, 26, 7, 10, 16, 15, 9, 5},
+  {22, 11, 27, 7, 11, 16, 14, 9, 3},
+  {22, 11, 28, 7, 12, 16, 14, 9, 2},
+  {22, 11, 29, 7, 13, 16, 13, 9, 0},
+  {22, 11, 30, 7, 14, 16, 13, 8, 58},
+  {22, 12, 1, 7, 16, 16, 12, 8, 57},
+  {22, 12, 2, 7, 17, 16, 12, 8, 55},
+  {22, 12, 3, 7, 18, 16, 11, 8, 54},
+  {22, 12, 4, 7, 19, 16, 11, 8, 52},
+  {22, 12, 5, 7, 20, 16, 11, 8, 51},
+  {22, 12, 6, 7, 21, 16, 11, 8, 50},
+  {22, 12, 7, 7, 22, 16, 11, 8, 48},
+  {22, 12, 8, 7, 23, 16, 10, 8, 47},
+  {22, 12, 9, 7, 24, 16, 10, 8, 46},
+  {22, 12, 10, 7, 25, 16, 10, 8, 45},
+  {22, 12, 11, 7, 26, 16, 10, 8, 44},
+  {22, 12, 12, 7, 27, 16, 10, 8, 43},
+  {22, 12, 13, 7, 28, 16, 10, 8, 43},
+  {22, 12, 14, 7, 29, 16, 11, 8, 42},
+  {22, 12, 15, 7, 29, 16, 11, 8, 42},
+  {22, 12, 16, 7, 30, 16, 11, 8, 41},
+  {22, 12, 17, 7, 31, 16, 11, 8, 41},
+  {22, 12, 18, 7, 31, 16, 12, 8, 40},
+  {22, 12, 19, 7, 32, 16, 12, 8, 40},
+  {22, 12, 20, 7, 33, 16, 12, 8, 40},
+  {22, 12, 21, 7, 33, 16, 13, 8, 40},
+  {22, 12, 22, 7, 34, 16, 13, 8, 40},
+  {22, 12, 23, 7, 34, 16, 14, 8, 40},
+  {22, 12, 24, 7, 34, 16, 15, 8, 40},
+  {22, 12, 25, 7, 35, 16, 15, 8, 40},
+  {22, 12, 26, 7, 35, 16, 16, 8, 41},
+  {22, 12, 27, 7, 35, 16, 17, 8, 41},
+  {22, 12, 28, 7, 36, 16, 17, 8, 42},
+  {22, 12, 29, 7, 36, 16, 18, 8, 42},
+  {22, 12, 30, 7, 36, 16, 19, 8, 43},
+  {22, 12, 31, 7, 36, 16, 20, 8, 44}
+
+};
+
+#endif // CALSOL_H

src/main.cpp

@@ -8,8 +8,8 @@
 
 #include "../lib/calsol.h"
 
-uint8_t SHIFT_NIGHT = 45;
-uint8_t SHIFT_DAY = 30;
+uint8_t SHIFT_NIGHT = 59;
+uint8_t SHIFT_DAY = 0;
 
 // Module DS3231 pour l'heure
 int gnd_rtc = 14;
@@ -127,9 +127,9 @@ void clearSerial() {
 }
 
 void setRTC() {
-	rtc.setDOW(MONDAY);     // Set Day-of-Week to SUNDAY
-	rtc.setTime(20, 43, 0);     // Set the time to 12:00:00 (24hr format)
-	rtc.setDate(13, 1, 2020);   // Set the date to January 1st, 2014
+	rtc.setDOW(THURSDAY);     // Set Day-of-Week to SUNDAY
+	rtc.setTime(13, 03, 00);
+	rtc.setDate(10, 03, 2022);   // Set the date to January 1st, 2014
 }
 
 
@@ -353,6 +353,9 @@ void loop() {
 	bool read, read2;
 	read = digitalRead(fin_course_ouverture);
 	read2 = digitalRead(fin_course_fermeture);
+  delay(1000);
+	ouvrir();
+	fermer();
 	clearSerial();
 	Serial.println("-=-=-=-=-=-=- INITIALIZATION -=-=-=-=-=-=-=-");
 	Serial.println("Press 's' to enter self-test mode in 5 senconds");
@@ -399,6 +402,7 @@ void loop() {
 
 					timestamp_time = ((float)i * 24 * 60) + ((float)t.hour * 60) + (float)t.min;
 					timestamp_cal_matin = ((float)i * 24 * 60) + ((float)DateSol_t[i][3] * 60) + (float)DateSol_t[i][4] - (float)SHIFT_DAY;
+					//timestamp_cal_matin = ((float)i * 24 * 60) + (9 * 60) + 30;
 					timestamp_cal_soir = ((float)i * 24 * 60) + ((float)DateSol_t[i][5] * 60) + (float)DateSol_t[i][6] + (float)SHIFT_NIGHT;
 					timestamp_minuit = ((float)i * 24 * 60);
 					timestamp_2359 = ((float)i * 24 * 60) + (24 * 60) -1;
@@ -430,7 +434,7 @@ void loop() {
 						Serial.print(DateSol_t[i][0]);
 						Serial.println();
 
-						Serial.print("=> CalSol without SHIFT_DAY ");
+						Serial.print("=> CalSol with SHIFT_DAY ");
 						Serial.print( DateSol_t[i][3] );
 						Serial.print(":");
 						Serial.print( DateSol_t[i][4]);
@@ -439,6 +443,7 @@ void loop() {
 
 						Serial.print("=> Setting Alarm1 registers @ ");
 
+
 						//car shift, on soustrait le shift au timestamp_cal_matin
 						if (DateSol_t[i][4]-SHIFT_DAY < 0) {
 							Serial.print( DateSol_t[i][3] - 1 );
@@ -460,7 +465,9 @@ void loop() {
 						rtc.setControl();
 						rtc.resetAlarm();
 
-						if((read == LOW && read2 == LOW) || (read == LOW && read2 == HIGH)) {
+						if((read == LOW && read2 == LOW) ||
+						   (read == LOW && read2 == HIGH) ||
+						   (read == HIGH && read2 == HIGH)) {
 							ouvrirPorte(0);
 						}
 
@@ -496,8 +503,10 @@ void loop() {
 						rtc.setControl();
 						rtc.resetAlarm();
 
-						//Si porte ouverte ou indeterminée
-						if ((read == HIGH && read2 == HIGH) || (read == LOW && read2 == HIGH)) {
+						//Si porte ouverte ou indeterminée ou fermée
+						if ((read == HIGH && read2 == HIGH) ||
+						    (read == LOW && read2 == HIGH) ||
+								(read == LOW && read2 == LOW)) {
 							ouvrirPorte(1);
 						}
 
@@ -516,14 +525,17 @@ void loop() {
 						Serial.print(DateSol_t[i+1][0]);
 						Serial.println();
 
-						Serial.print("=> CalSol without SHIFT_DAY ");
+						Serial.print("=> CalSol @");
 						Serial.print( DateSol_t[i+1][3] );
 						Serial.print(":");
 						Serial.print( DateSol_t[i+1][4]);
+						Serial.print("UTC"); //without SHIFT_DAY ");
 						Serial.println();
 
 						Serial.print("=> Setting Alarm1 registers @ ");
 
+
+						// Calsol shift BEGIN
 						//car shift, on soustrait le shift au timestamp_cal_matin
 						if (DateSol_t[i+1][4]-SHIFT_DAY < 0) {
 							Serial.print( DateSol_t[i+1][3] - 1 );
@@ -536,17 +548,21 @@ void loop() {
 							Serial.print(":");
 							Serial.print( DateSol_t[i+1][4] - SHIFT_DAY);
 							rtc.setAlarm1Time(DateSol_t[i+1][3], DateSol_t[i+1][4]-SHIFT_DAY);
-							//rtc.setAlarm1Time(t.hour, t.min+1);
 						}
 
 						Serial.print(" with ");
 						Serial.print(SHIFT_DAY);
 						Serial.println("minutes less.");
+						// Calsol shift END
 
 						rtc.setControl();
 						rtc.resetAlarm();
 
-						if((read == HIGH && read2 == HIGH) || (read == LOW && read2 == HIGH)) {
+
+							if((read == LOW && read2 == LOW) ||
+							   (read == LOW && read2 == HIGH) ||
+							   (read == HIGH && read2 == HIGH)) {
+
 							ouvrirPorte(0);
 						}