Machine.get_hwclock and set_hwclock

Author: hasumikin

mrbgems/picoruby-machine/include/machine.h

@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <time.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -16,6 +17,8 @@ int Machine_get_unique_id(char *id_str);
 void Machine_tud_task(void);
 bool Machine_tud_mounted_q(void);
 uint32_t Machine_stack_usage(void);
+bool Machine_set_hwclock(const struct timespec *ts);
+bool Machine_get_hwclock(struct timespec *ts);
 
 #ifdef __cplusplus
 }

mrbgems/picoruby-machine/mrblib/machine.rb

@@ -42,3 +42,14 @@ def sleep(sec)
     end
   end
 end
+
+if RUBY_ENGINE == "mruby"
+  class Time
+    def self.now(in: nil)
+      ts = Machine.get_hwclock
+      tv_sec = ts[0]
+      tv_nsec = ts[1].to_f / 1_000_000_000
+      Time.at(tv_sec + tv_nsec)
+    end
+  end
+end

mrbgems/picoruby-machine/ports/rp2040/machine.c

@@ -15,8 +15,11 @@
 #include "hardware/clocks.h"
 #include "hardware/structs/scb.h"
 #include "hardware/sync.h"
+#include "pico/util/datetime.h"
 #include <tusb.h>
 
+#include "pico/aon_timer.h"
+
 /*-------------------------------------
  *
  * HAL
@@ -400,3 +403,18 @@ Machine_stack_usage(void)
   // TODO
   return 0;
 }
+
+bool
+Machine_set_hwclock(const struct timespec *ts)
+{
+  if (aon_timer_is_running()) {
+    return aon_timer_set_time(ts);
+  }
+  return aon_timer_start(ts);
+}
+
+bool
+Machine_get_hwclock(struct timespec *ts)
+{
+  return aon_timer_get_time(ts);
+}

mrbgems/picoruby-machine/sig/machine.rbs

@@ -9,6 +9,8 @@ class Machine
   def self.read_memory: (Integer address, Integer size) -> String
   def self.tud_task: () -> void
   def self.tud_mounted?: () -> bool
+  def self.set_hwclock: (Integer tv_sec, Integer tv_nsec) -> Integer
+  def self.get_hwclock: () -> [Integer, Integer]
 end
 
 $machine_delay: Symbol?

mrbgems/picoruby-machine/src/mruby/machine.c

@@ -1,6 +1,7 @@
 #include "mruby.h"
 #include "mruby/string.h"
 #include "mruby/presym.h"
+#include "mruby/array.h"
 
 #include "../../include/hal.h"
 
@@ -163,6 +164,38 @@ mrb_kernel_p(mrb_state *mrb, mrb_value self)
   }
   return mrb_nil_value();
 }
+
+#include <time.h>
+
+static mrb_value
+mrb_s_set_hwclock(mrb_state *mrb, mrb_value self)
+{
+  mrb_int tv_sec, tv_nsec;
+  mrb_get_args(mrb, "ii", &tv_sec, &tv_nsec);
+  const struct timespec ts = {
+    .tv_sec = (time_t)tv_sec,
+    .tv_nsec = (long)tv_nsec,
+  };
+  if (Machine_set_hwclock(&ts)) {
+    return mrb_true_value();
+  } else {
+    mrb_raise(mrb, E_RUNTIME_ERROR, "Failed to set hwclock");
+  }
+}
+
+static mrb_value
+mrb_s_get_hwclock(mrb_state *mrb, mrb_value self)
+{
+  struct timespec ts = {0};
+  if (Machine_get_hwclock(&ts)) {
+    mrb_value ary = mrb_ary_new_capa(mrb, 2);
+    mrb_ary_set(mrb, ary, 0, mrb_int_value(mrb, (mrb_int)ts.tv_sec));
+    mrb_ary_set(mrb, ary, 1, mrb_int_value(mrb, (mrb_int)ts.tv_nsec));
+    return ary;
+  } else {
+    mrb_raise(mrb, E_RUNTIME_ERROR, "Failed to get hwclock");
+  }
+}
 #endif
 
 void
@@ -186,6 +219,9 @@ mrb_picoruby_machine_gem_init(mrb_state* mrb)
   mrb_define_method_id(mrb, module_Kernel, MRB_SYM(puts), mrb_puts, MRB_ARGS_ANY());
   mrb_define_method_id(mrb, module_Kernel, MRB_SYM(print), mrb_print, MRB_ARGS_ANY());
   mrb_define_method_id(mrb, module_Kernel, MRB_SYM(p), mrb_kernel_p, MRB_ARGS_ANY());
+
+  mrb_define_class_method_id(mrb, class_Machine, MRB_SYM(set_hwclock), mrb_s_set_hwclock, MRB_ARGS_REQ(2));
+  mrb_define_class_method_id(mrb, class_Machine, MRB_SYM(get_hwclock), mrb_s_get_hwclock, MRB_ARGS_REQ(1));
 #endif
 }
 

mrbgems/picoruby-net/mrblib/ntp.rb

@@ -1,42 +1,41 @@
-require 'pack'
-require 'time'
-
 class Net
   class NTP
-    class Response
-      def initialize(unix_time)
-        @unixtime = unix_time
-      end
-
-      def time
-        Time.at(@unixtime)
-      end
-    end
-
     NTP_SERVER = "pool.ntp.org"
     NTP_PORT = 123
     NTP_PACKET_SIZE = 48
 
-    def self.set_hwclock
-      Time.set_hwclock(Net::NTP.get.time)
-    end
-
     def self.get(ntp_server = NTP_SERVER, ntp_port = NTP_PORT)
       # Create a NTP packet
-      ntp_packet = String.pack('C', 0x1b) + ("\0" * 47)
+      ntp_packet = "\e" + "\0" * 47
 
       r = UDPClient.send(ntp_server, ntp_port, ntp_packet, false)
 
-      if r && r.size == NTP_PACKET_SIZE
+      if r&.size == NTP_PACKET_SIZE
         # Extract NTP timestamp (seconds from 1900-01-01)
-        seconds = ((r[40]&.ord||0) << 24) | ((r[41]&.ord||0) << 16) | ((r[42]&.ord||0) << 8) | (r[43]&.ord||0)
-        fraction = ((r[44]&.ord||0) << 24) | ((r[45]&.ord||0) << 16) | ((r[46]&.ord||0) << 8) | (r[47]&.ord||0)
-
-        # Convert NTP timestamp to UNIX timestamp
-        unixtime = (seconds - 2_208_988_800 + (fraction / 2.0**32)).to_i
+        # @type var r: String
+        r40 = r[40]
+        r41 = r[41]
+        r42 = r[42]
+        r43 = r[43]
+        # @type var r40: String
+        # @type var r41: String
+        # @type var r42: String
+        # @type var r43: String
+        seconds = ( r40.ord << 24 | r41.ord << 16 | r42.ord << 8 | r43.ord ) - 2_208_988_800
+        # Extract NTP fraction (nanoseconds)
+        r44 = r[44]
+        r45 = r[45]
+        r46 = r[46]
+        r47 = r[47]
+        # @type var r44: String
+        # @type var r45: String
+        # @type var r46: String
+        # @type var r47: String
+        fraction = r44.ord << 24 | r45.ord << 16 | r46.ord << 8 | r47.ord
+        # Calculate nanoseconds
+        nanoseconds = (fraction * 1_000_000_000) >> 32
+        return [seconds, nanoseconds]
 
-        # Convert UNIX timestamp to human-readable time
-        Response.new(unixtime)
       else
         raise "Failed to retrieve time from NTP server."
       end

mrbgems/picoruby-net/sig/ntp.rbs

@@ -1,16 +1,9 @@
 class Net
   class NTP
-    class Response
-      @unixtime: Integer
-      def initialize: (Integer unixtime) -> void
-      def time: () -> Time
-    end
-
     NTP_SERVER: String
     NTP_PORT: Integer
     NTP_PACKET_SIZE: Integer
 
-    def self.get: (?String ntp_server, ?Integer ntp_port) -> Response
-    def self.set_hwclock: () -> void
+    def self.get: (?String ntp_server, ?Integer ntp_port) -> [Integer, Integer]
   end
 end

mrbgems/picoruby-net/src/net.c

@@ -42,6 +42,10 @@ Net_get_ip(const char *name, ip_addr_t *ip)
 
 #elif defined(PICORB_VM_MRUBYC)
 
-#include "mrubyc/net.c"
+//#include "mrubyc/net.c"
+int mbedtls_hardware_poll (void *data, unsigned char *output, size_t len, size_t *olen){
+  return 0;
+}
+void mrbc_net_init(mrbc_vm *vm){}
 
 #endif

mrbgems/picoruby-shell/shell_executables/wifi_connect

@@ -121,5 +121,6 @@ if config["wifi"]["watchdog"]
   puts "Watchdog disabled"
 end
 
-Net::NTP.set_hwclock
+tv = Net::NTP.get
+Machine.set_hwclock(tv[0], tv[1])
 puts "Time set to #{Time.now}"

mrbgems/picoruby-time-class/sig/time.rbs

@@ -282,7 +282,7 @@ class Time < Object
   # For the forms of argument `zone`, see [Timezone
   # Specifiers](rdoc-ref:timezones.rdoc).
   #
-  def self.at: ((Integer|Time), ?in: String | Integer | nil) -> Time
+  def self.at: ((Integer|Float|Time), ?in: String | Integer | nil) -> Time
 
   type subsec_unit = :msec | :millisecond | :usec | :microsecond | :nsec | :nanosecond