Update message definitions

[~andy/csm213a-hw] / hw2 / messages.h

diff --git a/hw2/messages.h b/hw2/messages.h
index af40683c9628f79a340fd49069cdf60bc1d76b07..cefdecfeda6c15848948f72184f767bd43d574c5 100644 (file)
--- a/hw2/messages.h
+++ b/hw2/messages.h
@@ -22,7 +22,7 @@ typedef enum {
 } msgid_t;
 
 typedef struct {
-       uint32_t seconds;  // Seconds since 1970 (without leap seconds)
+       uint32_t seconds;  // Seconds since 1970
        uint32_t nanosec;  // Nanoseconds since 'seconds'
 } ntime_t;
 
@@ -36,9 +36,9 @@ typedef struct {
 typedef struct {
        uint16_t valid;    // Message valid bits
        uint16_t device;   // Device ID to use
+       ntime_t  world;    // World time (since 1970)
        ntime_t  start;    // Transmit start time 
        ntime_t  period;   // Transmit period
-       ntime_t  world;    // World time (since 1970)
 } init_msg_t;
 
 typedef struct {
@@ -49,7 +49,8 @@ typedef struct {
 typedef struct {
        uint16_t device;   // Device ID
        uint16_t event;    // Event ID
-       ntime_t  time;     // Timestamp
+       ntime_t  world;    // UTC Time of event
+       ntime_t  local;    // Time since turn-on
 } event_msg_t;
 
 #pragma pack()