[Git][NTPsec/ntpsec][master] 3 commits: Fix TZ offset bug in ntpdig doc, #829

[Hal Murray (@hal.murray)]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
6b9a5344 by Hal Murray at 2025-01-27T02:16:55-08:00
Fix TZ offset bug in ntpdig doc, #829

- - - - -
25f05581 by Hal Murray at 2025-01-27T02:25:15-08:00
Fix bug in parsedata doc, #824

- - - - -
cb230d0a by James Browning at 2025-01-27T02:58:09-08:00
ntplogtemp: Record nvme temperatures on Asahi

- - - - -


3 changed files:

- docs/includes/ntpdig-body.adoc
- docs/parsedata.adoc
- ntpclients/ntplogtemp.py


Changes:

=====================================
docs/includes/ntpdig-body.adoc
=====================================
@@ -25,8 +25,8 @@ not UTC) to the standard output in a format like:
 2015-10-14 13:46:04.534916 (+0500) -0.000007 +/- 0.084075 localhost 127.0.0.1 s2 no-leap
 -----------------------------------------------------
 
-where the +(+0500)+ means that to get to UTC from the reported local
-time one must add 5 hours and 0 minutes, the +-0.000007+ indicates the
+where +(+0500)+ means that the reported local time is
+ 5 hours and 0 minutes ahead of UTC, the +-0.000007+ indicates the
 local clock is 0.000007 seconds ahead of correct time (so 0.000007 seconds
 must be subtracted from the local clock to get it to be correct). Note that
 the number of decimals printed for this value will change based on the


=====================================
docs/parsedata.adoc
=====================================
@@ -316,7 +316,7 @@ code (though not very precise!) delimited by '\r'
 
 ------------------------------------
     Timecode
-      YY-MM-DD-HH-MM-SS-FF\r
+      YY-MM-DD-WW-HH-MM-SS-FF\r
 
         FF&0x1  - DST
         FF&0x2  - DST switch warning


=====================================
ntpclients/ntplogtemp.py
=====================================
@@ -130,6 +130,8 @@ class SmartCtl:
             # Which drive to watch
             for child in glob.glob('/dev/sd?'):
                 self._drives.append(child)
+            for child in glob.glob('/dev/nvme?n?'):
+                self._drives.append(child)
             self._drives = sorted(self._drives)
 
     def get_data(self):
@@ -150,6 +152,12 @@ class SmartCtl:
                         now = int(time.time())
                         temp = line.split()[9]
                         data.append('%d %s %s' % (now, _device, temp))
+                        break
+                    if line.startswith('Temperature:'):
+                        now = int(time.time())
+                        temp = line.split()[1]
+                        data.append('%d %s %s' % (now, _device, temp))
+                        break
         return data
 
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/9863dd93c6e9ebce675282b0387300101101feba...cb230d0a356933c4fd8b2209189aea4cd0aa01e9

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/9863dd93c6e9ebce675282b0387300101101feba...cb230d0a356933c4fd8b2209189aea4cd0aa01e9
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20250127/d549ad53/attachment-0001.htm>