]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
driver40.html, refclock_jjy.c, driver40-ja.html, ChangeLog:
authorTakao Abe <abe@ntp.org>
Sun, 8 May 2016 07:34:11 +0000 (07:34 +0000)
committerTakao Abe <abe@ntp.org>
Sun, 8 May 2016 07:34:11 +0000 (07:34 +0000)
  [Bug 3047] Fix refclock_jjy C-DEX JST2000. abe@ntp.org

bk: 572eebf34EIAsYuvHU8blqd386y76g

ChangeLog
html/drivers/driver40-ja.html
html/drivers/driver40.html
ntpd/refclock_jjy.c

index f61a4479808cbb2aad460ac9d99592b64bd577ca..eba5c9154a1493b7fd6312c0fb79e80e6cb6c07f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,8 @@
     server if the delay exceeds 50ms. Retry again after the next
     broadcast packet.
 * [Bug 3036] autokey trips an INSIST in authistrustedip().  Harlan Stenn.
+* [Bug 3047] Fix refclock_jjy C-DEX JST2000. abe@ntp.org
+  - Patch provided by Kuramatsu.
 * Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
 * Update html/xleave.html documentation.  Harlan Stenn.
 * Update ntp.conf documentation.  Harlan Stenn.
index 8b67e9009d40bcd5544c93f8a727335c8696233f..d84c3ce107d982efc5e790a4b4d5ab643b021451 100644 (file)
@@ -16,7 +16,7 @@
        <body>
                <h3>JJY Receivers</h3>
 <p>Last update:
-  <!-- #BeginDate format:En2m -->15-May-2015  00:00<!-- #EndDate -->
+  <!-- #BeginDate format:En2m -->08-May-2016  00:00<!-- #EndDate -->
   UTC &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;<a href="driver40.html">ENGLISH(英語)</a> &nbsp; <a href="driver40-ja.html">JAPANESE(日本語)</a></p>
                <hr>
                <h4>Synopsis</h4>
                                                        <tr>
                                                                <td><code>{ENQ}1J{ETX}</code></td>
                                                                <td>&nbsp;--&gt;&nbsp;</td>
-                                                               <td><code>{STX}JYYMMDD HHMMSSS{ETX}</code></td>
+                                                               <td><code>{STX}JYYMMDDWHHMMSSS{ETX}</code></td>
                                                        </tr>
                                                </table>
                                                <br>
index 356429e499e6d19367ed67a88ddb625ebe0bce1b..3b5f00f1506bab37b57b3e79e3ea112eca724326 100644 (file)
@@ -16,7 +16,7 @@
        <body>
                <h3>JJY Receivers</h3>
 <p>Last update:
-  <!-- #BeginDate format:En2m -->15-May-2015  00:00<!-- #EndDate -->
+  <!-- #BeginDate format:En2m -->08-May-2016  00:00<!-- #EndDate -->
   UTC &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;<a href="driver40.html">ENGLISH</a> &nbsp; <a href="driver40-ja.html">JAPANESE</a></p>
                <hr>
                <h4>Synopsis</h4>
                                                        <tr>
                                                                <td><code>{ENQ}1J{ETX}</code></td>
                                                                <td>&nbsp;--&gt;&nbsp;</td>
-                                                               <td><code>{STX}JYYMMDD HHMMSSS{ETX}</code></td>
+                                                               <td><code>{STX}JYYMMDDWHHMMSSS{ETX}</code></td>
                                                        </tr>
                                                </table>
                                                <br>
index fc51fd9ee4b544b2bc230678501a5e3f25c41cb3..b2ecde9f1604aaeb113bb6dba746287f7f6b920b 100644 (file)
 /*  2015/05/15                                                       */
 /*    [Add]    Support the SEIKO TIME SYSTEMS TDC-300                */
 /*                                                                   */
+/*  2015/05/08                                                       */
+/*    [Fix]    C-DEX JST2000                                          */
+/*             Thanks to Mr. Kuramatsu for the report and the patch.  */
+/*                                                                   */
 /**********************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -1499,9 +1503,9 @@ jjy_receive_cdex_jst2000 ( struct recvbuf *rbufp )
                return JJY_RECEIVE_ERROR ;
        }
 
-       /* JYYMMDD HHMMSSS */
+       /* JYYMMDDWHHMMSSS */
 
-       rc = sscanf ( pBuf, "J%2d%2d%2d %2d%2d%2d%1d",
+       rc = sscanf ( pBuf, "J%2d%2d%2d%*1d%2d%2d%2d%1d",
                      &up->year, &up->month, &up->day,
                      &up->hour, &up->minute, &up->second,
                      &up->msecond ) ;