esp32: Allow RTC init with only date.

sebromero · sebromero · commit 9dd7761b10f8 · 2024-12-05T13:33:34.000+01:00
Signed-off-by: Sebastian Romero &lt;s.romero@arduino.cc&gt;
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
@@ -126,15 +126,20 @@ static mp_obj_t machine_rtc_datetime_helper(mp_uint_t n_args, const mp_obj_t *ar
         return mp_obj_new_tuple(8, tuple);
     } else {
         // Set time
-
         mp_obj_t *items;
-        mp_obj_get_array_fixed_n(args[1], 8, &items);
 
         struct timeval tv = {0};
         if (use_init_format) {
-            tv.tv_sec = timeutils_seconds_since_epoch(mp_obj_get_int(items[0]), mp_obj_get_int(items[1]), mp_obj_get_int(items[2]), mp_obj_get_int(items[3]), mp_obj_get_int(items[4]), mp_obj_get_int(items[5]));
-            tv.tv_usec = mp_obj_get_int(items[6]);
-        } else {
+            size_t seq_len;
+            mp_ob_get_array_min_max_n(args[1], 3, 8, &seq_len, &items);
+            mp_int_t hour = seq_len > 3 ? mp_obj_get_int(items[3]) : 0;
+            mp_int_t minute = seq_len > 4 ? mp_obj_get_int(items[4]) : 0;
+            mp_int_t second = seq_len > 5 ? mp_obj_get_int(items[5]) : 0;
+            mp_int_t subsecond = seq_len > 6 ? mp_obj_get_int(items[6]) : 0;
+            tv.tv_sec = timeutils_seconds_since_epoch(mp_obj_get_int(items[0]), mp_obj_get_int(items[1]), mp_obj_get_int(items[2]), hour, minute, second);
+            tv.tv_usec = subsecond;
+        } else {            
+            mp_obj_get_array_fixed_n(args[1], 8, &items);
             tv.tv_sec = timeutils_seconds_since_epoch(mp_obj_get_int(items[0]), mp_obj_get_int(items[1]), mp_obj_get_int(items[2]), mp_obj_get_int(items[4]), mp_obj_get_int(items[5]), mp_obj_get_int(items[6]));
             tv.tv_usec = mp_obj_get_int(items[7]);
         }
diff --git a/py/obj.c b/py/obj.c
@@ -448,6 +448,25 @@ void mp_obj_get_array_fixed_n(mp_obj_t o, size_t len, mp_obj_t **items) {
     }
 }
 
+void mp_ob_get_array_min_max_n(mp_obj_t o, size_t min_len, size_t max_len, size_t *len, mp_obj_t **items) {
+    mp_obj_get_array(o, len, items);
+    if (*len < min_len) {
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
+        mp_raise_ValueError(MP_ERROR_TEXT("tuple/list length too short"));
+        #else
+        mp_raise_msg_varg(&mp_type_ValueError,
+            MP_ERROR_TEXT("requested minimum length %d but object has length %d"), (int)min_len, (int)*len);
+        #endif
+    } else if (*len > max_len) {
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
+        mp_raise_ValueError(MP_ERROR_TEXT("tuple/list length too long"));
+        #else
+        mp_raise_msg_varg(&mp_type_ValueError,
+            MP_ERROR_TEXT("requested maximum length %d but object has length %d"), (int)max_len, (int)*len);
+        #endif
+    }
+}
+
 // is_slice determines whether the index is a slice index
 size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool is_slice) {
     mp_int_t i;
diff --git a/py/obj.h b/py/obj.h
@@ -1045,6 +1045,7 @@ bool mp_obj_get_complex_maybe(mp_obj_t self_in, mp_float_t *real, mp_float_t *im
 #endif
 void mp_obj_get_array(mp_obj_t o, size_t *len, mp_obj_t **items); // *items may point inside a GC block
 void mp_obj_get_array_fixed_n(mp_obj_t o, size_t len, mp_obj_t **items); // *items may point inside a GC block
+void mp_ob_get_array_min_max_n(mp_obj_t o, size_t min_len, size_t max_len, size_t *len, mp_obj_t **items); // *items may point inside a GC block
 size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool is_slice);
 mp_obj_t mp_obj_id(mp_obj_t o_in);
 mp_obj_t mp_obj_len(mp_obj_t o_in);
