[Git][NTPsec/ntpsec][master] Change shortname of palisade driver to trimble...
Eric S. Raymond
gitlab at mg.gitlab.com
Mon Aug 1 02:59:18 UTC 2016
Eric S. Raymond pushed to branch master at NTPsec / ntpsec
Commits:
cdc5ae9f by Eric S. Raymond at 2016-07-31T22:57:41-04:00
Change shortname of palisade driver to trimble...
...since it supports three different Trimble devices. Document this
fact.
- - - - -
10 changed files:
- docs/driver_palisade.txt → docs/driver_trimble.txt
- docs/index.txt
- docs/refclock.txt
- ntpd/refclock_conf.c
- ntpd/refclock_palisade.c → ntpd/refclock_trimble.c
- ports/winnt/vs2005/ntpd.vcproj
- ports/winnt/vs2008/ntpd/ntpd.vcproj
- ports/winnt/vs2013/ntpd/ntpd.vcxproj
- ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters
- pylib/refclock.py
Changes:
=====================================
docs/driver_palisade.txt → docs/driver_trimble.txt
=====================================
--- a/docs/driver_palisade.txt
+++ b/docs/driver_trimble.txt
@@ -1,4 +1,4 @@
-= Trimble Palisade and Thunderbolt Receivers =
+= Trimble Palisade/Thunderbolt/Acutime Receivers =
[width="100%",cols="<50%,<50%",frame="none",grid="none"]
|==============================================================
@@ -7,13 +7,13 @@
== Synopsis ==
["verse",subs="normal"]
-Name: palisade
+Name: trimble
Reference ID: GPS
-Serial Port: +/dev/palisade+__u__; 9600bps 8N1/8O1
+Serial Port: +/dev/trimble+__u__; 9600bps 8N1/8O1
== Description ==
-The *refclock palisade* driver supports
+The *refclock trimble* driver supports
ftp://ftp.trimble.com/pub/sct/embedded/bin/Manuals/Old%20Manuals/PALISADE.PDF[Trimble
Navigation's Palisade Smart Antenna GPS receiver].
@@ -34,11 +34,11 @@ documentation for more information.
== Operating System Compatibility ==
-Note: There is no current support from either Trimble or HP for this
+Note: There is no current support from Trimble for this
product, and the links in the following table are the last known
location of resources.
-The Palisade driver has been tested on the following software and
+The Trimble driver has been tested on the following software and
hardware platforms:
[width="100%",cols="<25%,<25%,<25%,<25%",frame="none",grid="none",options="header"]
@@ -103,7 +103,7 @@ Palisade NTP reference clock driver.
== O/S Serial Port Configuration ==
-The driver attempts to open the device +/dev/palisade+__u__ where 'u' is
+The driver attempts to open the device +/dev/trimble+__u__ where 'u' is
the NTP refclock unit number as defined by the LSB of the refclock
address. Valid refclock unit numbers are 0 - 3.
@@ -111,7 +111,7 @@ The user is expected to provide a symbolic link to an available serial
port device. This is typically performed by a command such as:
---------------------------------
-ln -s /dev/ttyS0 /dev/palisade0
+ln -s /dev/ttyS0 /dev/trimble0
---------------------------------
Windows NT does not support symbolic links to device files. COM**x**: is
@@ -124,12 +124,12 @@ parity).
[[Configuration]]
== NTP Configuration ==
-Palisade NTP configuration file "{ntpconf}" with event polling:
+Trimble NTP configuration file "{ntpconf}" with event polling:
["literal",subs="normal"]
#------------------------------------------------------------------------------
# The Primary reference
-refclock palisade unit 0
+refclock trimble unit 0
peer terrapin.csc.ncsu.edu # internet server
# Drift file for expedient re-synchronization after downtime or reboot.
driftfile /etc/ntp.drift
@@ -141,7 +141,7 @@ Configuration without event polling:
#------------------------------------------------------------------------------
# The Primary reference.
# Set packet delay and set flag2 to turn off event polling.
-refclock palisade unit 0 link:#time1[time1 0.020] link:#flag2[flag2 1]
+refclock trimble unit 0 link:#time1[time1 0.020] link:#flag2[flag2 1]
#------------------------------------------------------------------------------
== Thunderbolt NTP Configuration file ==
@@ -151,7 +151,7 @@ Configuration without event polling:
["literal",subs="normal"]
#------------------------------------------------------------------------------
# The Primary reference
-refclock palisade unit 0 mode 2 link:#time1[time1 0.020] link:#flag2[flag2 1]
+refclock trimble unit 0 mode 2 link:#time1[time1 0.020] link:#flag2[flag2 1]
#------------------------------------------------------------------------------
Currently the Thunderbolt mode doesn't support event polling, the
@@ -239,7 +239,8 @@ link:#refid[+refid string+]::
The mode parameter to the server command specifies the specific hardware
this driver is for. The default is 0 for a normal Trimble Palisade. The
other options are *1* for an *Endrun Praecis* in Trimble emulation mode,
- and *2* for the *Trimble Thunderbolt* GPS Disciplined Clock Receiver.
+ *2* for the *Trimble Thunderbolt* GPS Disciplined Clock Receiver,
+ *3* for the Trimble Acutime Gold, and *4* for the Acutime Gold port B.
+mode+ 'number'::
Synonym for subtype, retained for backward compatibility.
@@ -504,7 +505,7 @@ connector are as follows:*
== Notes on the Thunderbolt Receiver's Firmware ==
-*The support for Thunderbolt Receiver in the palisade driver doesn't
+*The support for Thunderbolt Receiver in the trimble driver doesn't
support (for now) event-polling, the reason is that the Thunderbolt
receiver the patch is written for doesn't support time-on-request, so
you just have to sit there and wait for the time to arrive with the PPS.
=====================================
docs/index.txt
=====================================
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -182,6 +182,9 @@ few will be user-visible.
default device path, the default PPS device path (if any) and the
serial baud rate.
+* If you had a refclock on a path of the form /dev/palisadeNNN, that
+ link needs to change to /dev/trimbleNNN.
+
* The -!m, ->, and -< options of some Classic commands are not
supported. (The argument-parsing framework code that implemented
them in Classic was overcomplicated and buggy and had to be removed.)
=====================================
docs/refclock.txt
=====================================
--- a/docs/refclock.txt
+++ b/docs/refclock.txt
@@ -175,7 +175,7 @@ parse driver.
|link:driver_pps.html[pps] | T | PPS Clock Discipline
|link:driver_hpgps.html[hpgps] | T | Hewlett Packard GPS Receivers
|link:driver_shm.html[shm] | T | Shared Memory Driver
-|link:driver_palisade.html[palisade] | T | Trimble Palisade/Thunderbolt GPS
+|link:driver_trimble.html[trimble] | T | Trimble Palisade/Thunderbolt/Acutime GPSes
|link:driver_oncore.html[oncore] | - | Motorola UT Oncore GPS
|link:driver_jupiter.html[jupiter] | D | Rockwell Jupiter GPS
|link:driver_dumbclock.html[dumbclock] | D | Dumb Clock
=====================================
ntpd/refclock_conf.c
=====================================
--- a/ntpd/refclock_conf.c
+++ b/ntpd/refclock_conf.c
@@ -83,10 +83,10 @@ extern struct refclock refclock_shm;
#define refclock_shm refclock_none
#endif
-#ifdef CLOCK_PALISADE
-extern struct refclock refclock_palisade;
+#ifdef CLOCK_TRIMBLE
+extern struct refclock refclock_trimble;
#else
-#define refclock_palisade refclock_none
+#define refclock_trimble refclock_none
#endif
#if defined(CLOCK_ONCORE)
@@ -171,7 +171,7 @@ struct refclock * const refclock_conf[] = {
&refclock_hpgps, /* 26 REFCLK_GPS_HP */
&refclock_none, /* 27 was: REFCLK_ARCRON_MSF */
&refclock_shm, /* 28 REFCLK_SHM */
- &refclock_palisade, /* 29 REFCLK_PALISADE */
+ &refclock_trimble, /* 29 REFCLK_PALISADE */
&refclock_oncore, /* 30 REFCLK_ONCORE */
&refclock_jupiter, /* 31 REFCLK_GPS_JUPITER */
&refclock_none, /* 32 was: REFCLK_CHRONOLOG */
=====================================
ntpd/refclock_palisade.c → ntpd/refclock_trimble.c
=====================================
--- a/ntpd/refclock_palisade.c
+++ b/ntpd/refclock_trimble.c
@@ -1,9 +1,9 @@
/*
- * refclock_palisade - clock driver for the Trimble Palisade GPS
- * timing receiver
+ * refclock_trimble - clock driver for the Trimble Palisade
+ * Thunderbolt, and Acutime Gold timing receivers
*
* For detailed information on this program, please refer to the html
- * Refclock 29 page accompanying the NTP distribution.
+ * refclock_trimble.html page accompanying the NTP distribution.
*
* for questions / bugs / comments, contact:
* sven_dietrich at trimble.com
@@ -44,30 +44,6 @@
# include <sys/ioctl.h>
#endif /* not HAVE_SYS_IOCTL_H */
-/*
- * refclock_palisade - clock driver for the Trimble Palisade GPS
- * timing receiver
- *
- * For detailed information on this program, please refer to the html
- * Refclock 29 page accompanying the NTP distribution.
- *
- * for questions / bugs / comments, contact:
- * sven_dietrich at trimble.com
- *
- * Sven-Thorsten Dietrich
- * 645 North Mary Avenue
- * Post Office Box 3642
- * Sunnyvale, CA 94088-3642
- *
- * This software was developed by the Software and Component Technologies
- * group of Trimble Navigation, Ltd.
- *
- * Copyright (c) 1997, 1998, 1999, 2000 Trimble Navigation Ltd.
- * Copyright 2015 by the NTPsec project contributors
- * SPDX-License-Identifier: BSD-4-clause
- *
- */
-
#if defined HAVE_SYS_MODEM_H
#include <sys/modem.h>
#endif
@@ -89,8 +65,8 @@
/*
* GPS Definitions
*/
-#define DESCRIPTION "Trimble Palisade GPS" /* Long name */
-#define NAME "PALISADE" /* shortname */
+#define DESCRIPTION "Trimble Palisade/Thunderbolt/Acutime GPSes" /* Long name */
+#define NAME "TRIMBLE" /* shortname */
#define PRECISION (-20) /* precision assumed (about 1 us) */
#define REFID "GPS\0" /* reference ID */
#define TRMB_MINPOLL 4 /* 16 seconds */
@@ -99,14 +75,14 @@
/*
* I/O Definitions
*/
-#define DEVICE "/dev/palisade%d" /* device name and unit */
+#define DEVICE "/dev/trimble%d" /* device name and unit */
#define SPEED232 B9600 /* uart speed (9600 baud) */
/*
* TSIP Report Definitions
*/
#define LENCODE_8F0B 74 /* Length of TSIP 8F-0B Packet & header */
-#define LENCODE_NTP 22 /* Length of Palisade NTP Packet */
+#define LENCODE_NTP 22 /* Length of Trimble NTP Packet */
#define LENCODE_8FAC 68 /* Length of Thunderbolt 8F-AC Position Packet*/
#define LENCODE_8FAB 17 /* Length of Thunderbolt Primary Timing Packet*/
@@ -137,13 +113,13 @@
/*
* Leap-Insert and Leap-Delete are encoded as follows:
- * PALISADE_UTC_TIME set and PALISADE_LEAP_PENDING set: INSERT leap
+ * TRIMBLE_UTC_TIME set and TRIMBLE_LEAP_PENDING set: INSERT leap
*/
-#define PALISADE_LEAP_INPROGRESS 0x08 /* This is the leap flag */
-#define PALISADE_LEAP_WARNING 0x04 /* GPS Leap Warning (see ICD-200) */
-#define PALISADE_LEAP_PENDING 0x02 /* Leap Pending (24 hours) */
-#define PALISADE_UTC_TIME 0x01 /* UTC time available */
+#define TRIMBLE_LEAP_INPROGRESS 0x08 /* This is the leap flag */
+#define TRIMBLE_LEAP_WARNING 0x04 /* GPS Leap Warning (see ICD-200) */
+#define TRIMBLE_LEAP_PENDING 0x02 /* Leap Pending (24 hours) */
+#define TRIMBLE_UTC_TIME 0x01 /* UTC time available */
#define mb(_X_) (up->rpt_buf[(_X_ + 1)]) /* shortcut for buffer access */
@@ -162,9 +138,9 @@ struct packettx
};
/*
- * Palisade unit control structure.
+ * Trimble unit control structure.
*/
-struct palisade_unit {
+struct trimble_unit {
short unit; /* NTP refclock unit number */
int polled; /* flag to detect noreplies */
char leap_status; /* leap second flag */
@@ -179,12 +155,12 @@ struct palisade_unit {
* Function prototypes
*/
-static bool palisade_start (int, struct peer *);
-static void palisade_shutdown (int, struct peer *);
-static void palisade_receive (struct peer *);
-static void palisade_poll (int, struct peer *);
-static void palisade_io (struct recvbuf *);
-int palisade_configure (int, struct peer *);
+static bool trimble_start (int, struct peer *);
+static void trimble_shutdown (int, struct peer *);
+static void trimble_receive (struct peer *);
+static void trimble_poll (int, struct peer *);
+static void trimble_io (struct recvbuf *);
+int trimble_configure (int, struct peer *);
int TSIP_decode (struct peer *);
long HW_poll (struct refclockproc *);
static double getdbl (uint8_t *);
@@ -221,11 +197,11 @@ const char * Tracking_Status[15][15] = {
/*
* Transfer vector
*/
-struct refclock refclock_palisade = {
+struct refclock refclock_trimble = {
NAME, /* basename of driver */
- palisade_start, /* start up driver */
- palisade_shutdown, /* shut down driver */
- palisade_poll, /* transmit poll message */
+ trimble_start, /* start up driver */
+ trimble_shutdown, /* shut down driver */
+ trimble_poll, /* transmit poll message */
noentry, /* control - not used */
noentry, /* initialize driver (not used) */
noentry /* timer - not used */
@@ -383,15 +359,15 @@ init_acutime (
}
/*
- * palisade_start - open the devices and initialize data for processing
+ * trimble_start - open the devices and initialize data for processing
*/
static bool
-palisade_start (
+trimble_start (
int unit,
struct peer *peer
)
{
- struct palisade_unit *up;
+ struct trimble_unit *up;
struct refclockproc *pp;
int fd;
char gpsdev[20];
@@ -407,20 +383,20 @@ palisade_start (
LDISC_RAW);
if (fd <= 0) {
#ifdef DEBUG
- printf("Palisade(%d) start: open %s failed\n", unit, gpsdev);
+ printf("Trimble(%d) start: open %s failed\n", unit, gpsdev);
#endif
/* coverity[leaked_handle] */
return false;
}
- msyslog(LOG_NOTICE, "Palisade(%d) fd: %d dev: %s", unit, fd,
+ msyslog(LOG_NOTICE, "Trimble(%d) fd: %d dev: %s", unit, fd,
gpsdev);
if (tcgetattr(fd, &tio) < 0) {
msyslog(LOG_ERR,
- "Palisade(%d) tcgetattr(fd, &tio): %m",unit);
+ "Trimble(%d) tcgetattr(fd, &tio): %m",unit);
#ifdef DEBUG
- printf("Palisade(%d) tcgetattr(fd, &tio)\n",unit);
+ printf("Trimble(%d) tcgetattr(fd, &tio)\n",unit);
#endif
close(fd);
return false;
@@ -440,26 +416,26 @@ palisade_start (
/* Normal mode, do nothing */
break;
case CLK_PRAECIS:
- msyslog(LOG_NOTICE, "Palisade(%d) Praecis mode enabled"
+ msyslog(LOG_NOTICE, "Trimble(%d) Praecis mode enabled"
,unit);
break;
case CLK_THUNDERBOLT:
- msyslog(LOG_NOTICE, "Palisade(%d) Thunderbolt mode enabled"
+ msyslog(LOG_NOTICE, "Trimble(%d) Thunderbolt mode enabled"
,unit);
tio.c_cflag = (CS8|CLOCAL|CREAD);
break;
case CLK_ACUTIME:
- msyslog(LOG_NOTICE, "Palisade(%d) Acutime Gold mode enabled"
+ msyslog(LOG_NOTICE, "Trimble(%d) Acutime Gold mode enabled"
,unit);
break;
default:
- msyslog(LOG_NOTICE, "Palisade(%d) mode unknown",unit);
+ msyslog(LOG_NOTICE, "Trimble(%d) mode unknown",unit);
break;
}
if (tcsetattr(fd, TCSANOW, &tio) == -1) {
- msyslog(LOG_ERR, "Palisade(%d) tcsetattr(fd, &tio): %m",unit);
+ msyslog(LOG_ERR, "Trimble(%d) tcsetattr(fd, &tio): %m",unit);
#ifdef DEBUG
- printf("Palisade(%d) tcsetattr(fd, &tio)\n",unit);
+ printf("Trimble(%d) tcsetattr(fd, &tio)\n",unit);
#endif
close(fd);
free(up);
@@ -467,13 +443,13 @@ palisade_start (
}
pp = peer->procptr;
- pp->io.clock_recv = palisade_io;
+ pp->io.clock_recv = trimble_io;
pp->io.srcclock = peer;
pp->io.datalen = 0;
pp->io.fd = fd;
if (!io_addclock(&pp->io)) {
#ifdef DEBUG
- printf("Palisade(%d) io_addclock\n",unit);
+ printf("Trimble(%d) io_addclock\n",unit);
#endif
close(fd);
pp->io.fd = -1;
@@ -509,15 +485,15 @@ palisade_start (
/*
- * palisade_shutdown - shut down the clock
+ * trimble_shutdown - shut down the clock
*/
static void
-palisade_shutdown (
+trimble_shutdown (
int unit,
struct peer *peer
)
{
- struct palisade_unit *up;
+ struct trimble_unit *up;
struct refclockproc *pp;
UNUSED_ARG(unit);
@@ -573,7 +549,7 @@ TSIP_decode (
double secfrac;
unsigned short event = 0;
- struct palisade_unit *up;
+ struct trimble_unit *up;
struct refclockproc *pp;
pp = peer->procptr;
@@ -594,7 +570,7 @@ TSIP_decode (
/* standard time packet - GPS time and GPS week number */
#ifdef DEBUG
- printf("Palisade Port B packets detected. Connect to Port A\n");
+ printf("Trimble Port B packets detected. Connect to Port A\n");
#endif
return 0;
@@ -689,7 +665,7 @@ TSIP_decode (
break;
case PACKET_NTP:
- /* Palisade-NTP Packet */
+ /* Trimble-NTP Packet */
if (up->rpt_cnt != LENCODE_NTP) /* check length */
break;
@@ -715,10 +691,10 @@ TSIP_decode (
}
up->month = mb(15);
- if ( (up->leap_status & PALISADE_LEAP_PENDING) &&
+ if ( (up->leap_status & TRIMBLE_LEAP_PENDING) &&
/* Avoid early announce: https://bugs.ntp.org/2773 */
(6 == up->month || 12 == up->month) ) {
- if (up->leap_status & PALISADE_UTC_TIME)
+ if (up->leap_status & TRIMBLE_UTC_TIME)
pp->leap = LEAP_ADDSECOND;
else
pp->leap = LEAP_DELSECOND;
@@ -1019,15 +995,15 @@ TSIP_decode (
}
/*
- * palisade__receive - receive data from the serial interface
+ * trimble__receive - receive data from the serial interface
*/
static void
-palisade_receive (
+trimble_receive (
struct peer * peer
)
{
- struct palisade_unit *up;
+ struct trimble_unit *up;
struct refclockproc *pp;
/*
@@ -1046,7 +1022,7 @@ palisade_receive (
#ifdef DEBUG
if (debug)
printf(
- "palisade_receive: unit %d: %4d %03d %02d:%02d:%02d.%09ld\n",
+ "trimble_receive: unit %d: %4d %03d %02d:%02d:%02d.%09ld\n",
up->unit, pp->year, pp->day, pp->hour, pp->minute,
pp->second, pp->nsec);
#endif
@@ -1067,7 +1043,7 @@ palisade_receive (
refclock_report(peer, CEVNT_BADTIME);
#ifdef DEBUG
- printf("palisade_receive: unit %d: refclock_process failed!\n",
+ printf("trimble_receive: unit %d: refclock_process failed!\n",
up->unit);
#endif
return;
@@ -1077,7 +1053,7 @@ palisade_receive (
#ifdef DEBUG
if (debug)
- printf("palisade_receive: unit %d: %s\n",
+ printf("trimble_receive: unit %d: %s\n",
up->unit, prettydate(&pp->lastrec));
#endif
pp->lastref = pp->lastrec;
@@ -1086,16 +1062,16 @@ palisade_receive (
/*
- * palisade_poll - called by the transmit procedure
+ * trimble_poll - called by the transmit procedure
*
*/
static void
-palisade_poll (
+trimble_poll (
int unit,
struct peer *peer
)
{
- struct palisade_unit *up;
+ struct trimble_unit *up;
struct refclockproc *pp;
pp = peer->procptr;
@@ -1109,7 +1085,7 @@ palisade_poll (
#ifdef DEBUG
if (debug)
- printf("palisade_poll: unit %d: polling %s\n", unit,
+ printf("trimble_poll: unit %d: polling %s\n", unit,
(pp->sloppyclockflag & CLK_FLAG2) ?
"synchronous packet" : "event");
#endif
@@ -1119,7 +1095,7 @@ palisade_poll (
if(up->type == CLK_PRAECIS) {
if(write(peer->procptr->io.fd,"SPSTAT\r\n",8) < 0)
- msyslog(LOG_ERR, "Palisade(%d) write: %m:",unit);
+ msyslog(LOG_ERR, "Trimble(%d) write: %m:",unit);
else {
praecis_msg = true;
return;
@@ -1159,14 +1135,14 @@ praecis_parse (
}
static void
-palisade_io (
+trimble_io (
struct recvbuf *rbufp
)
{
/*
* Initialize pointers and read the timecode and timestamp.
*/
- struct palisade_unit *up;
+ struct trimble_unit *up;
struct refclockproc *pp;
struct peer *peer;
@@ -1256,14 +1232,14 @@ palisade_io (
up->rpt_status =TSIP_PARSED_EMPTY;
if (up->rpt_status == TSIP_PARSED_FULL)
- palisade_receive(peer);
+ trimble_receive(peer);
} /* while chars in buffer */
}
/*
- * Trigger the Palisade's event input, which is driven off the RTS
+ * Trigger the Trimble's event input, which is driven off the RTS
*
* Take a system time stamp to match the GPS time stamp.
*
@@ -1274,15 +1250,15 @@ HW_poll (
)
{
int x; /* state before & after RTS set */
- struct palisade_unit *up;
+ struct trimble_unit *up;
up = pp->unitptr;
/* read the current status, so we put things back right */
if (ioctl(pp->io.fd, TIOCMGET, &x) < 0) {
- DPRINTF(1, ("Palisade HW_poll: unit %d: GET %m\n",
+ DPRINTF(1, ("Trimble HW_poll: unit %d: GET %m\n",
up->unit));
- msyslog(LOG_ERR, "Palisade(%d) HW_poll: ioctl(fd,GET): %m",
+ msyslog(LOG_ERR, "Trimble(%d) HW_poll: ioctl(fd,GET): %m",
up->unit);
return -1;
}
@@ -1296,10 +1272,10 @@ HW_poll (
if (ioctl(pp->io.fd, TIOCMSET, &x) < 0) {
#ifdef DEBUG
if (debug)
- printf("Palisade HW_poll: unit %d: SET \n", up->unit);
+ printf("Trimble HW_poll: unit %d: SET \n", up->unit);
#endif
msyslog(LOG_ERR,
- "Palisade(%d) HW_poll: ioctl(fd, SET, RTS_on): %m",
+ "Trimble(%d) HW_poll: ioctl(fd, SET, RTS_on): %m",
up->unit);
return -1;
}
@@ -1312,10 +1288,10 @@ HW_poll (
if (ioctl(pp->io.fd, TIOCMSET, &x) == -1) {
#ifdef DEBUG
if (debug)
- printf("Palisade HW_poll: unit %d: UNSET \n", up->unit);
+ printf("Trimble HW_poll: unit %d: UNSET \n", up->unit);
#endif
msyslog(LOG_ERR,
- "Palisade(%d) HW_poll: ioctl(fd, UNSET, RTS_off): %m",
+ "Trimble(%d) HW_poll: ioctl(fd, UNSET, RTS_off): %m",
up->unit);
return -1;
}
=====================================
ports/winnt/vs2005/ntpd.vcproj
=====================================
--- a/ports/winnt/vs2005/ntpd.vcproj
+++ b/ports/winnt/vs2005/ntpd.vcproj
@@ -1387,7 +1387,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\ntpd\refclock_palisade.c"
+ RelativePath="..\..\..\ntpd\refclock_trimble.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -1409,10 +1409,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\ntpd\refclock_palisade.h"
- >
- </File>
- <File
RelativePath="..\..\..\ntpd\refclock_parse.c"
>
<FileConfiguration
=====================================
ports/winnt/vs2008/ntpd/ntpd.vcproj
=====================================
--- a/ports/winnt/vs2008/ntpd/ntpd.vcproj
+++ b/ports/winnt/vs2008/ntpd/ntpd.vcproj
@@ -689,10 +689,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\ntpd\refclock_palisade.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\lib\isc\include\isc\result.h"
>
</File>
@@ -842,7 +838,7 @@
>
</File>
<File
- RelativePath="..\..\..\..\ntpd\refclock_palisade.c"
+ RelativePath="..\..\..\..\ntpd\refclock_trimble0.c"
>
</File>
<File
=====================================
ports/winnt/vs2013/ntpd/ntpd.vcxproj
=====================================
--- a/ports/winnt/vs2013/ntpd/ntpd.vcxproj
+++ b/ports/winnt/vs2013/ntpd/ntpd.vcxproj
@@ -303,7 +303,7 @@
<ClCompile Include="..\..\..\..\ntpd\refclock_neoclock4x.c" />
<ClCompile Include="..\..\..\..\ntpd\refclock_nmea.c" />
<ClCompile Include="..\..\..\..\ntpd\refclock_oncore.c" />
- <ClCompile Include="..\..\..\..\ntpd\refclock_palisade.c" />
+ <ClCompile Include="..\..\..\..\ntpd\refclock_trimble.c" />
<ClCompile Include="..\..\..\..\ntpd\refclock_parse.c" />
<ClCompile Include="..\..\..\..\ntpd\refclock_pst.c" />
<ClCompile Include="..\..\..\..\ntpd\refclock_ripencc.c" />
@@ -412,7 +412,6 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd</Outputs>
</CustomBuild>
<ClInclude Include="..\..\..\..\ntpd\ntp_scanner.h" />
- <ClInclude Include="..\..\..\..\ntpd\refclock_palisade.h" />
<ClInclude Include="..\..\include\arpa\inet.h" />
<ClInclude Include="..\..\include\clockstuff.h" />
<ClInclude Include="..\..\include\config.h" />
=====================================
ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters
=====================================
--- a/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters
+++ b/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters
@@ -162,7 +162,7 @@
<ClCompile Include="..\..\..\..\ntpd\refclock_oncore.c">
<Filter>Reference Clock</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\ntpd\refclock_palisade.c">
+ <ClCompile Include="..\..\..\..\ntpd\refclock_trimble.c">
<Filter>Reference Clock</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\ntpd\refclock_parse.c">
@@ -416,9 +416,6 @@
<ClInclude Include="..\..\..\..\include\recvbuff.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\ntpd\refclock_palisade.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\..\lib\isc\include\isc\result.h">
<Filter>Header Files</Filter>
</ClInclude>
=====================================
pylib/refclock.py
=====================================
--- a/pylib/refclock.py
+++ b/pylib/refclock.py
@@ -77,10 +77,10 @@ refclock_map = {
"file": "shm"
},
- "palisade": {
- "descr": "Trimble Navigation Palisade GPS",
- "define": "CLOCK_PALISADE",
- "file": "palisade"
+ "trimble": {
+ "descr": "Trimble Navigation GPSes",
+ "define": "CLOCK_TRIMBLE",
+ "file": "trimble"
},
"oncore": {
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/cdc5ae9ff4e79418bcb5a35e6073216eff81a466
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160801/71ace007/attachment.html>
More information about the vc
mailing list