@@ -2,14 +2,14 @@

  Background Radiation Monitor - Web Server

  A simple web server that makes available to clients over the Internet

- readings from a MightyOhm Geiger counter. The MightyOhm is connected to

- an Arduino Uno with attached Ethernet shield.  This software module

+ readings from a MightyOhm Geiger counter. The MightyOhm is connected

+ to an Arduino Uno with attached Ethernet shield.  This software module

  runs on the Arduino Uno an embedded HTTP server by which Internet

  applications can query the MightyOhm for Geiger counter readings.

  Also, this software runs a Network Time Protocol (NTP) client, that

  periodically synchronizes the local system clock to network time.

- Included is a simple command line interface that may be used to change the

- network interface IP address, NTP server address, or configure a

+ Included is a simple command line interface that may be used to change

+ the network interface IP address, NTP server address, or configure a

  verbose output mode.

  Copyright 2018 Jeff Owrey

@@ -75,6 +75,13 @@

          NTP address set to "pool.ntp.org" per ntp.org request to use

          (in order to facilitate load balancing) the fully qualified

          domain name instead of individual server IP addresses.

+   * v18 released 01 Nov 2019 by J L Owrey

+       - fixed a bug in NTP time synchronization whereby the network time

+         synchronization would only occur during boot up.  Thereafter NTP 

+         time synchronization would fail to happen, resulting in a large 

+         amount of clock drift.

+

+12345678901234567890123456789012345678901234567890123456789012345678901234567890         

 */

 /***  PREPROCESSOR DEFINES  ***/

@@ -85,8 +92,8 @@

  Define the header and version number displayed at startup

  and also by the 'view settings' command.

 */

-#define STARTUP_HEADER "\n\rRadmon v1.7 (c) 2019\n"

-#define RADMON_VERSION "v1.7"

+#define STARTUP_HEADER "\n\rRadmon v1.8 (c) 2019"

+#define RADMON_VERSION "v1.8"

 /*

  The following define sets the MAC address of the device.  This

  address is a permanent attribute of the device's Ethernet interface,

@@ -95,7 +102,7 @@

  specific instance of the Ethernet shield.  This MAC address should

  be shown on a label affixed to the device housing.

 */

-#define ETHERNET_MAC_ADDRESS 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN

+#define ETHERNET_MAC_ADDRESS 0x90, 0xA2, 0xDA, 0x0D, 0x84, 0xF6

 /*

  The following defines an APIPA default address in the event that

  DHCP mode is ON and a DHCP address cannot be obtained.

@@ -106,7 +113,7 @@

  out over the device's USB port.  This heartbeat consists of a serial

  data string containing the current radiation reading and GM time.

 */

-#define SERIAL_UPDATE_INTERVAL 5000  //milli-seconds

+#define SERIAL_UPDATE_INTERVAL 1000  //milli-seconds

 /*

  The following define sets the port number the HTTP service will use to

  listen for requests from Internet clients.  Normally HTTP requests use

@@ -116,18 +123,19 @@

 /*

  The following defines are for configuring a local NTP client

  for synchronizing the local system clock to network time.

- Note that the default setting is the IP address of the following

- time server:

-              time-c-b.nist.gov

+ Note that the ntp server address should be sent to the local

+ server pool of the country where the radmon will be used.  See

+ the web site 'ntp.org' for details. Users in the USA should set

+ the ntp server to 'us.pool.ntp.org'.

 */

 #define DEFAULT_NTP_SERVER_ADDR "pool.ntp.org"

 #define NTP_PORT 8888

-#define NTP_PACKET_SIZE 48 // NTP time stamp is in the first 48 bytes of the message

+#define NTP_PACKET_SIZE 48 // NTP time in the first 48 bytes of the message

 /*

  The following defines how often the system clock gets synchronized

  to network time.

 */

-#define NET_SYNCH_INTERVAL 21600 //number in seconds - 4 times a day

+#define NTP_SYNCH_INTERVAL 43200 // number in seconds - 2 times a day

 /*

  Number of retries if first time server request fails.

 */

@@ -190,7 +198,7 @@ SoftwareSerial MightyOhmTxOut(5, 6);