changeset 5:b22a888eb975

Remove page1_*_pressure - it appears to be old code and is unused.
author Daniel O'Connor <darius@dons.net.au>
date Thu, 11 Feb 2010 12:44:56 +1030
parents f561c7f130a0
children e0b32014ed14
files util.c wh1080.c wh1080.h
diffstat 3 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/util.c	Thu Feb 11 11:47:11 2010 +1030
+++ b/util.c	Thu Feb 11 12:44:56 2010 +1030
@@ -23,11 +23,11 @@
 
   if (lines == 0)
     printf ("\n"
-          "                     Page  sv    IT  IH   IDP    OT  OH   ODP    hPa     SL    abs    rel  Wind  Gust Dir Rain   CR    PR  \n");
+          "                    Page sv  IT   IH  IDP  OT   OH  ODP   hPa    SL     Wind  Gust Dir Rain  CR   PR\n");
 
   strftime (timestamp, STAMPSIZE, "%F %T", localtime (&readings->timestamp)); /* format time and date */
 
-  printf ("%17s %5x %3d %5.1f %3d %5.1f %5.1f %3d %5.1f %6.1f %6.1f %6.1f %6.1f %5.1f %5.1f %3s %4.1f %4.1f %4.1f\n",
+  printf ("%19s %4x %2d %4.1f %3d %4.1f %4.1f %3d %5.1f %6.1f %6.1f %5.1f %5.1f %3s %4.1f %4.1f %4.1f\n",
           timestamp,                            /* current time */
           readings->page,                       /* machine page number */
           readings->last_save_mins,             /* last save minutes (?) */
@@ -39,8 +39,6 @@
           readings->outside_dewpoint,           /* outside dewpoint */
           readings->pressure,                   /* absolute pressure, hPa */
           readings->pressure_sea_level,         /* sea level pressure, hPa */
-          readings->page1_abs_pressure,         /* absolute pressure, hPa */
-          readings->page1_rel_pressure,         /* relative pressure, hPa */
           readings->wind_speed,                 /* wind speed in km/h */
           readings->wind_gust,                  /* wind gust speed in km/h */
           readings->wind_direction_text,        /* wind direction */
--- a/wh1080.c	Thu Feb 11 11:47:11 2010 +1030
+++ b/wh1080.c	Thu Feb 11 12:44:56 2010 +1030
@@ -427,9 +427,6 @@
 
   set_dewpoints (readings);
   set_sea_level_pressure (readings);
-
-  /* Stuff from page 1 */
-  readings->page1_abs_pressure = ((float) page1.abs_pressure) / 10; /* absolute pressure, hPa */
 }
 
 /*
--- a/wh1080.h	Thu Feb 11 11:47:11 2010 +1030
+++ b/wh1080.h	Thu Feb 11 12:44:56 2010 +1030
@@ -133,8 +133,6 @@
   float outside_dewpoint;                       /* dewpoint temperature outside */
   float pressure;                               /* absolute pressure, hPa */
   float pressure_sea_level;                     /* relative sea level pressure, hPa */
-  float page1_abs_pressure;                     /* absolute pressure, hPa, from page 1 */
-  float page1_rel_pressure;                     /* relative pressure, hPa, from page 1 */
   float wind_speed;                             /* wind speed in km/h */
   float wind_gust;                              /* wind gust speed in km/h */
   float wind_direction;                         /* wind direction, as angle */