From 3f83dcbdc560c232814302b705a66eabda11de07 Mon Sep 17 00:00:00 2001
From: Ray <ray@opensprinkler.com>
Date: Sun, 5 Jul 2015 22:09:07 -0400
Subject: [PATCH 01/39] add support to change weather script url in /su page;
 avoid sending static ip/gateway ip etc. if device is ospi/osbo/linux; log
 water level to sd card

---
 OpenSprinkler.cpp | 24 +++++-------------------
 OpenSprinkler.h   | 22 +++++++++++++---------
 defines.h         | 42 +++++++++++++++++++++++-------------------
 main.cpp          | 23 ++++++++---------------
 server.cpp        | 41 +++++++++++++++++++++++++++--------------
 weather.cpp       |  9 +++++----
 6 files changed, 81 insertions(+), 80 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 2a64a699..8096b276 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -37,8 +37,8 @@ byte OpenSprinkler::masop_bits[MAX_EXT_BOARDS+1];
 byte OpenSprinkler::ignrain_bits[MAX_EXT_BOARDS+1];
 byte OpenSprinkler::masop2_bits[MAX_EXT_BOARDS+1];
 byte OpenSprinkler::stndis_bits[MAX_EXT_BOARDS+1];
-byte OpenSprinkler::rfstn_bits[MAX_EXT_BOARDS+1];
 byte OpenSprinkler::stnseq_bits[MAX_EXT_BOARDS+1];
+byte OpenSprinkler::stnspe_bits[MAX_EXT_BOARDS+1];
 
 ulong OpenSprinkler::rainsense_start_time;
 ulong OpenSprinkler::raindelay_start_time;
@@ -48,7 +48,6 @@ ulong OpenSprinkler::checkwt_lasttime;
 ulong OpenSprinkler::checkwt_success_lasttime;
 ulong OpenSprinkler::network_lasttime;
 ulong OpenSprinkler::external_ip;
-byte OpenSprinkler::water_percent_avg;
 
 char tmp_buffer[TMP_BUFFER_SIZE+1];       // scratch buffer
 
@@ -767,19 +766,6 @@ void transmit_rfbit(ulong lenH, ulong lenL) {
 #endif
 }
 
-void OpenSprinkler::update_rfstation_bits() {
-  byte bid, s, sid;
-  for(bid=0;bid<(1+MAX_EXT_BOARDS);bid++) {
-    rfstn_bits[bid] = 0;
-    for(s=0;s<8;s++) {
-      sid = (bid<<3) | s;
-      if(get_station_name_rf(sid, NULL, NULL)) {
-        rfstn_bits[bid] |= (1<<s);
-      }
-    }
-  }
-}
-
 void send_rfsignal(ulong code, ulong len) {
   ulong len3 = len * 3;
   ulong len31 = len * 31;
@@ -846,7 +832,8 @@ void OpenSprinkler::options_setup() {
     // 3. write string parameters
     nvm_write_block(DEFAULT_PASSWORD, (void*)ADDR_NVM_PASSWORD, strlen(DEFAULT_PASSWORD)+1);
     nvm_write_block(DEFAULT_LOCATION, (void*)ADDR_NVM_LOCATION, strlen(DEFAULT_LOCATION)+1);
-    nvm_write_block(DEFAULT_JAVASCRIPT_URL, (void*)ADDR_NVM_SCRIPTURL, strlen(DEFAULT_JAVASCRIPT_URL)+1);
+    nvm_write_block(DEFAULT_JAVASCRIPT_URL, (void*)ADDR_NVM_JAVASCRIPTURL, strlen(DEFAULT_JAVASCRIPT_URL)+1);
+    nvm_write_block(DEFAULT_WEATHER_URL, (void*)ADDR_NVM_WEATHERURL, strlen(DEFAULT_WEATHER_URL)+1);    
     nvm_write_block(DEFAULT_WEATHER_KEY, (void*)ADDR_NVM_WEATHER_KEY, strlen(DEFAULT_WEATHER_KEY)+1);
 
     // 4. reset station names, default Sxx
@@ -890,9 +877,8 @@ void OpenSprinkler::options_setup() {
     station_attrib_bits_load(ADDR_NVM_MAS_OP_2, masop2_bits);
     station_attrib_bits_load(ADDR_NVM_STNDISABLE, stndis_bits);
     station_attrib_bits_load(ADDR_NVM_STNSEQ, stnseq_bits);
-    // set RF station flags
-    update_rfstation_bits();
-
+    station_attrib_bits_load(ADDR_NVM_STNSPE, stnspe_bits);
+    
     // 3. load non-volatile controller data
     nvdata_load();
   }
diff --git a/OpenSprinkler.h b/OpenSprinkler.h
index 12a8cb7b..c4ca0dac 100644
--- a/OpenSprinkler.h
+++ b/OpenSprinkler.h
@@ -58,6 +58,12 @@ struct NVConData {
   uint32_t rd_stop_time;  // rain delay stop time
 };
 
+/** Station special attribute data */
+struct StationSpecialData {
+  byte type;
+  byte data[MAX_STATION_SPECIAL_DATA];
+};
+
 /** Volatile controller status bits */
 struct ConStatus {
   byte enabled:1;           // operation enable (when set, controller operation is enabled)
@@ -101,12 +107,12 @@ class OpenSprinkler {
                                   // first byte-> master controller, second byte-> ext. board 1, and so on
   // station attributes
   static byte masop_bits[];       // master operation bits. each byte corresponds to a board (8 stations)
-  static byte ignrain_bits[];     // ignore rain bits. each byte corresponds to a board (8 stations)
-  static byte masop2_bits[];      // master2 operation bits. each byte corresponds to a board (8 stations)
-  static byte stndis_bits[];      // station disable bits. each byte corresponds to a board (8 stations)
-  static byte rfstn_bits[];       // RF station flags. each byte corresponds to a board (8 stations)
-  static byte stnseq_bits[];      // station sequential bits. each byte corresponds to a board (8 stations)
-
+  static byte ignrain_bits[];     // ignore rain bits.
+  static byte masop2_bits[];      // master2 operation bits.
+  static byte stndis_bits[];      // station disable bits.
+  static byte stnseq_bits[];      // station sequential bits.
+  static byte stnspe_bits[];      // station special bits. the bit marks if this is a non-standard station.
+  
   // variables for time keeping
   static ulong rainsense_start_time;  // time when the most recent rain sensor activation was detected
   static ulong raindelay_start_time;  // time when the most recent rain delay started
@@ -116,7 +122,6 @@ class OpenSprinkler {
   static ulong checkwt_success_lasttime; // time when weather check was successful
   static ulong network_lasttime;      // time when network was checked
   static ulong external_ip;           // external ip address
-  static byte  water_percent_avg;     // average water percentage over a day
 
   // member functions
   // -- setup
@@ -131,11 +136,10 @@ class OpenSprinkler {
   static void get_station_name(byte sid, char buf[]); // get station name
   static void set_station_name(byte sid, char buf[]); // set station name
   static uint16_t get_station_name_rf(byte sid, ulong *on, ulong *off); // get station name and parse into RF code
-  static void update_rfstation_bits();
   static void send_rfstation_signal(byte sid, bool status);
   static void station_attrib_bits_save(int addr, byte bits[]); // save station attribute bits to nvm
   static void station_attrib_bits_load(int addr, byte bits[]); // load station attribute bits from nvm
-
+  
   // -- options and data storeage
   static void nvdata_load();
   static void nvdata_save();
diff --git a/defines.h b/defines.h
index 66819248..1b59a26e 100644
--- a/defines.h
+++ b/defines.h
@@ -25,11 +25,11 @@
 #define _DEFINES_H
 
 /** Firmware version, hardware version, and maximal values */
-#define OS_FW_VERSION  215  // Firmware version: 215 means 2.1.5
+#define OS_FW_VERSION  216  // Firmware version: 216 means 2.1.6
                             // if this number is different from the one stored in non-volatile memory
                             // a device reset will be automatically triggered
 
-#define OS_FW_MINOR      1  // Firmware minor version
+#define OS_FW_MINOR      0  // Firmware minor version
 
 /** Hardware version base numbers */
 #define OS_HW_VERSION_BASE   0x00
@@ -46,29 +46,32 @@
 
 #define MAX_NUM_STATIONS  ((1+MAX_EXT_BOARDS)*8)  // maximum number of stations
 
-#define WEATHER_OPTS_FILENAME "wtopts.txt"    // the file where weather options are stored
+/** File names */
+#define WEATHER_OPTS_FILENAME "wtopts.txt"    // weather options file
+#define STATION_ATTR_FILENAME "stns.dat"      // station attributes data file
 
+#define MAX_STATION_SPECIAL_DATA  16
 /** Non-volatile memory (NVM) defines */
 #if defined(ARDUINO) 
 
 /** 2KB NVM data structure:
-  * |     |              |     |---STRING PARAMETERS---|               |----STATION ATTRIBUTES-----  |          |
-  * | UID | PROGRAM_DATA | CON | PWD | LOC | URL | KEY | STATION_NAMES | MAS | IGR | MAS2 | DIS | SEQ | OPTIONS  |
-  * | (8) |    (996)     | (8) |(32) |(48) |(64) |(32) | (6*8*16)=768  | (6) | (6) | (6)  | (6) | (6) |  (62)    |
-  * |     |              |     |     |     |     |     |               |     |     |      |     |     |          |
-  * 0     8            1004  1012   1044  1092  1156  1188            1956  1962  1968   1974 1980   1986       2048
+  * |         |     |  ---STRING PARAMETERS---      |           |   ----STATION ATTRIBUTES-----      |          |
+  * | PROGRAM | CON | PWD | LOC | JURL | WURL | KEY | STN_NAMES | MAS | IGR | MAS2 | DIS | SEQ | SPE | OPTIONS  |
+  * |  (996)  | (8) |(32) |(48) | (40) | (40) |(32) |   (768)   | (6) | (6) |  (6) | (6) | (6) | (6) |   (54)   |
+  * |         |     |     |     |      |      |     |           |     |     |      |     |     |     |          |
+  * 0        996  1004   1036  1084  1124   1164   1196        1964  1970  1976   1982  1988  1994  2000      2048
   */
 
   #define NVM_SIZE            2048  // For AVR, nvm data is stored in EEPROM
                                     // ATmega644 has 2KB EEPROM
   #define STATION_NAME_SIZE   16    // maximum number of characters in each station name
   
-  #define MAX_UIDDATA         8     // unique ID, 8 bytes max
   #define MAX_PROGRAMDATA     996   // program data, 996 bytes max
   #define MAX_NVCONDATA       8     // non-volatile controller data, 8 bytes max
   #define MAX_USER_PASSWORD   32    // user password, 32 bytes max
   #define MAX_LOCATION        48    // location string, 48 bytes max
-  #define MAX_SCRIPTURL       64    // javascript url, 64 bytes max
+  #define MAX_JAVASCRIPTURL   40    // javascript url, 40 bytes max
+  #define MAX_WEATHERURL      40    // weather script url, 40 bytes max
   #define MAX_WEATHER_KEY     32    // weather api key, 32 bytes max
   
 #else // NVM defines for RPI/BBB/LINUX
@@ -79,38 +82,39 @@
   #define NVM_SIZE            2048 // impose a file size limit: 64KB
   #define STATION_NAME_SIZE   16    // maximum number of characters in each station name
   
-  #define MAX_UIDDATA         8     // unique ID, 8 bytes max
   #define MAX_PROGRAMDATA     996  // program data, 3984 bytes max
   #define MAX_NVCONDATA       8     // non-volatile controller data, 8 bytes max
   #define MAX_USER_PASSWORD   32    // user password, 32 bytes max
   #define MAX_LOCATION        48    // location string, 48 bytes max
-  #define MAX_SCRIPTURL       64    // javascript url, 64 bytes max
+  #define MAX_JAVASCRIPTURL   40    // javascript url, 40 bytes max
+  #define MAX_WEATHERURL      40    // weather script url, 40 bytes max
   #define MAX_WEATHER_KEY     32    // weather api key, 32 bytes max
     
 #endif  // end of NVM defines
 
 /** NVM data addresses */
-#define ADDR_NVM_UID           0
-#define ADDR_NVM_PROGRAMS      (ADDR_NVM_UID+MAX_UIDDATA)   // program starting address
+#define ADDR_NVM_PROGRAMS      (0)   // program starting address
 #define ADDR_NVM_NVCONDATA     (ADDR_NVM_PROGRAMS+MAX_PROGRAMDATA)
 #define ADDR_NVM_PASSWORD      (ADDR_NVM_NVCONDATA+MAX_NVCONDATA)
 #define ADDR_NVM_LOCATION      (ADDR_NVM_PASSWORD+MAX_USER_PASSWORD)
-#define ADDR_NVM_SCRIPTURL     (ADDR_NVM_LOCATION+MAX_LOCATION)
-#define ADDR_NVM_WEATHER_KEY   (ADDR_NVM_SCRIPTURL+MAX_SCRIPTURL)
+#define ADDR_NVM_JAVASCRIPTURL (ADDR_NVM_LOCATION+MAX_LOCATION)
+#define ADDR_NVM_WEATHERURL    (ADDR_NVM_JAVASCRIPTURL+MAX_JAVASCRIPTURL)
+#define ADDR_NVM_WEATHER_KEY   (ADDR_NVM_WEATHERURL+MAX_WEATHERURL)
 #define ADDR_NVM_STN_NAMES     (ADDR_NVM_WEATHER_KEY+MAX_WEATHER_KEY)
 #define ADDR_NVM_MAS_OP        (ADDR_NVM_STN_NAMES+MAX_NUM_STATIONS*STATION_NAME_SIZE) // master op bits
 #define ADDR_NVM_IGNRAIN       (ADDR_NVM_MAS_OP+(MAX_EXT_BOARDS+1))  // ignore rain bits 
 #define ADDR_NVM_MAS_OP_2      (ADDR_NVM_IGNRAIN+(MAX_EXT_BOARDS+1)) // master2 op bits
 #define ADDR_NVM_STNDISABLE    (ADDR_NVM_MAS_OP_2+(MAX_EXT_BOARDS+1))// station disable bits
 #define ADDR_NVM_STNSEQ        (ADDR_NVM_STNDISABLE+(MAX_EXT_BOARDS+1))// station sequential bits
-#define ADDR_NVM_OPTIONS       (ADDR_NVM_STNSEQ+(MAX_EXT_BOARDS+1))  // options
+#define ADDR_NVM_STNSPE        (ADDR_NVM_STNSEQ+(MAX_EXT_BOARDS+1)) // station special bits (i.e. non-standard stations)
+#define ADDR_NVM_OPTIONS       (ADDR_NVM_STNSPE+(MAX_EXT_BOARDS+1))  // options
 
 /** Default password, location string, weather key, script urls */
 #define DEFAULT_PASSWORD          "opendoor"
 #define DEFAULT_LOCATION          "Boston,MA"
 #define DEFAULT_WEATHER_KEY       ""
-#define DEFAULT_JAVASCRIPT_URL    "https://ui.opensprinkler.com/js"
-#define WEATHER_SCRIPT_HOST       "weather.opensprinkler.com"
+#define DEFAULT_JAVASCRIPT_URL    "http://ui.opensprinkler.com/js"
+#define DEFAULT_WEATHER_URL       "weather.opensprinkler.com"
 
 /** Macro define of each option 
   * Refer to OpenSprinkler.cpp for details on each option
diff --git a/main.cpp b/main.cpp
index b5dcbd48..f00d901c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -262,7 +262,6 @@ void process_dynamic_events(ulong curr_time);
 void check_network();
 void check_weather();
 void perform_ntp_sync();
-void log_statistics(time_t curr_time);
 void delete_log(char *name);
 void analyze_get_url(char *p);
 
@@ -439,10 +438,10 @@ void do_loop()
 
               // upon turning on station, process RF
               // if the station is a RF station
-              if(os.rfstn_bits[bid]&(1<<s)) {
+              /*if(os.rfstn_bits[bid]&(1<<s)) {
                 // send RF on signal
                 os.send_rfstation_signal(sid, true);
-              }
+              }*/
             } //if curr_time > scheduled_start_time
           } // if current station is not running
         }//end_s
@@ -574,8 +573,6 @@ void do_loop()
     // check weather
     check_weather();
 
-    // calculate statistics
-    log_statistics(curr_time);
   }
 
   #if !defined(ARDUINO)
@@ -598,12 +595,11 @@ void check_weather() {
   if (!os.checkwt_lasttime || (ntz > os.checkwt_lasttime + CHECK_WEATHER_TIMEOUT)) {
     os.checkwt_lasttime = ntz;
     GetWeather();
+    write_log(LOGDATA_WATERLEVEL, ntz); // warning: water level may update a few seconds after getweather is called
   }
 }
 
 void turn_off_station(byte sid, ulong curr_time) {
-  byte bid = sid>>3;
-  byte s = sid&0x07;
   os.set_station_bit(sid, 0);
 
   // ignore if we are turning off a station that's not running or scheduled to run
@@ -623,10 +619,10 @@ void turn_off_station(byte sid, ulong curr_time) {
 
     // upon turning off station, process RF station
     // if the station is a RF station
-    if(os.rfstn_bits[bid]&(1<<s)) {
+    /*if(os.rfstn_bits[bid]&(1<<s)) {
       // turn off station
       os.send_rfstation_signal(sid, false);
-    }
+    }*/
   }
 
   // reset program run-time data variables
@@ -806,7 +802,7 @@ const char *log_type_names[] = {
   "wl"
 };
 
-void log_statistics(time_t curr_time) {
+/*void log_statistics(time_t curr_time) {
   static byte stat_n = 0;
   static ulong stat_lasttime = 0;
   // update statistics once 15 minutes
@@ -823,7 +819,7 @@ void log_statistics(time_t curr_time) {
       stat_n = 0;
     }
   }
-}
+}*/
 
 // write run record to log on SD card
 void write_log(byte type, ulong curr_time) {
@@ -879,16 +875,13 @@ void write_log(byte type, ulong curr_time) {
     strcat_P(tmp_buffer, PSTR("\","));
     switch(type) {
       case LOGDATA_RAINSENSE:
-        //str += (curr_time - os.rainsense_start_time);
         ultoa((curr_time - os.rainsense_start_time), tmp_buffer+strlen(tmp_buffer), 10);
         break;
       case LOGDATA_RAINDELAY:
-        //str += (curr_time - os.raindelay_start_time);
         ultoa((curr_time - os.raindelay_start_time), tmp_buffer+strlen(tmp_buffer), 10);
         break;
       case LOGDATA_WATERLEVEL:
-        //str += os.water_percent_avg;
-        itoa(os.water_percent_avg, tmp_buffer+strlen(tmp_buffer), 10);
+        itoa(os.options[OPTION_WATER_PERCENTAGE].value, tmp_buffer+strlen(tmp_buffer), 10);
         break;
     }
   }
diff --git a/server.cpp b/server.cpp
index 1ce931f1..7dc047ed 100644
--- a/server.cpp
+++ b/server.cpp
@@ -376,8 +376,8 @@ void server_json_stations_main()
   server_json_stations_attrib(PSTR("ignore_rain"), os.ignrain_bits);
   server_json_stations_attrib(PSTR("masop2"), os.masop2_bits);
   server_json_stations_attrib(PSTR("stn_dis"), os.stndis_bits);
-  server_json_stations_attrib(PSTR("rfstn"), os.rfstn_bits);
   server_json_stations_attrib(PSTR("stn_seq"), os.stnseq_bits);
+  server_json_stations_attrib(PSTR("stn_spe"), os.stnspe_bits);
   bfill.emit_p(PSTR("\"snames\":["));
   byte sid;
   for(sid=0;sid<os.nstations;sid++) {
@@ -438,23 +438,24 @@ byte server_change_stations(char *p)
     }
   }
 
-  server_change_stations_attrib(p, 'm', os.masop_bits);
+  server_change_stations_attrib(p, 'm', os.masop_bits); // master1
   os.station_attrib_bits_save(ADDR_NVM_MAS_OP, os.masop_bits);
 
-  server_change_stations_attrib(p, 'i', os.ignrain_bits);
+  server_change_stations_attrib(p, 'i', os.ignrain_bits); // ignore rain
   os.station_attrib_bits_save(ADDR_NVM_IGNRAIN, os.ignrain_bits);
 
-  server_change_stations_attrib(p, 'n', os.masop2_bits);
+  server_change_stations_attrib(p, 'n', os.masop2_bits); // master2
   os.station_attrib_bits_save(ADDR_NVM_MAS_OP_2, os.masop2_bits);
 
-  server_change_stations_attrib(p, 'd', os.stndis_bits);
+  server_change_stations_attrib(p, 'd', os.stndis_bits); // disable
   os.station_attrib_bits_save(ADDR_NVM_STNDISABLE, os.stndis_bits);
 
-  os.update_rfstation_bits();
-
-  server_change_stations_attrib(p, 'q', os.stnseq_bits);
+  server_change_stations_attrib(p, 'q', os.stnseq_bits); // sequential
   os.station_attrib_bits_save(ADDR_NVM_STNSEQ, os.stnseq_bits);
 
+  server_change_stations_attrib(p, 'p', os.stnseq_bits); // special
+  os.station_attrib_bits_save(ADDR_NVM_STNSPE, os.stnspe_bits);
+
   return HTML_SUCCESS;
 }
 
@@ -658,6 +659,12 @@ byte server_change_program(char *p) {
 void server_json_options_main() {
   byte oid;
   for(oid=0;oid<NUM_OPTIONS;oid++) {
+    #if !defined(ARDUINO) // do not send the following parameters for non-Arduino platforms
+    if (oid==OPTION_USE_NTP     || oid==OPTION_USE_DHCP    ||
+        oid==OPTION_STATIC_IP1  || oid==OPTION_STATIC_IP2  || oid==OPTION_STATIC_IP3  || oid==OPTION_STATIC_IP4  ||
+        oid==OPTION_GATEWAY_IP1 || oid==OPTION_GATEWAY_IP2 || oid==OPTION_GATEWAY_IP3 || oid==OPTION_GATEWAY_IP4)
+        continue;
+    #endif
     int32_t v=os.options[oid].value;
     if (oid==OPTION_MASTER_OFF_ADJ || oid==OPTION_MASTER_OFF_ADJ_2) {v-=60;}
     if (oid==OPTION_STATION_DELAY_TIME) {v=water_time_decode_signed(v);}
@@ -668,7 +675,8 @@ void server_json_options_main() {
     }
     #else
     if (oid==OPTION_BOOST_TIME) continue;
-    #endif    
+    #endif
+   
     if (os.options[oid].json_str==0) continue;
     if (oid==OPTION_DEVICE_ID && os.status.has_hwmac) continue; // do not send DEVICE ID if hardware MAC exists
     bfill.emit_p(PSTR("\"$F\":$D"),
@@ -738,7 +746,7 @@ byte server_json_programs(char *p)
 /** Output script url form */
 byte server_view_scripturl(char *p) {
   print_html_standard_header();
-  bfill.emit_p(PSTR("<hr /><form name=of action=cu method=get><p><b>Script URL:</b><input type=text size=32 maxlength=127 value=\"$E\" name=jsp></p><p>Default is $S<br />If local on uSD card, use ./</p><p><b>Password:</b><input type=password size=32 name=pw><input type=submit></p><hr /></form><script src=https://ui.opensprinkler.com/js/hasher.js></script>"), ADDR_NVM_SCRIPTURL, DEFAULT_JAVASCRIPT_URL);
+  bfill.emit_p(PSTR("<form name=of action=cu method=get><table cellspacing=\"12\"><tr><td><b>JavaScript</b>:</td><td><input type=text size=40 maxlength=40 value=\"$E\" name=jsp></td></tr><tr><td>Default:</td><td>$S</td></tr><tr><td><b>Weather</b>:</td><td><input type=text size=40 maxlength=40 value=\"$E\" name=wsp></td></tr><tr><td>Default:</td><td>$S</td></tr><tr><td><b>Password</b>:</td><td><input type=password size=32 name=pw> <input type=submit></td></tr></table></form><script src=https://ui.opensprinkler.com/js/hasher.js></script>"), ADDR_NVM_JAVASCRIPTURL, DEFAULT_JAVASCRIPT_URL, ADDR_NVM_WEATHERURL, DEFAULT_WEATHER_URL);
   return HTML_OK;
 }
 
@@ -809,7 +817,7 @@ byte server_home(char *p)
   // send server variables and javascript packets
   bfill.emit_p(PSTR("var ver=$D,ipas=$D;</script>\n"),
                OS_FW_VERSION, os.options[OPTION_IGNORE_PASSWORD].value);
-  bfill.emit_p(PSTR("<script src=\"$E/home.js\"></script>\n</body>\n</html>"), ADDR_NVM_SCRIPTURL);
+  bfill.emit_p(PSTR("<script src=\"$E/home.js\"></script>\n</body>\n</html>"), ADDR_NVM_JAVASCRIPTURL);
   return HTML_OK;
 }
 
@@ -882,11 +890,16 @@ byte server_change_scripturl(char *p)
 #endif
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("jsp"), true)) {
     urlDecode(tmp_buffer);
-    tmp_buffer[MAX_SCRIPTURL]=0;  // make sure we don't exceed the maximum size
+    tmp_buffer[MAX_JAVASCRIPTURL]=0;  // make sure we don't exceed the maximum size
     // trim unwanted space characters
     string_remove_space(tmp_buffer);
-    //os.nvm_string_set(ADDR_NVM_SCRIPTURL, tmp_buffer);
-    nvm_write_block(tmp_buffer, (void *)ADDR_NVM_SCRIPTURL, strlen(tmp_buffer)+1);
+    nvm_write_block(tmp_buffer, (void *)ADDR_NVM_JAVASCRIPTURL, strlen(tmp_buffer)+1);
+  } 
+  if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("wsp"), true)) {
+    urlDecode(tmp_buffer);
+    tmp_buffer[MAX_WEATHERURL]=0;
+    string_remove_space(tmp_buffer);
+    nvm_write_block(tmp_buffer, (void *)ADDR_NVM_WEATHERURL, strlen(tmp_buffer)+1);
   }
   return HTML_REDIRECT_HOME;
 }
diff --git a/weather.cpp b/weather.cpp
index 9e38c26f..656efe2e 100644
--- a/weather.cpp
+++ b/weather.cpp
@@ -43,7 +43,7 @@ byte findKeyVal (const char *str,char *strbuf, uint8_t maxlen,const char *key,bo
 
 // The weather function calls getweather.py on remote server to retrieve weather data
 // the default script is WEATHER_SCRIPT_HOST/weather?.py
-static char website[] PROGMEM = WEATHER_SCRIPT_HOST ;
+//static char website[] PROGMEM = DEFAULT_WEATHER_URL ;
 
 static void getweather_callback(byte status, uint16_t off, uint16_t len) {
 #if defined(ARDUINO)
@@ -102,7 +102,8 @@ static void getweather_callback(byte status, uint16_t off, uint16_t len) {
 void GetWeather() {
   // check if we've already done dns lookup
   if(ether.hisip[0] == 0) {
-    ether.dnsLookup(website);
+    nvm_read_block(tmp_buffer, (void*)ADDR_NVM_WEATHERURL, MAX_WEATHERURL);
+    ether.dnsLookup(tmp_buffer, true);
   }
 
   //bfill=ether.tcpOffset();
@@ -137,7 +138,7 @@ void GetWeather() {
   
   uint16_t _port = ether.hisport; // save current port number
   ether.hisport = 80;
-  ether.browseUrl(PSTR("/weather"), dst, website, getweather_callback);
+  ether.browseUrl(PSTR("/weather"), dst, PSTR("*"), getweather_callback);
   ether.hisport = _port;
 }
 
@@ -175,7 +176,7 @@ void GetWeather() {
 
   static struct hostent *server = NULL;
   if (!server) {
-    strcpy(tmp_buffer, WEATHER_SCRIPT_HOST);
+    nvm_read_block(tmp_buffer, (void*)ADDR_NVM_WEATHERURL, MAX_WEATHERURL);
     server = gethostbyname(tmp_buffer);
     if (!server) {
       DEBUG_PRINTLN("can't resolve weather server");

From 6532721a3ed8e5066ac40995d1a65f26e3d4cbed Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Fri, 24 Jul 2015 12:11:06 -0400
Subject: [PATCH 02/39] preparation for storing station attributes to SD card.
 add support to detect executable path on Linux

---
 OpenSprinkler.cpp | 29 +++++++++++++++++++----------
 defines.h         | 10 ++++++++--
 server.cpp        |  7 ++++---
 utils.cpp         | 39 ++++++++++++++++++++++++++++++++-------
 utils.h           |  4 +++-
 weather.cpp       |  6 +++---
 6 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 8096b276..cceb8695 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -52,9 +52,11 @@ ulong OpenSprinkler::external_ip;
 char tmp_buffer[TMP_BUFFER_SIZE+1];       // scratch buffer
 
 #if defined(ARDUINO)
-  prog_char wtopts_name[] PROGMEM = WEATHER_OPTS_FILENAME;
+  prog_char wtopts_filename[] PROGMEM = WEATHER_OPTS_FILENAME;
+  prog_char stns_filename[]   PROGMEM = STATION_ATTR_FILENAME;
 #else
-  char wtopts_name[] = WEATHER_OPTS_FILENAME;
+  char wtopts_filename[] = WEATHER_OPTS_FILENAME;
+  char stns_filename[]   = STATION_ATTR_FILENAME;
 #endif
 
 #if defined(ARDUINO)
@@ -536,6 +538,8 @@ void OpenSprinkler::begin() {
   if (RTC.detect()==0) {
     status.has_rtc = 1;
   }
+#else
+  DEBUG_PRINTLN(get_runtime_path());
 #endif
 }
 
@@ -824,19 +828,17 @@ void OpenSprinkler::options_setup() {
       nvm_write_block(tmp_buffer, (void*)i, nbytes);
     }
 
-    // 1. write program data default parameters
-
-    // 2. write non-volatile controller status
+    // 1. write non-volatile controller status
     nvdata_save();
 
-    // 3. write string parameters
+    // 2. write string parameters
     nvm_write_block(DEFAULT_PASSWORD, (void*)ADDR_NVM_PASSWORD, strlen(DEFAULT_PASSWORD)+1);
     nvm_write_block(DEFAULT_LOCATION, (void*)ADDR_NVM_LOCATION, strlen(DEFAULT_LOCATION)+1);
     nvm_write_block(DEFAULT_JAVASCRIPT_URL, (void*)ADDR_NVM_JAVASCRIPTURL, strlen(DEFAULT_JAVASCRIPT_URL)+1);
     nvm_write_block(DEFAULT_WEATHER_URL, (void*)ADDR_NVM_WEATHERURL, strlen(DEFAULT_WEATHER_URL)+1);    
     nvm_write_block(DEFAULT_WEATHER_KEY, (void*)ADDR_NVM_WEATHER_KEY, strlen(DEFAULT_WEATHER_KEY)+1);
 
-    // 4. reset station names, default Sxx
+    // 3. reset station names and special attributes, default Sxx
     tmp_buffer[0]='S';
     tmp_buffer[3]=0;
     for(i=ADDR_NVM_STN_NAMES, sn=1; i<ADDR_NVM_MAS_OP; i+=STATION_NAME_SIZE, sn++) {
@@ -845,7 +847,13 @@ void OpenSprinkler::options_setup() {
       nvm_write_block(tmp_buffer, (void*)i, strlen(tmp_buffer)+1);
     }
 
-    // 5. reset station attributes
+    DEBUG_PRINTLN("write special data");
+    tmp_buffer[0]=STN_TYPE_STANDARD;
+    int stepsize=sizeof(StationSpecialData);
+    for(i=0;i<MAX_NUM_STATIONS;i++) {
+        write_to_file(stns_filename, tmp_buffer, stepsize, i*stepsize, false);
+    }
+    // 4. reset station attribute bits
     // since we wiped out nvm, only non-zero attributes need to be initialized
     for(i=0;i<MAX_EXT_BOARDS+1;i++) {
       tmp_buffer[i]=0xff;
@@ -853,11 +861,12 @@ void OpenSprinkler::options_setup() {
     nvm_write_block(tmp_buffer, (void*)ADDR_NVM_MAS_OP, MAX_EXT_BOARDS+1);
     nvm_write_block(tmp_buffer, (void*)ADDR_NVM_STNSEQ, MAX_EXT_BOARDS+1);
 
+    // 5. delete sd file
+    remove_file(wtopts_filename);
+
     // 6. write options
     options_save(); // write default option values
     
-    // 7. delete sd files
-    remove_file(wtopts_name);
     //======== END OF NVM RESET CODE ========
 
     // restart after resetting NVM.
diff --git a/defines.h b/defines.h
index 1b59a26e..b5d3c525 100644
--- a/defines.h
+++ b/defines.h
@@ -49,8 +49,14 @@
 /** File names */
 #define WEATHER_OPTS_FILENAME "wtopts.txt"    // weather options file
 #define STATION_ATTR_FILENAME "stns.dat"      // station attributes data file
-
 #define MAX_STATION_SPECIAL_DATA  16
+
+/** Station type macro defines */
+#define STN_TYPE_STANDARD    0x00
+#define STN_TYPE_RF          0x01
+#define STN_TYPE_REMOTE      0x02
+#define STN_TYPE_OTHER       0xFF
+
 /** Non-volatile memory (NVM) defines */
 #if defined(ARDUINO) 
 
@@ -299,7 +305,7 @@ typedef enum {
   #define ETHER_BUFFER_SIZE   16384
     
   #define DEBUG_BEGIN(x)          {}  /** Serial debug functions */
-  //#define ENABLE_DEBUG
+  #define ENABLE_DEBUG
   #if defined(ENABLE_DEBUG)
     inline  void DEBUG_PRINT(int x) {printf("%d", x);}
     inline  void DEBUG_PRINT(const char*s) {printf("%s", s);}
diff --git a/server.cpp b/server.cpp
index 7dc047ed..a5d2c99a 100644
--- a/server.cpp
+++ b/server.cpp
@@ -109,7 +109,8 @@ static prog_uchar htmlReturnHome[] PROGMEM =
   "<script>window.location=\"/\";</script>\n"
 ;
 
-extern const char wtopts_name[];
+extern const char wtopts_filename[];
+extern const char stns_filename[];
 
 #if defined(ARDUINO)
 void print_html_standard_header() {
@@ -792,7 +793,7 @@ void server_json_controller_main() {
     }
   }
 
-  if(read_from_file(wtopts_name, tmp_buffer)) {
+  if(read_from_file(wtopts_filename, tmp_buffer)) {
     bfill.emit_p(PSTR(",\"wto\":{$S}"), tmp_buffer);
   }
   bfill.emit_p(PSTR("}"));
@@ -998,7 +999,7 @@ byte server_change_options(char *p)
     urlDecode(tmp_buffer);
     tmp_buffer[TMP_BUFFER_SIZE]=0;
     // store weather key
-    write_to_file(wtopts_name, tmp_buffer);
+    write_to_file(wtopts_filename, tmp_buffer, strlen(tmp_buffer));
     weather_change = true;
   }
   if (err) {
diff --git a/utils.cpp b/utils.cpp
index 1c359778..cc632cb4 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -31,18 +31,21 @@ extern char tmp_buffer[];
 #include "SdFat.h"
 extern SdFat sd;
 
-void write_to_file(const char *name, const char *data) {
+void write_to_file(const char *name, const char *data, int size, int pos, bool trunc) {
   if (!os.status.has_sd)  return;
   
   char *fn = tmp_buffer+TMP_BUFFER_SIZE-12;
   strcpy_P(fn, name);
   sd.chdir("/");
   SdFile file;
-  int ret = file.open(fn, O_CREAT | O_WRITE | O_TRUNC);
+  int flag = O_CREAT | O_WRITE;
+  if (trunc) flag |= O_TRUNC;
+  int ret = file.open(fn, flag);
   if(!ret) {
     return;
-  }    
-  file.write(data);
+  }
+  file.seekSet(pos);
+  file.write(data, size);
   file.close();  
 }
 
@@ -127,13 +130,21 @@ void nvm_write_byte(const byte *p, byte v) {
   }
 }
 
-void write_to_file(const char *name, const char *data) {
+void write_to_file(const char *name, const char *data, int size, int pos, bool trunc) {
   FILE *file;
-  file = fopen(name, "wb");
+  if(trunc) {
+    file = fopen(name, "wb");
+  } else {
+    file = fopen(name, "r+b");
+    if(!file) {
+        file = fopen(name, "wb");
+    }
+  }
 
   if (!file) { return; }
   
-  fwrite(data, 1, strlen(data), file);
+  fseek(file, pos, SEEK_SET);
+  fwrite(data, 1, size, file);
   fclose(file);
 }
 
@@ -165,6 +176,20 @@ void remove_file(const char *name) {
   remove(name);
 }
 
+char* get_runtime_path() {
+  static char path[PATH_MAX];
+  if(readlink("/proc/self/exe", path, PATH_MAX ) <= 0) {
+    return NULL;
+  }
+  char* path_end = strrchr(path, '/');
+  if(path_end == NULL) {
+    return NULL;
+  }
+  path_end++;
+  *path_end=0;
+  return path;
+}
+
 #if defined(OSPI)
 unsigned int detect_rpi_rev() {
   FILE * filp;
diff --git a/utils.h b/utils.h
index a08f553d..3d1881b9 100644
--- a/utils.h
+++ b/utils.h
@@ -28,6 +28,7 @@
 
 #else // headers for RPI/BBB
   #include <stdio.h>
+  #include <limits.h>
 #endif
 #include "defines.h"
 
@@ -37,7 +38,7 @@ uint16_t water_time_decode(byte i);
 ulong water_time_resolve(uint16_t v);
 byte water_time_encode_signed(int16_t i);
 int16_t water_time_decode_signed(byte i);
-void write_to_file(const char *name, const char *data);
+void write_to_file(const char *name, const char *data, int size, int pos=0, bool trunc=true);
 bool read_from_file(const char *name, char *data, int maxsize=TMP_BUFFER_SIZE);
 void remove_file(const char *name);
 #if defined(ARDUINO)
@@ -50,6 +51,7 @@ void remove_file(const char *name);
   void nvm_write_block(const void *src, void *dst, int len);
   byte nvm_read_byte(const byte *p);
   void nvm_write_byte(const byte *p, byte v);
+  char* get_runtime_path();
 #if defined(OSPI)
   unsigned int detect_rpi_rev();
 #endif
diff --git a/weather.cpp b/weather.cpp
index 656efe2e..9477f106 100644
--- a/weather.cpp
+++ b/weather.cpp
@@ -31,7 +31,7 @@
 extern char ether_buffer[];
 #endif
 
-extern const char wtopts_name[];
+extern const char wtopts_filename[];
 
 #include "OpenSprinkler.h"
 #include "utils.h"
@@ -108,7 +108,7 @@ void GetWeather() {
 
   //bfill=ether.tcpOffset();
   char tmp[30];
-  read_from_file(wtopts_name, tmp, 30);
+  read_from_file(wtopts_filename, tmp, 30);
   BufferFiller bf = (uint8_t*)tmp_buffer;
   bf.emit_p(PSTR("$D.py?loc=$E&key=$E&fwv=$D&wto=$S"),
                 (int) os.options[OPTION_USE_WEATHER].value,
@@ -200,7 +200,7 @@ void GetWeather() {
 
   BufferFiller bf = tmp_buffer;
   char tmp[100];
-  read_from_file(wtopts_name, tmp, 100);
+  read_from_file(wtopts_filename, tmp, 100);
   bf.emit_p(PSTR("$D.py?loc=$E&key=$E&fwv=$D&wto=$S"),
                 (int) os.options[OPTION_USE_WEATHER].value,
                 ADDR_NVM_LOCATION,

From 56ec0c29ed03a3d412cf2ed775e8351b6e5e416c Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Fri, 24 Jul 2015 16:58:59 -0400
Subject: [PATCH 03/39] add support to handle POST requests

---
 main.cpp   | 30 ++++-------------------
 server.cpp | 72 +++++++++++++++++++++++++++++++-----------------------
 2 files changed, 46 insertions(+), 56 deletions(-)

diff --git a/main.cpp b/main.cpp
index f00d901c..6cefabd4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -52,7 +52,6 @@ EthernetClient *m_client = 0;
 #define NTP_SYNC_TIMEOUT        86403L  // NYP sync timeout, 24 hrs
 #define RTC_SYNC_INTERVAL       60      // RTC sync interval, 60 secs
 #define CHECK_NETWORK_TIMEOUT   59      // Network checking timeout, 59 secs
-#define STAT_UPDATE_TIMEOUT     900     // Statistics update timeout: 15 mins
 #define CHECK_WEATHER_TIMEOUT   3601    // Weather check interval: 1 hour
 #define CHECK_WEATHER_SUCCESS_TIMEOUT 86433L // Weather check success interval: 24 hrs
 #define LCD_BACKLIGHT_TIMEOUT   15      // LCD backlight timeout: 15 secs
@@ -263,14 +262,13 @@ void check_network();
 void check_weather();
 void perform_ntp_sync();
 void delete_log(char *name);
-void analyze_get_url(char *p);
+void handle_web_request(char *p);
 
 /** Main Loop */
 void do_loop()
 {
   static ulong last_time = 0;
   static ulong last_minute = 0;
-  static uint16_t pos;
 
   byte bid, sid, s, pid, bitvalue;
   ProgramStruct prog;
@@ -280,9 +278,9 @@ void do_loop()
   time_t curr_time = os.now_tz();
   // ====== Process Ethernet packets ======
 #if defined(ARDUINO)  // Process Ethernet packets for Arduino
-  pos=ether.packetLoop(ether.packetReceive());
+  uint16_t pos=ether.packetLoop(ether.packetReceive());
   if (pos>0) {  // packet received
-    analyze_get_url((char*)Ethernet::buffer+pos);
+    handle_web_request((char*)Ethernet::buffer+pos);
   }
   wdt_reset();  // reset watchdog timer
   wdt_timeout = 0;
@@ -302,7 +300,8 @@ void do_loop()
         }
       } else {
         m_client = &client;
-        analyze_get_url(ether_buffer);
+        ether_buffer[len] = 0;  // put a zero at the end of the packet
+        handle_web_request(ether_buffer);
         m_client = 0;
         break;
       }
@@ -802,25 +801,6 @@ const char *log_type_names[] = {
   "wl"
 };
 
-/*void log_statistics(time_t curr_time) {
-  static byte stat_n = 0;
-  static ulong stat_lasttime = 0;
-  // update statistics once 15 minutes
-  if (curr_time > stat_lasttime + STAT_UPDATE_TIMEOUT) {
-    stat_lasttime = curr_time;
-    ulong wp_total = os.water_percent_avg;
-    wp_total = wp_total * stat_n;
-    wp_total += os.options[OPTION_WATER_PERCENTAGE].value;
-    stat_n ++;
-    os.water_percent_avg = byte(wp_total / stat_n);
-    // writes every 4*24 times (1 day)
-    if (stat_n == 96) {
-      write_log(LOGDATA_WATERLEVEL, curr_time);
-      stat_n = 0;
-    }
-  }
-}*/
-
 // write run record to log on SD card
 void write_log(byte type, ulong curr_time) {
   if (!os.options[OPTION_ENABLE_LOGGING].value) return;
diff --git a/server.cpp b/server.cpp
index a5d2c99a..3bf3ebc8 100644
--- a/server.cpp
+++ b/server.cpp
@@ -57,7 +57,7 @@ void check_weather(time_t curr_time);
 void perform_ntp_sync(time_t curr_time);
 void log_statistics(time_t curr_time);
 void delete_log(char *name);
-void analyze_get_url(char *p);
+void handle_ether_request(char *p);
 void reset_all_stations_immediate();
 void reset_all_stations();
 void make_logfile_name(char *name);
@@ -810,7 +810,7 @@ byte server_json_controller(char *p)
 }
 
 /** Output homepage */
-byte server_home(char *p)
+byte server_home()
 {
   print_html_standard_header();
   bfill.emit_p(PSTR("<!DOCTYPE html>\n<html>\n<head>\n$F</head>\n<body>\n<script>"), htmlMobileHeader);
@@ -1333,60 +1333,70 @@ URLStruct urls[] = {
 
 };
 
-// analyze the current url
-void analyze_get_url(char *p)
+// handle Ethernet request
+void handle_web_request(char *p)
 {
 #if defined(ARDUINO)
   ether.httpServerReplyAck();
 #endif
   rewind_ether_buffer();
 
-  // the tcp packet usually starts with 'GET /' -> 5 chars
-  char *str = p+5;
+  char *com = p;
+  char *dat = NULL;
+  // check if this is GET or POST request
+  if (strncmp(p, "GET", 3)==0) {  // this is GET request
+    com = p+5;
+    dat = com+3;
+  } else {  // this is POST request
+    com = p+6;
+    dat = com;
+    bool clb = true;
+    char c;
+    while(*dat) {
+      c = *dat;
+      if(c=='\n' && clb) {
+        dat++;
+        break;
+      }
+      if(c=='\n') {
+        clb = true;
+      } else if (c!='\r') {
+        clb = false;
+      }
+      dat++;
+    }
+  }
 
-  if(str[0]==' ') {
-    server_home(str);  // home page handler
+  if(com[0]==' ') {
+    server_home();  // home page handler
     send_packet(true);
   } else {
     // server funtion handlers
     byte i;
-    // scan to see if there is a / in the name
-    char *ss = str;
-    while(*ss &&  *ss!=' ' && *ss!='\n' && *ss != '?' && *ss != '/') {
-      ss++;
-    }
-    // if a '/' is encountered this is requesting a file
-    i = 0;
-    if (*ss == '/') {
-      i = sizeof(urls)/sizeof(URLStruct);
-    }
-    for(;i<sizeof(urls)/sizeof(URLStruct);i++) {
-      if(pgm_read_byte(urls[i].url)==str[0]
-       &&pgm_read_byte(urls[i].url+1)==str[1]) {
+    for(i=0;i<sizeof(urls)/sizeof(URLStruct);i++) {
+      if(pgm_read_byte(urls[i].url)==com[0]
+       &&pgm_read_byte(urls[i].url+1)==com[1]) {
 
         // check password
         byte ret = HTML_UNAUTHORIZED;
 
-        if (str[0]=='s' && str[1]=='u') { // for /su do not require password
-          str+=3;
-          ret = (urls[i].handler)(str);
-        } else if (str[0]=='j' && str[1]=='o')  { // for /jo page we output fwv if password fails
-          str+=3;
-          if(check_password(str)==false) {
+        if (com[0]=='s' && com[1]=='u') { // for /su do not require password
+          ret = (urls[i].handler)(dat);
+        } else if (com[0]=='j' && com[1]=='o')  { // for /jo page we output fwv if password fails
+          if(check_password(dat)==false) {
             print_json_header_with_bracket();
             bfill.emit_p(PSTR("\"$F\":$D}"),
                    os.options[0].json_str, os.options[0].value);
             ret = HTML_OK;
           } else {
-            ret = (urls[i].handler)(str);
+            ret = (urls[i].handler)(dat);
           }
         } else {
           // first check password
-          str+=3;
-          if(check_password(str)==false) {
+          if(check_password(dat)==false) {
             ret = HTML_UNAUTHORIZED;
           } else {
-            ret = (urls[i].handler)(str);
+            ret = (urls[i].handler)(dat);
           }
         }
         switch(ret) {

From 76aad1615d45971f1d48b77f1536a8f5c4acd0b6 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Fri, 24 Jul 2015 23:21:39 -0400
Subject: [PATCH 04/39] add supports for /ja command, which combines /jc, /jp,
 /jo, /js, /jn into one single command

---
 server.cpp | 69 ++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 17 deletions(-)

diff --git a/server.cpp b/server.cpp
index 3bf3ebc8..b4629b0f 100644
--- a/server.cpp
+++ b/server.cpp
@@ -57,7 +57,6 @@ void check_weather(time_t curr_time);
 void perform_ntp_sync(time_t curr_time);
 void log_statistics(time_t curr_time);
 void delete_log(char *name);
-void handle_ether_request(char *p);
 void reset_all_stations_immediate();
 void reset_all_stations();
 void make_logfile_name(char *name);
@@ -122,7 +121,7 @@ void print_json_header() {
 }
 
 void print_json_header_with_bracket() {
-bfill.emit_p(PSTR("$F$F$F$F\r\n{"), html200OK, htmlContentJSON, htmlAccessControl, htmlNoCache);
+  bfill.emit_p(PSTR("$F$F$F$F\r\n{"), html200OK, htmlContentJSON, htmlAccessControl, htmlNoCache);
 }
 
 byte findKeyVal (const char *str,char *strbuf, uint8_t maxlen,const char *key,bool key_in_pgm=false,uint8_t *keyfound=NULL)
@@ -360,6 +359,12 @@ boolean check_password(char *p)
   return false;
 }
 
+// print ending character: either bracket, or comma
+void print_json_close(bool bracket=true) {
+  bfill.emit_p(bracket?PSTR("}"):PSTR(","));
+  if(bracket) delay(1);
+}
+
 void server_json_stations_attrib(const char* name, const byte* attrib)
 {
   bfill.emit_p(PSTR("\"$F\":["), name);
@@ -390,8 +395,7 @@ void server_json_stations_main()
       send_packet();
     }
   }
-  bfill.emit_p(PSTR("],\"maxlen\":$D}"), STATION_NAME_SIZE);
-  delay(1);
+  bfill.emit_p(PSTR("],\"maxlen\":$D"), STATION_NAME_SIZE);
 }
 
 /** Output station names and attributes */
@@ -399,6 +403,7 @@ byte server_json_stations(char *p)
 {
   print_json_header_with_bracket();
   server_json_stations_main();
+  print_json_close();
   return HTML_OK;
 }
 
@@ -686,7 +691,7 @@ void server_json_options_main() {
       bfill.emit_p(PSTR(","));
   }
 
-  bfill.emit_p(PSTR(",\"dexp\":$D,\"mexp\":$D,\"hwt\":$D}"), os.detect_exp(), MAX_EXT_BOARDS, os.hw_type);
+  bfill.emit_p(PSTR(",\"dexp\":$D,\"mexp\":$D,\"hwt\":$D"), os.detect_exp(), MAX_EXT_BOARDS, os.hw_type);
 }
 
 
@@ -695,13 +700,11 @@ byte server_json_options(char *p)
 {
   print_json_header_with_bracket();
   server_json_options_main();
+  print_json_close();
   return HTML_OK;
 }
 
-/** Output program data */
-byte server_json_programs(char *p)
-{
-  print_json_header_with_bracket();
+void server_json_programs_main() {
   bfill.emit_p(PSTR("\"nprogs\":$D,\"nboards\":$D,\"mnp\":$D,\"mnst\":$D,\"pnsize\":$D,\"pd\":["),
                pd.nprograms, os.nboards, MAX_NUMBER_PROGRAMS, MAX_NUM_STARTTIMES, PROGRAM_NAME_SIZE);
   byte pid, i;
@@ -739,8 +742,15 @@ byte server_json_programs(char *p)
       send_packet();
     }
   }
-  bfill.emit_p(PSTR("]}"));
-  delay(1);
+  bfill.emit_p(PSTR("]"));
+}
+
+/** Output program data */
+byte server_json_programs(char *p)
+{
+  print_json_header_with_bracket();
+  server_json_programs_main();
+  print_json_close();
   return HTML_OK;
 }
 
@@ -796,8 +806,6 @@ void server_json_controller_main() {
   if(read_from_file(wtopts_filename, tmp_buffer)) {
     bfill.emit_p(PSTR(",\"wto\":{$S}"), tmp_buffer);
   }
-  bfill.emit_p(PSTR("}"));
-  delay(1);
 }
 
 
@@ -806,6 +814,7 @@ byte server_json_controller(char *p)
 {
   print_json_header_with_bracket();
   server_json_controller_main();
+  print_json_close();
   return HTML_OK;
 }
 
@@ -1061,7 +1070,7 @@ void server_json_status_main()
     bfill.emit_p(PSTR("$D"), (os.station_bits[(sid>>3)]>>(sid&0x07))&1);
     if(sid!=os.nstations-1) bfill.emit_p(PSTR(","));
   }
-  bfill.emit_p(PSTR("],\"nstations\":$D}"), os.nstations);
+  bfill.emit_p(PSTR("],\"nstations\":$D"), os.nstations);
 }
 
 /**
@@ -1071,6 +1080,7 @@ byte server_json_status(char *p)
 {
   print_json_header_with_bracket();
   server_json_status_main();
+  print_json_close();
   return HTML_OK;
 }
 
@@ -1269,6 +1279,26 @@ byte server_delete_log(char *p) {
   return HTML_SUCCESS;
 }
 
+/** Output all JSON data, including jc, jp, jo, js, jn */
+byte server_json_all(char *p) {
+  print_json_header_with_bracket();
+  server_json_controller_main();
+  print_json_close(false);
+  send_packet();
+  server_json_programs_main();
+  print_json_close(false);
+  send_packet();
+  server_json_options_main();
+  print_json_close(false);
+  send_packet();
+  server_json_status_main();
+  print_json_close(false);
+  send_packet();
+  server_json_stations_main();
+  print_json_close();
+  return HTML_OK;
+}
+
 struct URLStruct{
   PGM_P PROGMEM url;
   byte (*handler)(char*);
@@ -1302,6 +1332,7 @@ prog_char _url_dl [] PROGMEM = "dl";
 prog_char _url_su [] PROGMEM = "su";
 prog_char _url_cu [] PROGMEM = "cu";
 
+prog_char _url_ja [] PROGMEM = "ja";
 
 // Server function handlers
 URLStruct urls[] = {
@@ -1331,6 +1362,8 @@ URLStruct urls[] = {
   {_url_su,server_view_scripturl},
   {_url_cu,server_change_scripturl},
 
+  {_url_ja,server_json_all},
+
 };
 
 // handle Ethernet request
@@ -1341,13 +1374,14 @@ void handle_web_request(char *p)
 #endif
   rewind_ether_buffer();
 
-  char *com = p;
-  char *dat = NULL;
+  char *com = p;  // command name
+  char *dat = NULL; // data
   // check if this is GET or POST request
   if (strncmp(p, "GET", 3)==0) {  // this is GET request
     com = p+5;
     dat = com+3;
   } else {  // this is POST request
+    // find the start of POST data
     com = p+6;
     dat = com;
     bool clb = true;
@@ -1382,7 +1416,8 @@ void handle_web_request(char *p)
 
         if (com[0]=='s' && com[1]=='u') { // for /su do not require password
           ret = (urls[i].handler)(dat);
-        } else if (com[0]=='j' && com[1]=='o')  { // for /jo page we output fwv if password fails
+        } else if ((com[0]=='j' && com[1]=='o') ||
+                   (com[0]=='j' && com[1]=='a'))  { // for /jo and /ja we output fwv if password fails
           if(check_password(dat)==false) {
             print_json_header_with_bracket();
             bfill.emit_p(PSTR("\"$F\":$D}"),

From 8f29563ecff344057c83ca904b838c9d4ce397c9 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Wed, 29 Jul 2015 01:40:02 -0400
Subject: [PATCH 05/39] rewrote scheduler to use queue-based data structure,
 allowing the same station to appear multiple times in the queue; improve
 check_match function to allow match check of repeating progrmas that run over
 night; add support for OS 23 and OSPi/OSBo to allow more stations and longer
 station names

---
 defines.h   |  84 +++++++++++++++--------
 main.cpp    | 189 ++++++++++++++++++++++++++++++----------------------
 program.cpp | 152 +++++++++++++++++++++++++-----------------
 program.h   |  39 +++++++++--
 server.cpp  |  33 +++++----
 5 files changed, 312 insertions(+), 185 deletions(-)

diff --git a/defines.h b/defines.h
index b5d3c525..1fbce81f 100644
--- a/defines.h
+++ b/defines.h
@@ -42,10 +42,6 @@
 #define HW_TYPE_DC           0xDC   // DC powered, for both DC and 24VAC solenoids, with boost converter and MOSFETs
 #define HW_TYPE_LATCH        0x1A   // DC powered, for DC latching solenoids only, with boost converter and H-bridges
 
-#define MAX_EXT_BOARDS   5  // maximum number of exp. boards (each expands 8 stations)
-
-#define MAX_NUM_STATIONS  ((1+MAX_EXT_BOARDS)*8)  // maximum number of stations
-
 /** File names */
 #define WEATHER_OPTS_FILENAME "wtopts.txt"    // weather options file
 #define STATION_ATTR_FILENAME "stns.dat"      // station attributes data file
@@ -60,7 +56,7 @@
 /** Non-volatile memory (NVM) defines */
 #if defined(ARDUINO) 
 
-/** 2KB NVM data structure:
+/** 2KB NVM (ATmega644) data structure:
   * |         |     |  ---STRING PARAMETERS---      |           |   ----STATION ATTRIBUTES-----      |          |
   * | PROGRAM | CON | PWD | LOC | JURL | WURL | KEY | STN_NAMES | MAS | IGR | MAS2 | DIS | SEQ | SPE | OPTIONS  |
   * |  (996)  | (8) |(32) |(48) | (40) | (40) |(32) |   (768)   | (6) | (6) |  (6) | (6) | (6) | (6) |   (54)   |
@@ -68,34 +64,68 @@
   * 0        996  1004   1036  1084  1124   1164   1196        1964  1970  1976   1982  1988  1994  2000      2048
   */
 
-  #define NVM_SIZE            2048  // For AVR, nvm data is stored in EEPROM
-                                    // ATmega644 has 2KB EEPROM
-  #define STATION_NAME_SIZE   16    // maximum number of characters in each station name
-  
-  #define MAX_PROGRAMDATA     996   // program data, 996 bytes max
-  #define MAX_NVCONDATA       8     // non-volatile controller data, 8 bytes max
-  #define MAX_USER_PASSWORD   32    // user password, 32 bytes max
-  #define MAX_LOCATION        48    // location string, 48 bytes max
-  #define MAX_JAVASCRIPTURL   40    // javascript url, 40 bytes max
-  #define MAX_WEATHERURL      40    // weather script url, 40 bytes max
-  #define MAX_WEATHER_KEY     32    // weather api key, 32 bytes max
+/** 4KB NVM (ATmega1284) data structure:
+  * |         |     |  ---STRING PARAMETERS---      |           |   ----STATION ATTRIBUTES-----      |          |
+  * | PROGRAM | CON | PWD | LOC | JURL | WURL | KEY | STN_NAMES | MAS | IGR | MAS2 | DIS | SEQ | SPE | OPTIONS  |
+  * |  (2438) | (8) |(32) |(48) | (48) | (48) |(32) |   (1344)  | (7) | (7) |  (7) | (7) | (7) | (7) |   (56)   |
+  * |         |     |     |     |      |      |     |           |     |     |      |     |     |     |          |
+  * 0       2438  2446   2478  2526  2574   2622   2654        3998  4005  4012   4019  4026  4033  4040      4096
+  */
+
+  #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__) // for 4KB NVM
+
+    #define MAX_EXT_BOARDS    6  // maximum number of exp. boards (each expands 8 stations)
+    #define MAX_NUM_STATIONS  ((1+MAX_EXT_BOARDS)*8)  // maximum number of stations
+
+    #define NVM_SIZE            4096  // For AVR, nvm data is stored in EEPROM, ATmega1284 has 4K EEPROM
+    #define STATION_NAME_SIZE   24    // maximum number of characters in each station name
+
+    #define MAX_PROGRAMDATA     2438  // program data
+    #define MAX_NVCONDATA       8     // non-volatile controller data
+    #define MAX_USER_PASSWORD   32    // user password
+    #define MAX_LOCATION        48    // location string
+    #define MAX_JAVASCRIPTURL   48    // javascript url
+    #define MAX_WEATHERURL      48    // weather script url
+    #define MAX_WEATHER_KEY     32    // weather api key
+
+  #else
+
+    #define MAX_EXT_BOARDS    5  // maximum number of exp. boards (each expands 8 stations)
+    #define MAX_NUM_STATIONS  ((1+MAX_EXT_BOARDS)*8)  // maximum number of stations
+
+    #define NVM_SIZE            2048  // For AVR, nvm data is stored in EEPROM, ATmega644 has 2K EEPROM
+    #define STATION_NAME_SIZE   16    // maximum number of characters in each station name
+
+    #define MAX_PROGRAMDATA     996   // program data
+    #define MAX_NVCONDATA       8     // non-volatile controller data
+    #define MAX_USER_PASSWORD   32    // user password
+    #define MAX_LOCATION        48    // location string
+    #define MAX_JAVASCRIPTURL   40    // javascript url
+    #define MAX_WEATHERURL      40    // weather script url
+    #define MAX_WEATHER_KEY     32    // weather api key,
+
+  #endif
   
 #else // NVM defines for RPI/BBB/LINUX
 
   // These are kept the same as AVR for compatibility
   // But these can be increased if needed
   #define NVM_FILENAME        "nvm.dat" // for RPI/BBB, nvm data is stored in a file
-  #define NVM_SIZE            2048 // impose a file size limit: 64KB
-  #define STATION_NAME_SIZE   16    // maximum number of characters in each station name
-  
-  #define MAX_PROGRAMDATA     996  // program data, 3984 bytes max
-  #define MAX_NVCONDATA       8     // non-volatile controller data, 8 bytes max
-  #define MAX_USER_PASSWORD   32    // user password, 32 bytes max
-  #define MAX_LOCATION        48    // location string, 48 bytes max
-  #define MAX_JAVASCRIPTURL   40    // javascript url, 40 bytes max
-  #define MAX_WEATHERURL      40    // weather script url, 40 bytes max
-  #define MAX_WEATHER_KEY     32    // weather api key, 32 bytes max
-    
+
+  #define MAX_EXT_BOARDS    6  // maximum number of exp. boards (each expands 8 stations)
+  #define MAX_NUM_STATIONS  ((1+MAX_EXT_BOARDS)*8)  // maximum number of stations
+
+  #define NVM_SIZE            4096
+  #define STATION_NAME_SIZE   24    // maximum number of characters in each station name
+
+  #define MAX_PROGRAMDATA     2438  // program data
+  #define MAX_NVCONDATA       8     // non-volatile controller data
+  #define MAX_USER_PASSWORD   32    // user password
+  #define MAX_LOCATION        48    // location string
+  #define MAX_JAVASCRIPTURL   48    // javascript url
+  #define MAX_WEATHERURL      48    // weather script url
+  #define MAX_WEATHER_KEY     32    // weather api key
+
 #endif  // end of NVM defines
 
 /** NVM data addresses */
diff --git a/main.cpp b/main.cpp
index 6cefabd4..fcf55cd2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -270,7 +270,7 @@ void do_loop()
   static ulong last_time = 0;
   static ulong last_minute = 0;
 
-  byte bid, sid, s, pid, bitvalue;
+  byte bid, sid, s, pid, qid, bitvalue;
   ProgramStruct prog;
 
   os.status.mas = os.options[OPTION_MASTER_STATION].value;
@@ -358,6 +358,7 @@ void do_loop()
     // ====== Schedule program data ======
     ulong curr_minute = curr_time / 60;
     boolean match_found = false;
+    RuntimeQueueStruct *q;
     // since the granularity of start time is minute
     // we only need to check once every minute
     if (curr_minute != last_minute) {
@@ -373,15 +374,12 @@ void do_loop()
             s=sid&0x07;
             // skip if the station is:
             // - master station (because master cannot be scheduled independently
-            // - running (cannot handle overlapping schedules of the same station)
             // - disabled
-            if ((os.status.mas==sid+1) || (os.status.mas2==sid+1) ||
-                (os.station_bits[bid]&(1<<s)) || (os.stndis_bits[bid]&(1<<s)))
+            if ((os.status.mas==sid+1) || (os.status.mas2==sid+1) || (os.stndis_bits[bid]&(1<<s)))
               continue;
 
-            // if station has non-zero water time and if it doesn't already have a scheduled stop time
-            if (prog.durations[sid] && !pd.scheduled_stop_time[sid]) {
-              // initialize schedule data by storing water time temporarily in stop_time
+            // if station has non-zero water time
+            if (prog.durations[sid]) {
               // water time is scaled by watering percentage
               ulong water_time = water_time_resolve(water_time_decode(prog.durations[sid]));
               // if the program is set to use weather scaling
@@ -392,14 +390,21 @@ void do_loop()
                                                 // do not water
                   water_time = 0;
               }
-              pd.scheduled_stop_time[sid] = water_time;
 
-              if (pd.scheduled_stop_time[sid]) {
+              if (water_time) {
                 // check if water time is still valid
                 // because it may end up being zero after scaling
-                pd.scheduled_program_index[sid] = pid+1;
-                match_found = true;
-              }// if pd.scheduled_stop_time[sid]
+                q = pd.enqueue();
+                if (q) {
+                  q->st = 0;
+                  q->dur = water_time;
+                  q->sid = sid;
+                  q->pid = pid+1;
+                  match_found = true;
+                } else {
+                  // queue is full
+                }
+              }// if water_time
             }// if prog.durations[sid]
           }// for sid
         }// if check_match
@@ -408,6 +413,17 @@ void do_loop()
       // calculate start and end time
       if (match_found) {
         schedule_all_stations(curr_time);
+        DEBUG_PRINT("en:");
+        for(q=pd.queue;q<pd.queue+pd.nqueue;q++) {
+          DEBUG_PRINT("[");
+          DEBUG_PRINT(q->sid);
+          DEBUG_PRINT(",");
+          DEBUG_PRINT(q->dur);
+          DEBUG_PRINT(",");
+          DEBUG_PRINT(q->st);
+          DEBUG_PRINT("]");
+        }
+        DEBUG_PRINTLN("");
       }
     }//if_check_current_minute
 
@@ -415,6 +431,19 @@ void do_loop()
     // Check if a program is running currently
     // If so, do station run-time keeping
     if (os.status.program_busy){
+      // first, go through run time queue to assign queue elements to stations
+      q = pd.queue;
+      qid=0;
+      for(;q<pd.queue+pd.nqueue;q++,qid++) {
+        sid=q->sid;
+        byte sqi=pd.station_qid[sid];
+        // skip if station is already assigned a queue element
+        // and that queue element has an earlier start time
+        if(sqi<255 && pd.queue[sqi].st<q->st) continue;
+        // otherwise assign the queue element to station
+        pd.station_qid[sid]=qid;
+      }
+      // next, go through the stations and perform time keeping
       for(bid=0;bid<os.nboards; bid++) {
         bitvalue = os.station_bits[bid];
         for(s=0;s<8;s++) {
@@ -423,18 +452,21 @@ void do_loop()
           // skip master station
           if (os.status.mas == sid+1) continue;
           if (os.status.mas2== sid+1) continue;
+
+          q = pd.queue + pd.station_qid[sid];
           // check if this station is scheduled, either running or waiting to run
-          if (pd.scheduled_program_index[sid] > 0) {
+          if (q->st > 0) {
             // if so, check if we should turn it off
-            if (curr_time >= pd.scheduled_stop_time[sid]) {
+            if (curr_time >= q->st+q->dur) {
               turn_off_station(sid, curr_time);
             }
           }
           // if current station is not running, check if we should turn it on
           if(!((bitvalue>>s)&1)) {
-            if (curr_time >= pd.scheduled_start_time[sid] && curr_time < pd.scheduled_stop_time[sid]) {
+            if (curr_time >= q->st && curr_time < q->st+q->dur) {
               os.set_station_bit(sid, 1);
 
+              // fix me
               // upon turning on station, process RF
               // if the station is a RF station
               /*if(os.rfstn_bits[bid]&(1<<s)) {
@@ -446,32 +478,40 @@ void do_loop()
         }//end_s
       }//end_bid
 
+      // finally, go through the queue again and clear up elements marked for removal
+      int qi;
+      for(qi=pd.nqueue-1;qi>=0;qi--) {
+        q=pd.queue+qi;
+        if(!q->dur || curr_time>=q->st+q->dur)  pd.dequeue(qi);
+      }
+
       // process dynamic events
       process_dynamic_events(curr_time);
 
       // activate / deactivate valves
       os.apply_all_station_bits();
 
-      // check through run-time data, calculate the last stop time of sequential stations
-      boolean program_still_busy = false;
+      // check through runtime queue, calculate the last stop time of sequential stations
       pd.last_seq_stop_time = 0;
       ulong sst;
-      for(sid=0;sid<os.nstations;sid++) {
+      q = pd.queue;
+      for(;q<pd.queue+pd.nqueue;q++) {
+        sid = q->sid;
         bid = sid>>3;
         s = sid&0x07;
         // check if any sequential station has a valid stop time
         // and the stop time must be larger than curr_time
-        sst = pd.scheduled_stop_time[sid];
+        sst = q->st + q->dur;
         if (sst>curr_time) {
           if (os.stnseq_bits[bid]&(1<<s)) {   // only need to update last_seq_stop_time for sequential stations
             pd.last_seq_stop_time = (sst>pd.last_seq_stop_time ) ? sst : pd.last_seq_stop_time;
           }
-          program_still_busy = true;
         }
       }
 
-      // if no station has a schedule
-      if (program_still_busy == false) {
+      // if the runtime queue is empty
+      // reset all stations
+      if (!pd.nqueue) {
         // turn off all stations
         os.clear_all_station_bits();
         os.apply_all_station_bits();
@@ -486,7 +526,6 @@ void do_loop()
       }
     }//if_some_program_is_running
 
-    // if master station is defined
     // handle master
     if (os.status.mas>0) {
       byte mas_on_adj = os.options[OPTION_MASTER_ON_ADJ].value;
@@ -499,9 +538,10 @@ void do_loop()
         s = sid&0x07;
         // if this station is running and is set to activate master
         if ((os.station_bits[bid]&(1<<s)) && (os.masop_bits[bid]&(1<<s))) {
+          q=pd.queue+pd.station_qid[sid];
           // check if timing is within the acceptable range
-          if (curr_time >= pd.scheduled_start_time[sid] + mas_on_adj &&
-              curr_time <= pd.scheduled_stop_time[sid] + mas_off_adj - 60) {
+          if (curr_time >= q->st + mas_on_adj &&
+              curr_time <= q->st + q->dur + mas_off_adj - 60) {
             masbit = 1;
             break;
           }
@@ -521,9 +561,10 @@ void do_loop()
         s = sid&0x07;
         // if this station is running and is set to activate master
         if ((os.station_bits[bid]&(1<<s)) && (os.masop2_bits[bid]&(1<<s))) {
+          q=pd.queue+pd.station_qid[sid];
           // check if timing is within the acceptable range
-          if (curr_time >= pd.scheduled_start_time[sid] + mas_on_adj_2 &&
-              curr_time <= pd.scheduled_stop_time[sid] + mas_off_adj_2 - 60) {
+          if (curr_time >= q->st + mas_on_adj_2 &&
+              curr_time <= q->st + q->dur + mas_off_adj_2 - 60) {
             masbit2 = 1;
             break;
           }
@@ -601,34 +642,36 @@ void check_weather() {
 void turn_off_station(byte sid, ulong curr_time) {
   os.set_station_bit(sid, 0);
 
+  byte qid = pd.station_qid[sid];
   // ignore if we are turning off a station that's not running or scheduled to run
-  if (!pd.scheduled_start_time[sid])  return;
+  if (qid>=pd.nqueue)  return;
+
+  RuntimeQueueStruct *q = pd.queue+qid;
 
   // check if the current time is past the scheduled start time,
   // because we may be turning off a station that hasn't started yet
-  if (curr_time > pd.scheduled_start_time[sid]) {
+  if (curr_time > q->st) {
     // record lastrun log (only for non-master stations)
     if(os.status.mas!=(sid+1) && os.status.mas2!=(sid+1)) {
       pd.lastrun.station = sid;
-      pd.lastrun.program = pd.scheduled_program_index[sid];
-      pd.lastrun.duration = curr_time - pd.scheduled_start_time[sid];
+      pd.lastrun.program = q->pid;
+      pd.lastrun.duration = curr_time - q->st;
       pd.lastrun.endtime = curr_time;
       write_log(LOGDATA_STATION, curr_time);
     }
 
     // upon turning off station, process RF station
     // if the station is a RF station
+    // fix me
     /*if(os.rfstn_bits[bid]&(1<<s)) {
       // turn off station
       os.send_rfstation_signal(sid, false);
     }*/
   }
 
-  // reset program run-time data variables
-  pd.scheduled_start_time[sid] = 0;
-  pd.scheduled_stop_time[sid] = 0;
-  pd.scheduled_program_index[sid] = 0;
-
+  // dequeue the element
+  pd.dequeue(qid);
+  pd.station_qid[sid] = 0xFF;
 }
 
 void process_dynamic_events(ulong curr_time) {
@@ -652,6 +695,8 @@ void process_dynamic_events(ulong curr_time) {
       // If this is a normal program (not a run-once or test program)
       // and either the controller is disabled, or
       // if raining and ignore rain bit is cleared
+      // fix me
+      /*
       if ((pd.scheduled_program_index[sid]<99) &&
           (!en || (rain && !(rbits&(1<<s)))) ) {
         if (sbits&(1<<s)) { // if station is currently running
@@ -664,7 +709,7 @@ void process_dynamic_events(ulong curr_time) {
           pd.scheduled_stop_time[sid] = 0;
           pd.scheduled_program_index[sid] = 0;
         }
-      }
+      }*/
     }
   }
 }
@@ -679,51 +724,34 @@ void schedule_all_stations(ulong curr_time) {
     seq_start_time = pd.last_seq_stop_time + station_delay;
   }
 
-  byte sid;
-
-  // go through all stations and calculate start / stop time of each station
-  for(sid=0;sid<os.nstations;sid++) {
-    // skip master station because it's not scheduled independently
-    if (os.status.mas==sid+1) continue;
-    if (os.status.mas2==sid+1) continue;
+  RuntimeQueueStruct *q = pd.queue;
+  // go through runtime queue and calculate start time of each station
+  for(;q<pd.queue+pd.nqueue;q++) {
+    if(q->st) continue; // if this queue element has already been scheduled, skip
+    if(!q->dur) continue; // if the element has been marked to reset, skip
+    byte sid=q->sid;
     byte bid=sid>>3;
     byte s=sid&0x07;
 
-    // if the station is not scheduled to run (scheduled_stop_time = 0)
-    // or is already scheduled (i.e. start_time > 0)
-    // or is already running
-    // then we will skip this station
-    if(!pd.scheduled_stop_time[sid] || pd.scheduled_start_time[sid] || (os.station_bits[bid]&(1<<s)))
-      continue;
-
     // check if this is a sequential station
     if (os.stnseq_bits[bid]&(1<<s)) {
       // sequential scheduling
-      pd.scheduled_start_time[sid] = seq_start_time;
-      seq_start_time += pd.scheduled_stop_time[sid];
-      pd.scheduled_stop_time[sid] = seq_start_time;
+      q->st = seq_start_time;
+      seq_start_time += q->dur;
       seq_start_time += station_delay; // add station delay time
-      /*DEBUG_PRINT("[");
-      DEBUG_PRINT(sid);
-      DEBUG_PRINT(":");
-      DEBUG_PRINT(pd.scheduled_start_time[sid]);
-      DEBUG_PRINT(",");
-      DEBUG_PRINT(pd.scheduled_stop_time[sid]);
-      DEBUG_PRINTLN("]");*/
     } else {
       // concurrent scheduling
-      pd.scheduled_start_time[sid] = con_start_time;
-      pd.scheduled_stop_time[sid] = con_start_time + pd.scheduled_stop_time[sid];
-      /*DEBUG_PRINT("[");
-      DEBUG_PRINT(sid);
-      DEBUG_PRINT(":");
-      DEBUG_PRINT(pd.scheduled_start_time[sid]);
-      DEBUG_PRINT(",");
-      DEBUG_PRINT(pd.scheduled_stop_time[sid]);
-      DEBUG_PRINTLN("]");*/
+      q->st = con_start_time;
     }
+    DEBUG_PRINT("[");
+    DEBUG_PRINT(sid);
+    DEBUG_PRINT(":");
+    DEBUG_PRINT(q->st);
+    DEBUG_PRINT(",");
+    DEBUG_PRINT(q->dur);
+    DEBUG_PRINTLN("]");
     os.status.program_busy = 1;  // set program busy bit
-	}
+  }
 }
 
 void reset_all_stations_immediate() {
@@ -733,12 +761,10 @@ void reset_all_stations_immediate() {
 }
 
 void reset_all_stations() {
-  // stop all running and scheduled stations
-  ulong curr_time = os.now_tz();
-  for(byte sid=0;sid<os.nstations;sid++) {
-    if(pd.scheduled_program_index[sid] > 0) {
-      pd.scheduled_stop_time[sid] = curr_time;
-    }
+  RuntimeQueueStruct *q = pd.queue;
+  // go through runtime queue and assign water time to 0
+  for(;q<pd.queue+pd.nqueue;q++) {
+    q->dur = 0;
   }
 }
 
@@ -763,9 +789,12 @@ void manual_start_program(byte pid) {
     if(pid==255)  dur=2;
     else if(pid>0)
       dur = water_time_resolve(water_time_decode(prog.durations[sid]));
-    if (dur>0 && !(os.stndis_bits[bid]&(1<<s))) {
-      pd.scheduled_stop_time[sid] = dur;
-      pd.scheduled_program_index[sid] = 254;
+    RuntimeQueueStruct *q = pd.enqueue();
+    if (q && dur>0 && !(os.stndis_bits[bid]&(1<<s))) {
+      q->st = 0;
+      q->dur = dur;
+      q->sid = sid;
+      q->pid = 254;
       match_found = true;
     }
   }
diff --git a/program.cpp b/program.cpp
index 7781913b..40d9dba4 100644
--- a/program.cpp
+++ b/program.cpp
@@ -32,9 +32,9 @@
 
 // Declare static data members
 byte ProgramData::nprograms = 0;
-ulong ProgramData::scheduled_start_time[(MAX_EXT_BOARDS+1)*8];
-ulong ProgramData::scheduled_stop_time[(MAX_EXT_BOARDS+1)*8];
-byte ProgramData::scheduled_program_index[(MAX_EXT_BOARDS+1)*8];
+byte ProgramData::nqueue = 0;
+RuntimeQueueStruct ProgramData::queue[RUNTIME_QUEUE_SIZE];
+byte ProgramData::station_qid[MAX_NUM_STATIONS];
 LogStruct ProgramData::lastrun;
 ulong ProgramData::last_seq_stop_time;
 
@@ -44,14 +44,45 @@ void ProgramData::init() {
 }
 
 void ProgramData::reset_runtime() {
-  for (byte i=0; i<MAX_NUM_STATIONS; i++) {
-    scheduled_start_time[i] = 0;
-    scheduled_stop_time[i] = 0;
-    scheduled_program_index[i] = 0;
-  }
+  memset(station_qid, 0xFF, MAX_NUM_STATIONS);  // reset station qid to 0xFF
+  nqueue = 0;
   last_seq_stop_time = 0;
 }
 
+// this returns a pointer to the next available element in the queue
+RuntimeQueueStruct* ProgramData::enqueue() {
+  if (nqueue < RUNTIME_QUEUE_SIZE) {
+    nqueue ++;
+    return queue + (nqueue-1);
+  } else {
+    return NULL;
+  }
+}
+
+// this removes an element from the queue
+void ProgramData::dequeue(byte qid) {
+  if (qid>=nqueue)  return;
+  if (qid<nqueue-1) {
+    queue[qid] = queue[nqueue-1]; // copy the last element to the dequeud element to fill the space
+    if(station_qid[queue[qid].sid] == nqueue-1) // fix queue index if necessary
+      station_qid[queue[qid].sid] = qid;
+  }
+  nqueue--;
+
+  RuntimeQueueStruct *q = queue;
+  DEBUG_PRINT("de:");
+  for(;q<queue+nqueue;q++) {
+    DEBUG_PRINT("[");
+    DEBUG_PRINT(q->sid);
+    DEBUG_PRINT(",");
+    DEBUG_PRINT(q->dur);
+    DEBUG_PRINT(",");
+    DEBUG_PRINT(q->st);
+    DEBUG_PRINT("]");
+  }
+  DEBUG_PRINTLN("");
+}
+
 // load program count from NVM
 void ProgramData::load_count() {
   nprograms = nvm_read_byte((byte *) ADDR_PROGRAMCOUNTER);
@@ -167,33 +198,24 @@ int16_t ProgramStruct::starttime_decode(int16_t t) {
   return t;
 }
 
-// Check if a given time matches program schedule
-byte ProgramStruct::check_match(time_t t) {
+// Check if a given time matches the program's start day
+byte ProgramStruct::check_day_match(time_t t) {
 
 #if defined(ARDUINO) // get current time from Arduino
-  unsigned int hour_t = hour(t);
-  unsigned int minute_t = minute(t);
   byte weekday_t = weekday(t);        // weekday ranges from [0,6] within Sunday being 1
   byte day_t = day(t);
   byte month_t = month(t);
 #else // get current time from RPI/BBB
   time_t ct = t;
   struct tm *ti = gmtime(&ct);
-  unsigned int hour_t = ti->tm_hour;
-  unsigned int minute_t = ti->tm_min;
   byte weekday_t = (ti->tm_wday+1)%7;  // tm_wday ranges from [0,6] with Sunday being 0
   byte day_t = ti->tm_mday;
   byte month_t = ti->tm_mon+1;   // tm_mon ranges from [0,11]
 #endif // get current time
 
-  unsigned int current_minute = hour_t*60+minute_t;
-  
-  // check program enable status
-  if (!enabled) return 0;
- 
   byte wd = (weekday_t+5)%7;
   byte dt = day_t;
-  byte i;
+
   // check day match
   switch(type) {
     case PROGRAM_TYPE_WEEKLY:
@@ -201,19 +223,19 @@ byte ProgramStruct::check_match(time_t t) {
       if (!(days[0] & (1<<wd)))
         return 0;
     break;
-    
+
     case PROGRAM_TYPE_BIWEEKLY:
       // todo
     break;
-    
+
     case PROGRAM_TYPE_MONTHLY:
       if (dt != (days[0]&0b11111))
         return 0;
     break;
-    
+
     case PROGRAM_TYPE_INTERVAL:
       // this is an inverval program
-      if (((t/SECS_PER_DAY)%days[1]) != days[0])  return 0;      
+      if (((t/SECS_PER_DAY)%days[1]) != days[0])  return 0;
     break;
   }
 
@@ -229,46 +251,56 @@ byte ProgramStruct::check_match(time_t t) {
     else if (dt==29 && month_t==2)  return 0;
     else if ((dt%2)!=1)  return 0;
   }
-  
-  // check start time match
-  if (!starttime_type) {
-    // repeating type
-    int16_t start = starttime_decode(starttimes[0]);
-    int16_t repeat = starttimes[1];
-    int16_t interval = starttimes[2];
-    // if current time is prior to start time, return false
-    if (current_minute < start)
-      return 0;
-      
-    // if this is a single run program
-    if (!repeat) {
-      return (current_minute == start) ? 1 : 0;
-    }
-    
-    // if this is a multiple-run program
-    // first ensure the interval is non-zero
-    if (!interval) {
-      return 0;
-    }
+  return 1;
+}
 
-    // check if we are on any interval match
-    int16_t c = (current_minute - start) / interval;
-    if ((c * interval == (current_minute - start)) && c <= repeat) {
-      return 1;
+// Check if a given time matches program's start time
+// this also checks for programs that started the previous
+// day and ran over night
+byte ProgramStruct::check_match(time_t t) {
+
+  // check program enable status
+  if (!enabled) return 0;
+
+  int16_t start = starttime_decode(starttimes[0]);
+  int16_t repeat = starttimes[1];
+  int16_t interval = starttimes[2];
+  unsigned int current_minute = (t%86400L)/60;
+
+  // first assume program starts today
+  if (check_day_match(t)) {
+    // t matches the program's start day
+
+    if (starttime_type) {
+      // given start time type
+      for(byte i=0;i<MAX_NUM_STARTTIMES;i++) {
+        if (current_minute == starttime_decode(starttimes[i]))  return 1; // if curren_minute matches any of the given start time, return 1
+      }
+      return 0; // otherwise return 0
+    } else {
+      // repeating type
+      // if current_minute matches start time, return 1
+      if (current_minute == start) return 1;
+
+      // otherwise, current_minute must be larger than start time, and interval must be non-zero
+      if (current_minute > start && interval) {
+        // check if we are on any interval match
+        int16_t c = (current_minute - start) / interval;
+        if ((c * interval == (current_minute - start)) && c <= repeat) {
+          return 1;
+        }
+      }
     }
-    
-    // check previous day in case the repeating start times went over night
-    // this needs to be fixed because we have to check if yesterday
-    // is a valid starting day
-    /*c = (current_minute - start + 1440) / interval;
+  }
+  // to proceed, program has to be repeating type, and interval and repeat must be non-zero
+  if (starttime_type || !interval)  return 0;
+
+  // next, assume program started the previous day and ran over night
+  if (check_day_match(t-86400L)) {
+    // t-86400L matches the program's start day
+    int16_t c = (current_minute - start + 1440) / interval;
     if ((c * interval == (current_minute - start + 1440)) && c <= repeat) {
       return 1;
-    }*/
-    
-  } else {
-    // given start time type
-    for(i=0;i<MAX_NUM_STARTTIMES;i++) {
-      if (current_minute == starttime_decode(starttimes[i]))  return 1;
     }
   }
   return 0;
diff --git a/program.h b/program.h
index 22b151a7..f16e5bdd 100644
--- a/program.h
+++ b/program.h
@@ -26,7 +26,20 @@
 #define _PROGRAM_H
 
 #define MAX_NUM_STARTTIMES  4
-#define PROGRAM_NAME_SIZE   12
+
+#if defined(ARDUINO)
+  #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__) // for 4KB NVM
+    #define PROGRAM_NAME_SIZE   20
+    #define RUNTIME_QUEUE_SIZE  MAX_NUM_STATIONS
+  #else
+    #define PROGRAM_NAME_SIZE   12
+    #define RUNTIME_QUEUE_SIZE  MAX_NUM_STATIONS
+  #endif
+#else
+  #define PROGRAM_NAME_SIZE   20
+  #define RUNTIME_QUEUE_SIZE  MAX_NUM_STATIONS
+#endif
+
 #include "OpenSprinkler.h"
 
 /** Log data structure */
@@ -98,6 +111,9 @@ class ProgramStruct {
 
   byte check_match(time_t t);
   int16_t starttime_decode(int16_t t);  
+protected:
+  byte check_day_match(time_t t);
+
 };
 
 /** Program data nvm addresses */
@@ -113,17 +129,28 @@ extern OpenSprinkler os;
 
 #define PROGRAM_TYPE_VERSION  11
 
+class RuntimeQueueStruct {
+public:
+  ulong    st;  // start time
+  uint16_t dur; // water time
+  byte  sid;
+  byte  pid;
+};
+
 class ProgramData {
 public:  
-  static ulong scheduled_start_time[];// scheduled start time for each station
-  static ulong scheduled_stop_time[]; // scheduled stop time for each station
-  static byte scheduled_program_index[]; // scheduled program index
-  static byte  nprograms;     // number of programs
+  static RuntimeQueueStruct queue[];
+  static byte nqueue;
+  static byte station_qid[];
+  static byte nprograms;     // number of programs
   static LogStruct lastrun;
   static ulong last_seq_stop_time;  // the last stop time of a sequential station
   
-  static void init();
   static void reset_runtime();
+  static RuntimeQueueStruct* enqueue(); // this returns a pointer to the next available slot in the queue
+  static void dequeue(byte qid);  // this removes an element from the queue
+
+  static void init();
   static void eraseall();
   static void read(byte pid, ProgramStruct *buf);
   static byte add(ProgramStruct *buf);
diff --git a/server.cpp b/server.cpp
index b4629b0f..16243ac1 100644
--- a/server.cpp
+++ b/server.cpp
@@ -517,9 +517,14 @@ byte server_change_runonce(char *p) {
     // if non-zero duration is given
     // and if the station has not been disabled
     if (dur>0 && !(os.stndis_bits[bid]&(1<<s))) {
-      pd.scheduled_stop_time[sid] = water_time_resolve(dur);
-      pd.scheduled_program_index[sid] = 254;
-      match_found = true;
+      RuntimeQueueStruct *q = pd.enqueue();
+      if (q) {
+        q->st = 0;
+        q->dur = water_time_resolve(dur);
+        q->pid = 254;
+        q->sid = sid;
+        match_found = true;
+      }
     }
   }
   if(match_found) {
@@ -790,10 +795,13 @@ void server_json_controller_main() {
   // print ps
   for(sid=0;sid<os.nstations;sid++) {
     unsigned long rem = 0;
-    if (pd.scheduled_program_index[sid] > 0) {
-      rem = (curr_time >= pd.scheduled_start_time[sid]) ? (pd.scheduled_stop_time[sid]-curr_time) : (pd.scheduled_stop_time[sid]-pd.scheduled_start_time[sid]);
+    byte qid = pd.station_qid[sid];
+    RuntimeQueueStruct *q = pd.queue + qid;
+    if (qid<255) {
+      rem = (curr_time >= q->st) ? (q->st+q->dur-curr_time) : q->dur;
+      if(rem>65535) rem = 0;
     }
-    bfill.emit_p(PSTR("[$D,$L,$L]"), pd.scheduled_program_index[sid], rem, pd.scheduled_start_time[sid]);
+    bfill.emit_p(PSTR("[$D,$L,$L]"), (qid<255)?q->pid:0, rem, (qid<255)?q->st:0);
     bfill.emit_p((sid<os.nstations-1)?PSTR(","):PSTR("]"));
 
     // if available ether buffer is getting small
@@ -1126,12 +1134,13 @@ byte server_change_manual(char *p) {
       if ((os.status.mas==sid+1) || (os.status.mas2==sid+1) || (os.station_bits[bid]&(1<<s)))
         return HTML_NOT_PERMITTED;
 
-      // if the station doesn't already have a scheduled stop time
-      if (!pd.scheduled_stop_time[sid]) {
-        // initialize schedule data by storing water time temporarily in stop_time
-        // water time is scaled by watering percentage
-        pd.scheduled_stop_time[sid] = timer;
-        pd.scheduled_program_index[sid] = 99;   // testing stations are assigned program index 99
+      RuntimeQueueStruct *q = pd.enqueue();
+      // if the queue is not full
+      if (q) {
+        q->st = 0;
+        q->dur = timer;
+        q->sid = sid;
+        q->pid = 99;  // testing stations are assigned program index 99
         schedule_all_stations(curr_time);
       } else {
         return HTML_NOT_PERMITTED;

From bd4e3da1faa59e58232dec1b7dcd0d591578f96e Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Thu, 30 Jul 2015 20:11:26 -0400
Subject: [PATCH 06/39] fix /ja, enable the use of boost_time in
 apply_all_station_bits, change GetWeather function to perform DNS on each
 query

---
 OpenSprinkler.cpp |   2 +-
 main.cpp          |   1 -
 server.cpp        | 106 +++++++++++++++++++---------------------------
 weather.cpp       |   9 ++--
 4 files changed, 48 insertions(+), 70 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index cceb8695..6d4a4980 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -590,7 +590,7 @@ void OpenSprinkler::apply_all_station_bits() {
     DEBUG_PRINTLN(F("engage booster"));
     // boost voltage
     digitalWrite(PIN_BOOST, HIGH);
-    delay(250);
+    delay((int)options[OPTION_BOOST_TIME].value<<2);
     digitalWrite(PIN_BOOST, LOW);
    
     // enable boosted voltage for a short period of time
diff --git a/main.cpp b/main.cpp
index fcf55cd2..e693c838 100644
--- a/main.cpp
+++ b/main.cpp
@@ -677,7 +677,6 @@ void turn_off_station(byte sid, ulong curr_time) {
 void process_dynamic_events(ulong curr_time) {
   // check if rain is detected
   bool rain = false;
-  bool en = os.status.enabled ? true : false;
   if (os.status.rain_delayed || (os.options[OPTION_USE_RAINSENSOR].value && os.status.rain_sensed)) {
     rain = true;
   }
diff --git a/server.cpp b/server.cpp
index 16243ac1..2c643d84 100644
--- a/server.cpp
+++ b/server.cpp
@@ -116,12 +116,9 @@ void print_html_standard_header() {
   bfill.emit_p(PSTR("$F$F$F$F\r\n"), html200OK, htmlContentHTML, htmlNoCache, htmlAccessControl);
 }
 
-void print_json_header() {
+void print_json_header(bool bracket=true) {
   bfill.emit_p(PSTR("$F$F$F$F\r\n"), html200OK, htmlContentJSON, htmlAccessControl, htmlNoCache);
-}
-
-void print_json_header_with_bracket() {
-  bfill.emit_p(PSTR("$F$F$F$F\r\n{"), html200OK, htmlContentJSON, htmlAccessControl, htmlNoCache);
+  if(bracket) bfill.emit_p(PSTR("{"));
 }
 
 byte findKeyVal (const char *str,char *strbuf, uint8_t maxlen,const char *key,bool key_in_pgm=false,uint8_t *keyfound=NULL)
@@ -205,20 +202,13 @@ void print_html_standard_header() {
   m_client->write((const uint8_t *)"\r\n", 2);
 }
 
-void print_json_header() {
-  m_client->write((const uint8_t *)html200OK, strlen(html200OK));
-  m_client->write((const uint8_t *)htmlContentJSON, strlen(htmlContentJSON));
-  m_client->write((const uint8_t *)htmlNoCache, strlen(htmlNoCache));
-  m_client->write((const uint8_t *)htmlAccessControl, strlen(htmlAccessControl));
-  m_client->write((const uint8_t *)"\r\n", 2);
-}
-
-void print_json_header_with_bracket() {
+void print_json_header(bool bracket=true) {
   m_client->write((const uint8_t *)html200OK, strlen(html200OK));
   m_client->write((const uint8_t *)htmlContentJSON, strlen(htmlContentJSON));
   m_client->write((const uint8_t *)htmlNoCache, strlen(htmlNoCache));
   m_client->write((const uint8_t *)htmlAccessControl, strlen(htmlAccessControl));
-  m_client->write((const uint8_t *)"\r\n{", 3);
+  if(bracket) m_client->write((const uint8_t *)"\r\n{", 3);
+  else m_client->write((const uint8_t *)"\r\n", 2);
 }
 
 byte findKeyVal (const char *str,char *strbuf, uint8_t maxlen,const char *key,bool key_in_pgm=false,uint8_t *keyfound=NULL)
@@ -359,12 +349,6 @@ boolean check_password(char *p)
   return false;
 }
 
-// print ending character: either bracket, or comma
-void print_json_close(bool bracket=true) {
-  bfill.emit_p(bracket?PSTR("}"):PSTR(","));
-  if(bracket) delay(1);
-}
-
 void server_json_stations_attrib(const char* name, const byte* attrib)
 {
   bfill.emit_p(PSTR("\"$F\":["), name);
@@ -395,15 +379,14 @@ void server_json_stations_main()
       send_packet();
     }
   }
-  bfill.emit_p(PSTR("],\"maxlen\":$D"), STATION_NAME_SIZE);
+  bfill.emit_p(PSTR("],\"maxlen\":$D}"), STATION_NAME_SIZE);
+  delay(1);
 }
 
-/** Output station names and attributes */
-byte server_json_stations(char *p)
-{
-  print_json_header_with_bracket();
+/** Output Stations */
+byte server_json_stations(char *p) {
+  print_json_header();
   server_json_stations_main();
-  print_json_close();
   return HTML_OK;
 }
 
@@ -696,16 +679,14 @@ void server_json_options_main() {
       bfill.emit_p(PSTR(","));
   }
 
-  bfill.emit_p(PSTR(",\"dexp\":$D,\"mexp\":$D,\"hwt\":$D"), os.detect_exp(), MAX_EXT_BOARDS, os.hw_type);
+  bfill.emit_p(PSTR(",\"dexp\":$D,\"mexp\":$D,\"hwt\":$D}"), os.detect_exp(), MAX_EXT_BOARDS, os.hw_type);
+  delay(1);
 }
 
-
-/** Output options */
-byte server_json_options(char *p)
-{
-  print_json_header_with_bracket();
+/** Output Options */
+byte server_json_options(char *p) {
+  print_json_header();
   server_json_options_main();
-  print_json_close();
   return HTML_OK;
 }
 
@@ -747,15 +728,13 @@ void server_json_programs_main() {
       send_packet();
     }
   }
-  bfill.emit_p(PSTR("]"));
+  bfill.emit_p(PSTR("]}"));
 }
 
 /** Output program data */
-byte server_json_programs(char *p)
-{
-  print_json_header_with_bracket();
+byte server_json_programs(char *p) {
+  print_json_header();
   server_json_programs_main();
-  print_json_close();
   return HTML_OK;
 }
 
@@ -812,17 +791,15 @@ void server_json_controller_main() {
   }
 
   if(read_from_file(wtopts_filename, tmp_buffer)) {
-    bfill.emit_p(PSTR(",\"wto\":{$S}"), tmp_buffer);
+    bfill.emit_p(PSTR(",\"wto\":{$S}}"), tmp_buffer);
   }
+  delay(1);
 }
 
-
 /** Output controller variables in json */
-byte server_json_controller(char *p)
-{
-  print_json_header_with_bracket();
+byte server_json_controller(char *p) {
+  print_json_header();
   server_json_controller_main();
-  print_json_close();
   return HTML_OK;
 }
 
@@ -965,6 +942,11 @@ byte server_change_options(char *p)
 		    if (oid==OPTION_STATION_DELAY_TIME) {
 		      v=water_time_encode_signed((int16_t)v);
 		    } // encode station delay time
+        #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
+        if(os.hw_type==HW_TYPE_DC && oid==OPTION_BOOST_TIME) {
+           v>>=2;
+        }
+        #endif
 		    if (v>=0 && v<=os.options[oid].max) {
 		      os.options[oid].value = v;
 		    } else {
@@ -1069,8 +1051,7 @@ byte server_change_password(char *p)
   return HTML_DATA_MISSING;
 }
 
-void server_json_status_main()
-{
+void server_json_status_main() {
   bfill.emit_p(PSTR("\"sn\":["));
   byte sid;
 
@@ -1078,17 +1059,15 @@ void server_json_status_main()
     bfill.emit_p(PSTR("$D"), (os.station_bits[(sid>>3)]>>(sid&0x07))&1);
     if(sid!=os.nstations-1) bfill.emit_p(PSTR(","));
   }
-  bfill.emit_p(PSTR("],\"nstations\":$D"), os.nstations);
+  bfill.emit_p(PSTR("],\"nstations\":$D}"), os.nstations);
+  delay(1);
 }
 
-/**
-  Output station status
-*/
+/** Output station status */
 byte server_json_status(char *p)
 {
-  print_json_header_with_bracket();
+  print_json_header();
   server_json_status_main();
-  print_json_close();
   return HTML_OK;
 }
 
@@ -1203,7 +1182,7 @@ byte server_json_log(char *p) {
   if (findKeyVal(p, type, 4, PSTR("type"), true))
     type_specified = true;
 
-  print_json_header();
+  print_json_header(false);
   bfill.emit_p(PSTR("["));
 
   bool first = true;
@@ -1290,21 +1269,22 @@ byte server_delete_log(char *p) {
 
 /** Output all JSON data, including jc, jp, jo, js, jn */
 byte server_json_all(char *p) {
-  print_json_header_with_bracket();
+  print_json_header();
+  bfill.emit_p(PSTR("\"settings\":{"));
   server_json_controller_main();
-  print_json_close(false);
   send_packet();
+  bfill.emit_p(PSTR(",\"programs\":{"));
   server_json_programs_main();
-  print_json_close(false);
   send_packet();
+  bfill.emit_p(PSTR(",\"options\":{"));
   server_json_options_main();
-  print_json_close(false);
   send_packet();
+  bfill.emit_p(PSTR(",\"status\":{"));
   server_json_status_main();
-  print_json_close(false);
   send_packet();
+  bfill.emit_p(PSTR(",\"stations\":{"));
   server_json_stations_main();
-  print_json_close();
+  bfill.emit_p(PSTR("}"));
   return HTML_OK;
 }
 
@@ -1428,7 +1408,7 @@ void handle_web_request(char *p)
         } else if ((com[0]=='j' && com[1]=='o') ||
                    (com[0]=='j' && com[1]=='a'))  { // for /jo and /ja we output fwv if password fails
           if(check_password(dat)==false) {
-            print_json_header_with_bracket();
+            print_json_header();
             bfill.emit_p(PSTR("\"$F\":$D}"),
                    os.options[0].json_str, os.options[0].value);
             ret = HTML_OK;
@@ -1452,7 +1432,7 @@ void handle_web_request(char *p)
           break;
         default:
           print_json_header();
-          bfill.emit_p(PSTR("{\"result\":$D}"), ret);
+          bfill.emit_p(PSTR("\"result\":$D}"), ret);
         }
         break;
       }
@@ -1461,7 +1441,7 @@ void handle_web_request(char *p)
     if(i==sizeof(urls)/sizeof(URLStruct)) {
       // no server funtion found
       print_json_header();
-      bfill.emit_p(PSTR("{\"result\":$D}"), HTML_PAGE_NOT_FOUND);
+      bfill.emit_p(PSTR("\"result\":$D}"), HTML_PAGE_NOT_FOUND);
     }
     send_packet(true);
   }
diff --git a/weather.cpp b/weather.cpp
index 9477f106..b71926f6 100644
--- a/weather.cpp
+++ b/weather.cpp
@@ -100,11 +100,9 @@ static void getweather_callback(byte status, uint16_t off, uint16_t len) {
 
 #if defined(ARDUINO)  // for AVR
 void GetWeather() {
-  // check if we've already done dns lookup
-  if(ether.hisip[0] == 0) {
-    nvm_read_block(tmp_buffer, (void*)ADDR_NVM_WEATHERURL, MAX_WEATHERURL);
-    ether.dnsLookup(tmp_buffer, true);
-  }
+  // perform DNS lookup for every query
+  nvm_read_block(tmp_buffer, (void*)ADDR_NVM_WEATHERURL, MAX_WEATHERURL);
+  ether.dnsLookup(tmp_buffer, true);
 
   //bfill=ether.tcpOffset();
   char tmp[30];
@@ -176,6 +174,7 @@ void GetWeather() {
 
   static struct hostent *server = NULL;
   if (!server) {
+    // fix me
     nvm_read_block(tmp_buffer, (void*)ADDR_NVM_WEATHERURL, MAX_WEATHERURL);
     server = gethostbyname(tmp_buffer);
     if (!server) {

From 1f6efdbf6278fb058b971eca88ee6445c8a26274 Mon Sep 17 00:00:00 2001
From: Samer Albahra <salbahra@gmail.com>
Date: Thu, 30 Jul 2015 17:24:12 -0700
Subject: [PATCH 07/39] Fix default UI path and add stns.dat to git ignore file

---
 .gitignore |  1 +
 defines.h  | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index a9b4e3ae..ed5fad16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ logs/**
 nvm.dat
 OpenSprinkler
 wtopts.txt
+stns.dat
diff --git a/defines.h b/defines.h
index 1fbce81f..4027048d 100644
--- a/defines.h
+++ b/defines.h
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see
- * <http://www.gnu.org/licenses/>. 
+ * <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _DEFINES_H
@@ -54,7 +54,7 @@
 #define STN_TYPE_OTHER       0xFF
 
 /** Non-volatile memory (NVM) defines */
-#if defined(ARDUINO) 
+#if defined(ARDUINO)
 
 /** 2KB NVM (ATmega644) data structure:
   * |         |     |  ---STRING PARAMETERS---      |           |   ----STATION ATTRIBUTES-----      |          |
@@ -105,7 +105,7 @@
     #define MAX_WEATHER_KEY     32    // weather api key,
 
   #endif
-  
+
 #else // NVM defines for RPI/BBB/LINUX
 
   // These are kept the same as AVR for compatibility
@@ -138,7 +138,7 @@
 #define ADDR_NVM_WEATHER_KEY   (ADDR_NVM_WEATHERURL+MAX_WEATHERURL)
 #define ADDR_NVM_STN_NAMES     (ADDR_NVM_WEATHER_KEY+MAX_WEATHER_KEY)
 #define ADDR_NVM_MAS_OP        (ADDR_NVM_STN_NAMES+MAX_NUM_STATIONS*STATION_NAME_SIZE) // master op bits
-#define ADDR_NVM_IGNRAIN       (ADDR_NVM_MAS_OP+(MAX_EXT_BOARDS+1))  // ignore rain bits 
+#define ADDR_NVM_IGNRAIN       (ADDR_NVM_MAS_OP+(MAX_EXT_BOARDS+1))  // ignore rain bits
 #define ADDR_NVM_MAS_OP_2      (ADDR_NVM_IGNRAIN+(MAX_EXT_BOARDS+1)) // master2 op bits
 #define ADDR_NVM_STNDISABLE    (ADDR_NVM_MAS_OP_2+(MAX_EXT_BOARDS+1))// station disable bits
 #define ADDR_NVM_STNSEQ        (ADDR_NVM_STNDISABLE+(MAX_EXT_BOARDS+1))// station sequential bits
@@ -149,10 +149,10 @@
 #define DEFAULT_PASSWORD          "opendoor"
 #define DEFAULT_LOCATION          "Boston,MA"
 #define DEFAULT_WEATHER_KEY       ""
-#define DEFAULT_JAVASCRIPT_URL    "http://ui.opensprinkler.com/js"
+#define DEFAULT_JAVASCRIPT_URL    "https://ui.opensprinkler.com/js"
 #define DEFAULT_WEATHER_URL       "weather.opensprinkler.com"
 
-/** Macro define of each option 
+/** Macro define of each option
   * Refer to OpenSprinkler.cpp for details on each option
   */
 typedef enum {
@@ -210,7 +210,7 @@ typedef enum {
 #undef OS_HW_VERSION
 
 /** Hardware defines */
-#if defined(ARDUINO) 
+#if defined(ARDUINO)
 
   #if F_CPU==8000000L
     #define OS_HW_VERSION (OS_HW_VERSION_BASE+20)
@@ -227,15 +227,15 @@ typedef enum {
   // hardware pins
   #define PIN_BUTTON_1      31    // button 1
   #define PIN_BUTTON_2      30    // button 2
-  #define PIN_BUTTON_3      29    // button 3 
-  #define PIN_RF_DATA       28    // RF data pin 
+  #define PIN_BUTTON_3      29    // button 3
+  #define PIN_RF_DATA       28    // RF data pin
   #define PORT_RF        PORTA
   #define PINX_RF        PINA3
   #define PIN_SR_LATCH       3    // shift register latch pin
   #define PIN_SR_DATA       21    // shift register data pin
   #define PIN_SR_CLOCK      22    // shift register clock pin
   #define PIN_SR_OE          1    // shift register output enable pin
-  
+
   // regular 16x2 LCD pin defines
   #define PIN_LCD_RS        19    // LCD rs pin
   #define PIN_LCD_EN        18    // LCD enable pin
@@ -245,11 +245,11 @@ typedef enum {
   #define PIN_LCD_D7        23    // LCD d7 pin
   #define PIN_LCD_BACKLIGHT 12    // LCD backlight pin
   #define PIN_LCD_CONTRAST  13    // LCD contrast pin
-  
+
   // DC controller pin defines
   #define PIN_BOOST         20    // booster pin
   #define PIN_BOOST_EN      23    // boost voltage enable pin
-  
+
   #define PIN_ETHER_CS       4    // Ethernet controller chip select pin
   #define PIN_SD_CS          0    // SD card chip select pin
   #define PIN_RAINSENSOR    11    // rain sensor is connected to pin D3
@@ -298,11 +298,11 @@ typedef enum {
   #define PIN_RF_DATA       15    // RF transmitter pin
   #define PIN_BUTTON_1      23    // button 1
   #define PIN_BUTTON_2      24    // button 2
-  #define PIN_BUTTON_3      25    // button 3   
-  
+  #define PIN_BUTTON_3      25    // button 3
+
   /** BBB pin defines */
   #elif defined(OSBO)
-  
+
   #define OS_HW_VERSION    OSBO_HW_VERSION_BASE
   // these are gpio pin numbers, refer to
   // https://github.com/mkaczanowski/BeagleBoneBlack-GPIO/blob/master/GPIO/GPIOConst.cpp
@@ -313,13 +313,13 @@ typedef enum {
   #define PIN_RAINSENSOR    48    // P9_15, rain sensor is connected to pin D3
   //#define PIN_RELAY         51    // P9_16, mini relay is connected to pin D14, relay support is now retired
   #define PIN_RF_DATA       51    // RF transmitter pin
-  
+
   #else
     // For Linux or other software simulators
     // use fake hardware pins
     #if defined(DEMO)
       #define OS_HW_VERSION 255   // assign hardware number 255 to DEMO firmware
-    #else    
+    #else
       #define OS_HW_VERSION SIM_HW_VERSION_BASE
     #endif
     #define PIN_SR_LATCH    0
@@ -329,11 +329,11 @@ typedef enum {
     #define PIN_RAINSENSOR  0
     //#define PIN_RELAY       0
     #define PIN_RF_DATA     0
-    
+
   #endif
-  
+
   #define ETHER_BUFFER_SIZE   16384
-    
+
   #define DEBUG_BEGIN(x)          {}  /** Serial debug functions */
   #define ENABLE_DEBUG
   #if defined(ENABLE_DEBUG)
@@ -349,13 +349,13 @@ typedef enum {
   inline void ultoa(unsigned long v,char *s,int b) {sprintf(s,"%lu",v);}
   #define now()       time(0)
   #define delay(x)    {}
-  
+
   /** Re-define avr-specific (e.g. PGM) types to use standard types */
   #define pgm_read_byte(x) *(x)
   #define PSTR(x)      x
   #define strcat_P     strcat
   #define strcpy_P     strcpy
-  #define PROGMEM 
+  #define PROGMEM
   typedef const char prog_char;
   typedef const char prog_uchar;
   typedef const char* PGM_P;
@@ -363,7 +363,7 @@ typedef enum {
   typedef short           int16_t;
   typedef unsigned short  uint16_t;
   typedef bool boolean;
-  
+
 #endif  // end of Hardawre defines
 
 #define TMP_BUFFER_SIZE     120  // scratch buffer size

From e0432daee360ea9e2e0087578fd40b434e4b2fc1 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Thu, 30 Jul 2015 20:35:01 -0400
Subject: [PATCH 08/39] fix closing bracket (for when wto is not present)

---
 server.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server.cpp b/server.cpp
index 2c643d84..8e84378d 100644
--- a/server.cpp
+++ b/server.cpp
@@ -791,8 +791,9 @@ void server_json_controller_main() {
   }
 
   if(read_from_file(wtopts_filename, tmp_buffer)) {
-    bfill.emit_p(PSTR(",\"wto\":{$S}}"), tmp_buffer);
+    bfill.emit_p(PSTR(",\"wto\":{$S}"), tmp_buffer);
   }
+  bfill.emit_p(PSTR("}"));
   delay(1);
 }
 

From df4b4d1e3b12e1746b502bc7b485ec99d90ff235 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Thu, 30 Jul 2015 23:44:49 -0400
Subject: [PATCH 09/39] fix detect_exp to allow detection of 6 expansion
 boards; add support for current sensing pin (if available) on OpenSprinkler
 DC

---
 OpenSprinkler.cpp | 30 +++++++++++++++++++++++-------
 OpenSprinkler.h   |  5 ++++-
 defines.h         |  2 ++
 main.cpp          | 12 ++++++------
 server.cpp        |  7 ++++++-
 weather.cpp       | 31 +++++++++++++++----------------
 6 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 6d4a4980..0b133ca6 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -460,7 +460,13 @@ void OpenSprinkler::begin() {
       digitalWrite(PIN_BOOST, LOW);
 
       pinMode(PIN_BOOST_EN, OUTPUT);
-      digitalWrite(PIN_BOOST_EN, LOW);        
+      digitalWrite(PIN_BOOST_EN, LOW);
+
+      // detect if current sensing pin is present
+      pinMode(PIN_CURR_DIGITAL, INPUT);
+      digitalWrite(PIN_CURR_DIGITAL, HIGH); // enable internal pullup
+      status.has_curr_sense = digitalRead(PIN_CURR_DIGITAL) ? 0 : 1;
+      digitalWrite(PIN_CURR_DIGITAL, LOW);
     }
   #endif
 
@@ -534,10 +540,8 @@ void OpenSprinkler::begin() {
   digitalWrite(PIN_BUTTON_2, HIGH);
   digitalWrite(PIN_BUTTON_3, HIGH);
 
-  // detect if DS1307 RTC exists
-  if (RTC.detect()==0) {
-    status.has_rtc = 1;
-  }
+  // detect and check RTC type
+  RTC.detect();
 #else
   DEBUG_PRINTLN(get_runtime_path());
 #endif
@@ -611,6 +615,16 @@ void OpenSprinkler::rainsensor_status() {
   status.rain_sensed = (digitalRead(PIN_RAINSENSOR) == options[OPTION_RAINSENSOR_TYPE].value ? 0 : 1);
 }
 
+//#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
+uint16_t OpenSprinkler::read_current() {
+  if(status.has_curr_sense) {
+    return (uint16_t)(analogRead(PIN_CURR_SENSE) * 14.65);
+  } else {
+    return 0;
+  }
+}
+//#endif
+
 int OpenSprinkler::detect_exp() { // AVR has capability to detect number of expansion boards
 #if defined(ARDUINO)
   unsigned int v = analogRead(PIN_EXP_SENSE);
@@ -619,8 +633,8 @@ int OpenSprinkler::detect_exp() { // AVR has capability to detect number of expa
   // each expansion board (8 stations) has 10K pull-down connected in parallel;
   // so the exact ADC value for n expansion boards is:
   //    ADC = 1024 * 10 / (10 + 1.5 * n)
-  // For  0,   1,   2,   3,   4,   5 expansion boards, the ADC values are:
-  //   1024, 890, 787, 706, 640, 585
+  // For  0,   1,   2,   3,   4,   5,  6 expansion boards, the ADC values are:
+  //   1024, 890, 787, 706, 640, 585, 539
   // Actual threshold is taken as the midpoint between, to account for errors
   int n = -1;
   if (v > 957) { // 0
@@ -635,6 +649,8 @@ int OpenSprinkler::detect_exp() { // AVR has capability to detect number of expa
     n = 4;
   } else if (v > 562) { // 5
     n = 5;
+  } else if (v > 520) { // 6
+    n = 6;
   } else {  // cannot determine
   }
   return n;
diff --git a/OpenSprinkler.h b/OpenSprinkler.h
index c4ca0dac..e3af1b98 100644
--- a/OpenSprinkler.h
+++ b/OpenSprinkler.h
@@ -70,7 +70,7 @@ struct ConStatus {
   byte rain_delayed:1;      // rain delay bit (when set, rain delay is applied)
   byte rain_sensed:1;       // rain sensor bit (when set, it indicates that rain is detected)
   byte program_busy:1;      // HIGH means a program is being executed currently
-  byte has_rtc:1;           // HIGH means the controller has a DS1307 RTC
+  byte has_curr_sense:1;    // HIGH means the controller has a current sensing pin
   byte has_sd:1;            // HIGH means a microSD card is detected
   byte safe_reboot:1;       // HIGH means a safe reboot has been marked
   byte has_hwmac:1;         // has hardware MAC chip
@@ -156,6 +156,9 @@ class OpenSprinkler {
   static void raindelay_start();  // start raindelay
   static void raindelay_stop();   // stop rain delay
   static void rainsensor_status();// update rainsensor status
+#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
+  static uint16_t read_current(); // read current sensing value
+#endif
   static int detect_exp();        // detect the number of expansion boards
   static byte weekday_today();    // returns index of today's weekday (Monday is 0)
 
diff --git a/defines.h b/defines.h
index 4027048d..57b2972d 100644
--- a/defines.h
+++ b/defines.h
@@ -254,6 +254,8 @@ typedef enum {
   #define PIN_SD_CS          0    // SD card chip select pin
   #define PIN_RAINSENSOR    11    // rain sensor is connected to pin D3
   #define PIN_EXP_SENSE      4    // expansion board sensing pin (A4)
+  #define PIN_CURR_SENSE     7    // current sensing pin (A7)
+  #define PIN_CURR_DIGITAL  24    // digital pin index for A7
 
   // Ethernet buffer size
   #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
diff --git a/main.cpp b/main.cpp
index e693c838..b20d5424 100644
--- a/main.cpp
+++ b/main.cpp
@@ -198,7 +198,7 @@ void do_setup() {
 
   setSyncInterval(RTC_SYNC_INTERVAL);  // RTC sync interval
   // if rtc exists, sets it as time sync source
-  setSyncProvider(os.status.has_rtc ? RTC.get : NULL);
+  setSyncProvider(RTC.get);
   delay(500);
   os.lcd_print_time(os.now_tz());  // display time to LCD
 
@@ -469,10 +469,10 @@ void do_loop()
               // fix me
               // upon turning on station, process RF
               // if the station is a RF station
-              /*if(os.rfstn_bits[bid]&(1<<s)) {
+              if(os.stnspe_bits[bid]&(1<<s)) {
                 // send RF on signal
                 os.send_rfstation_signal(sid, true);
-              }*/
+              }
             } //if curr_time > scheduled_start_time
           } // if current station is not running
         }//end_s
@@ -663,10 +663,10 @@ void turn_off_station(byte sid, ulong curr_time) {
     // upon turning off station, process RF station
     // if the station is a RF station
     // fix me
-    /*if(os.rfstn_bits[bid]&(1<<s)) {
+    if(os.stnspe_bits[(sid>>3)]&(1<<(sid&0x07))) {
       // turn off station
       os.send_rfstation_signal(sid, false);
-    }*/
+    }
   }
 
   // dequeue the element
@@ -1010,7 +1010,7 @@ void perform_ntp_sync() {
     ulong t = getNtpTime();
     if (t>0) {
       setTime(t);
-      if (os.status.has_rtc) RTC.set(t); // if rtc exists, update rtc
+      RTC.set(t);
     }
   }
 #else
diff --git a/server.cpp b/server.cpp
index 8e84378d..a2f7bac7 100644
--- a/server.cpp
+++ b/server.cpp
@@ -793,6 +793,11 @@ void server_json_controller_main() {
   if(read_from_file(wtopts_filename, tmp_buffer)) {
     bfill.emit_p(PSTR(",\"wto\":{$S}"), tmp_buffer);
   }
+#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
+  if(os.status.has_curr_sense) {
+    bfill.emit_p(PSTR(",\"curr\":$D"), os.read_current());
+  }
+#endif
   bfill.emit_p(PSTR("}"));
   delay(1);
 }
@@ -992,7 +997,7 @@ byte server_change_options(char *p)
     reset_all_stations_immediate();
 #if defined(ARDUINO)
     setTime(t);
-    if (os.status.has_rtc) RTC.set(t); // if rtc exists, update rtc
+    RTC.set(t);
 #endif
   }
   if(findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("wto"), true)) {
diff --git a/weather.cpp b/weather.cpp
index b71926f6..84f2701d 100644
--- a/weather.cpp
+++ b/weather.cpp
@@ -50,6 +50,7 @@ static void getweather_callback(byte status, uint16_t off, uint16_t len) {
   char *p = (char*)Ethernet::buffer + off;
 #else
   char *p = ether_buffer;
+  DEBUG_PRINTLN(p);
 #endif
   /* scan the buffer until the first & symbol */
   while(*p && *p!='&') {
@@ -172,24 +173,21 @@ void peel_http_header() { // remove the HTTP header
 void GetWeather() {
   EthernetClient client;
 
-  static struct hostent *server = NULL;
+  struct hostent *server;
+  nvm_read_block(tmp_buffer, (void*)ADDR_NVM_WEATHERURL, MAX_WEATHERURL);
+  server = gethostbyname(tmp_buffer);
   if (!server) {
-    // fix me
-    nvm_read_block(tmp_buffer, (void*)ADDR_NVM_WEATHERURL, MAX_WEATHERURL);
-    server = gethostbyname(tmp_buffer);
-    if (!server) {
-      DEBUG_PRINTLN("can't resolve weather server");
-      return;    
-    }
-    DEBUG_PRINT("weather server ip:");
-    DEBUG_PRINT(((uint8_t*)server->h_addr)[0]);
-    DEBUG_PRINT(":");
-    DEBUG_PRINT(((uint8_t*)server->h_addr)[1]);
-    DEBUG_PRINT(":");
-    DEBUG_PRINT(((uint8_t*)server->h_addr)[2]);
-    DEBUG_PRINT(":");
-    DEBUG_PRINTLN(((uint8_t*)server->h_addr)[3]);
+    DEBUG_PRINTLN("can't resolve weather server");
+    return;
   }
+  DEBUG_PRINT("weather server ip:");
+  DEBUG_PRINT(((uint8_t*)server->h_addr)[0]);
+  DEBUG_PRINT(":");
+  DEBUG_PRINT(((uint8_t*)server->h_addr)[1]);
+  DEBUG_PRINT(":");
+  DEBUG_PRINT(((uint8_t*)server->h_addr)[2]);
+  DEBUG_PRINT(":");
+  DEBUG_PRINTLN(((uint8_t*)server->h_addr)[3]);
 
   if (!client.connect((uint8_t*)server->h_addr, 80)) {
     DEBUG_PRINTLN("failed to connect to weather server");
@@ -231,6 +229,7 @@ void GetWeather() {
   strcat(urlBuffer, dst);
   strcat(urlBuffer, " HTTP/1.0\r\nHOST: weather.opensprinkler.com\r\n\r\n");
   
+  DEBUG_PRINTLN(urlBuffer);
   client.write((uint8_t *)urlBuffer, strlen(urlBuffer));
   
   bzero(ether_buffer, ETHER_BUFFER_SIZE);

From cb91ff5717bbe6709fa67188467e0f51e182cee4 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Thu, 30 Jul 2015 23:46:39 -0400
Subject: [PATCH 10/39] fix missing macro define

---
 OpenSprinkler.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 0b133ca6..96912b4e 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -615,7 +615,7 @@ void OpenSprinkler::rainsensor_status() {
   status.rain_sensed = (digitalRead(PIN_RAINSENSOR) == options[OPTION_RAINSENSOR_TYPE].value ? 0 : 1);
 }
 
-//#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
+#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
 uint16_t OpenSprinkler::read_current() {
   if(status.has_curr_sense) {
     return (uint16_t)(analogRead(PIN_CURR_SENSE) * 14.65);
@@ -623,7 +623,7 @@ uint16_t OpenSprinkler::read_current() {
     return 0;
   }
 }
-//#endif
+#endif
 
 int OpenSprinkler::detect_exp() { // AVR has capability to detect number of expansion boards
 #if defined(ARDUINO)

From d305a9f9dc4b0a84946d518a6ff1687094dd7e95 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Sat, 1 Aug 2015 11:07:35 -0400
Subject: [PATCH 11/39] add support for 'rd' in weather script

---
 OpenSprinkler.cpp |  5 ++++-
 weather.cpp       | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 96912b4e..533be054 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -190,7 +190,7 @@ OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
   {1,   1,   _str_den,  _json_den},   // device enable
   {0,   1,   _str_ipas, _json_ipas},  // 1: ignore password; 0: use password
   {0,   255, _str_devid,_json_devid}, // device id
-  {110, 255, _str_con,  _json_con},   // lcd contrast
+  {130, 255, _str_con,  _json_con},   // lcd contrast
   {100, 255, _str_lit,  _json_lit},   // lcd backlight
   {15,  255, _str_dim,  _json_dim},   // lcd dimming
   {60,  250, _str_bst,  _json_bst},   // boost time (only valid to DC and LATCH type)
@@ -616,6 +616,9 @@ void OpenSprinkler::rainsensor_status() {
 }
 
 #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
+// OpenSprinkler DC uses a 0.22 ohm current sensing resistor
+// Therefore the conversion from analog reading to milli-amp is:
+// (r/1024)*3.3*1000/0.22
 uint16_t OpenSprinkler::read_current() {
   if(status.has_curr_sense) {
     return (uint16_t)(analogRead(PIN_CURR_SENSE) * 14.65);
diff --git a/weather.cpp b/weather.cpp
index 84f2701d..cb92f3e3 100644
--- a/weather.cpp
+++ b/weather.cpp
@@ -96,6 +96,17 @@ static void getweather_callback(byte status, uint16_t off, uint16_t len) {
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("eip"), true)) {
     os.external_ip = atol(tmp_buffer);
   }
+
+  if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("rd"), true)) {
+    v = atoi(tmp_buffer);
+    if (v>0) {
+      os.nvdata.rd_stop_time = os.now_tz() + (unsigned long) v * 3600;
+      os.raindelay_start();
+    } else if (v==0) {
+      os.raindelay_stop();
+    }
+  }
+
   os.checkwt_success_lasttime = os.now_tz();
 }
 

From 1f35e3454ea8d0fb0e9bb8207ad0badbfbf97c77 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Sun, 2 Aug 2015 01:43:59 -0400
Subject: [PATCH 12/39] optimize memory usage by removing RAM copies of station
 attribute bits; removing support for POST request due to complications in
 handling packet assembly; adding initial flow sensor support

---
 OpenSprinkler.cpp | 84 +++++++++++++++++++++++-----------------------
 OpenSprinkler.h   | 21 ++++--------
 defines.h         | 32 ++++++++++++------
 main.cpp          | 85 +++++++++++++++++++++++++++--------------------
 server.cpp        | 81 +++++++++++++++-----------------------------
 weather.cpp       |  9 ++---
 6 files changed, 151 insertions(+), 161 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 533be054..c8c09427 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -33,21 +33,12 @@ byte OpenSprinkler::hw_type;
 byte OpenSprinkler::nboards;
 byte OpenSprinkler::nstations;
 byte OpenSprinkler::station_bits[MAX_EXT_BOARDS+1];
-byte OpenSprinkler::masop_bits[MAX_EXT_BOARDS+1];
-byte OpenSprinkler::ignrain_bits[MAX_EXT_BOARDS+1];
-byte OpenSprinkler::masop2_bits[MAX_EXT_BOARDS+1];
-byte OpenSprinkler::stndis_bits[MAX_EXT_BOARDS+1];
-byte OpenSprinkler::stnseq_bits[MAX_EXT_BOARDS+1];
-byte OpenSprinkler::stnspe_bits[MAX_EXT_BOARDS+1];
-
-ulong OpenSprinkler::rainsense_start_time;
+
+ulong OpenSprinkler::sensor_lasttime;
 ulong OpenSprinkler::raindelay_start_time;
 byte OpenSprinkler::button_timeout;
-ulong OpenSprinkler::ntpsync_lasttime;
 ulong OpenSprinkler::checkwt_lasttime;
 ulong OpenSprinkler::checkwt_success_lasttime;
-ulong OpenSprinkler::network_lasttime;
-ulong OpenSprinkler::external_ip;
 
 char tmp_buffer[TMP_BUFFER_SIZE+1];       // scratch buffer
 
@@ -92,7 +83,7 @@ static prog_char _json_sdt [] PROGMEM = "sdt";
 static prog_char _json_mas [] PROGMEM = "mas";
 static prog_char _json_mton[] PROGMEM = "mton";
 static prog_char _json_mtof[] PROGMEM = "mtof";
-static prog_char _json_urs [] PROGMEM = "urs";
+static prog_char _json_sf  [] PROGMEM = "urs";
 static prog_char _json_rso [] PROGMEM = "rso";
 static prog_char _json_wl  [] PROGMEM = "wl";
 static prog_char _json_den [] PROGMEM = "den";
@@ -112,6 +103,8 @@ static prog_char _json_mas2[] PROGMEM = "mas2";
 static prog_char _json_mton2[]PROGMEM = "mton2";
 static prog_char _json_mtof2[]PROGMEM = "mtof2";
 static prog_char _json_fwm[]  PROGMEM = "fwm";
+static prog_char _json_fpr0[] PROGMEM = "fpr0";
+static prog_char _json_fpr1[] PROGMEM = "fpr1";
 static prog_char _json_reset[] PROGMEM = "reset";
 
 /** Option names */
@@ -124,18 +117,14 @@ static prog_char _str_ip2 [] PROGMEM = ".ip2:";
 static prog_char _str_ip3 [] PROGMEM = ".ip3:";
 static prog_char _str_ip4 [] PROGMEM = ".ip4:";
 static prog_char _str_gw1 [] PROGMEM = "GW.ip1:";
-static prog_char _str_gw2 [] PROGMEM = ".ip2:";
-static prog_char _str_gw3 [] PROGMEM = ".ip3:";
-static prog_char _str_gw4 [] PROGMEM = ".ip4:";
-static prog_char _str_hp0 [] PROGMEM = "Port:";
-static prog_char _str_hp1 [] PROGMEM = "";
+static prog_char _str_hp  [] PROGMEM = "Port:";
 static prog_char _str_hwv [] PROGMEM = "HW: ";
 static prog_char _str_ext [] PROGMEM = "Exp. board:";
 static prog_char _str_sdt [] PROGMEM = "Stn delay:";
 static prog_char _str_mas [] PROGMEM = "Mas1:";
 static prog_char _str_mton[] PROGMEM = "Mas1  on adj:";
 static prog_char _str_mtof[] PROGMEM = "Mas1 off adj:";
-static prog_char _str_urs [] PROGMEM = "Rain sensor:";
+static prog_char _str_sf  [] PROGMEM = "Sensor:";
 static prog_char _str_rso [] PROGMEM = "Normally open?";
 static prog_char _str_wl  [] PROGMEM = "% Watering:";
 static prog_char _str_den [] PROGMEM = "Dev. enable?";
@@ -155,6 +144,7 @@ static prog_char _str_mas2[] PROGMEM = "Mas2:";
 static prog_char _str_mton2[]PROGMEM = "Mas2  on adj:";
 static prog_char _str_mtof2[]PROGMEM = "Mas2 off adj:";
 static prog_char _str_fwm[]  PROGMEM = "FWm:";
+static prog_char _str_fpr [] PROGMEM = "Pulse rate:";
 static prog_char _str_reset[] PROGMEM = "Reset all?";
 
 OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
@@ -167,15 +157,15 @@ OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
   {0,   255, _str_ip3,  _json_ip3},
   {0,   255, _str_ip4,  _json_ip4},
   {0,   255, _str_gw1,  _json_gw1},   // this and next 3 bytes define static gateway ip
-  {0,   255, _str_gw2,  _json_gw2},
-  {0,   255, _str_gw3,  _json_gw3},
-  {0,   255, _str_gw4,  _json_gw4},
+  {0,   255, _str_ip2,  _json_gw2},
+  {0,   255, _str_ip3,  _json_gw3},
+  {0,   255, _str_ip4,  _json_gw4},
 #if defined(ARDUINO)                  // on AVR, the default HTTP port is 80
-  {80,  255, _str_hp0,  _json_hp0},   // this and next byte define http port number
-  {0,   255, _str_hp1,  _json_hp1},
+  {80,  255, _str_hp,   _json_hp0},   // this and next byte define http port number
+  {0,   255, 0,         _json_hp1},
 #else                                 // on RPI/BBB/LINUX, the default HTTP port is 8080
-  {144, 255, _str_hp0,  _json_hp0},   // this and next byte define http port number
-  {31,  255, _str_hp1,  _json_hp1},
+  {144, 255, _str_hp,   _json_hp0},   // this and next byte define http port number
+  {31,  255, 0,         _json_hp1},
 #endif
   {OS_HW_VERSION, 0, _str_hwv, _json_hwv},
   {0,   MAX_EXT_BOARDS, _str_ext, _json_ext}, // number of extension board. 0: no extension boards
@@ -184,7 +174,7 @@ OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
   {0,   MAX_NUM_STATIONS, _str_mas,  _json_mas},   // index of master station. 0: no master station
   {0,   60,  _str_mton, _json_mton},  // master on time [0,60] seconds
   {60,  120, _str_mtof, _json_mtof},  // master off time [-60,60] seconds
-  {0,   1,   _str_urs,  _json_urs},   // rain sensor control bit. 1: use rain sensor input; 0: ignore
+  {0,   255, _str_sf,   _json_sf},    // sensor function (see SENSOR_TYPE macro defines)
   {1,   1,   _str_rso,  _json_rso},   // rain sensor type. 0: normally closed; 1: normally open.
   {100, 250, _str_wl,   _json_wl},    // water level (default 100%),
   {1,   1,   _str_den,  _json_den},   // device enable
@@ -193,7 +183,7 @@ OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
   {130, 255, _str_con,  _json_con},   // lcd contrast
   {100, 255, _str_lit,  _json_lit},   // lcd backlight
   {15,  255, _str_dim,  _json_dim},   // lcd dimming
-  {60,  250, _str_bst,  _json_bst},   // boost time (only valid to DC and LATCH type)
+  {80,  250, _str_bst,  _json_bst},   // boost time (only valid to DC and LATCH type)
   {0,   255, _str_uwt,  _json_uwt},   // weather algorithm (0 means not using weather algorithm)
   {50,  255, _str_ntp1, _json_ntp1},  // this and the next three bytes define the ntp server ip
   {97,  255, _str_ntp2, _json_ntp2},
@@ -204,6 +194,8 @@ OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
   {0,   60,  _str_mton2,_json_mton2},
   {60,  120, _str_mtof2,_json_mtof2}, 
   {OS_FW_MINOR, 0, _str_fwm, _json_fwm}, // firmware version  
+  {100, 255, _str_fpr,  _json_fpr0},
+  {0,   255, 0,         _json_fpr1},
   {0,   1,   _str_reset,_json_reset}
 };
 
@@ -260,8 +252,6 @@ byte OpenSprinkler::start_network() {
 
   lcd_print_line_clear_pgm(PSTR("Connecting..."), 1);
 
-  network_lasttime = now();
-
   // new from 2.2: read hardware MAC
   if(!read_hardware_mac())
   {
@@ -612,6 +602,7 @@ void OpenSprinkler::apply_all_station_bits() {
 
 void OpenSprinkler::rainsensor_status() {
   // options[OPTION_RS_TYPE]: 0 if normally closed, 1 if normally open
+  if(options[OPTION_SENSOR_TYPE].value!=SENSOR_TYPE_RAIN) return;
   status.rain_sensed = (digitalRead(PIN_RAINSENSOR) == options[OPTION_RAINSENSOR_TYPE].value ? 0 : 1);
 }
 
@@ -720,6 +711,10 @@ void OpenSprinkler::station_attrib_bits_load(int addr, byte bits[]) {
   nvm_read_block(bits, (void*)addr, MAX_EXT_BOARDS+1);
 }
 
+byte OpenSprinkler::station_attrib_bits_read(int addr) {
+  return nvm_read_byte((byte*)addr);
+}
+
 // verify if a string matches password
 byte OpenSprinkler::password_verify(char *pw) {
   byte *addr = (byte*)ADDR_NVM_PASSWORD;
@@ -897,17 +892,10 @@ void OpenSprinkler::options_setup() {
 
   {
     // load ram parameters from nvm
-    // 1. load options
+    // load options
     options_load();
-    // 2. station attributes
-    station_attrib_bits_load(ADDR_NVM_MAS_OP, masop_bits);
-    station_attrib_bits_load(ADDR_NVM_IGNRAIN, ignrain_bits);
-    station_attrib_bits_load(ADDR_NVM_MAS_OP_2, masop2_bits);
-    station_attrib_bits_load(ADDR_NVM_STNDISABLE, stndis_bits);
-    station_attrib_bits_load(ADDR_NVM_STNSEQ, stnseq_bits);
-    station_attrib_bits_load(ADDR_NVM_STNSPE, stnspe_bits);
     
-    // 3. load non-volatile controller data
+    // load non-volatile controller data
     nvdata_load();
   }
 
@@ -1132,7 +1120,7 @@ void OpenSprinkler::lcd_print_station(byte line, char c) {
 	}
 	lcd_print_pgm(PSTR("    "));
 	lcd.setCursor(13, 1);
-  if(status.rain_delayed || (status.rain_sensed && options[OPTION_USE_RAINSENSOR].value))
+  if(status.rain_delayed || (status.rain_sensed && options[OPTION_SENSOR_TYPE].value==SENSOR_TYPE_RAIN))
   {
     lcd.write(3);
   }
@@ -1195,6 +1183,15 @@ void OpenSprinkler::lcd_print_option(int i) {
   case OPTION_HTTPPORT_0:
     lcd.print((unsigned int)(options[i+1].value<<8)+options[i].value);
     break;
+  case OPTION_PULSE_RATE_0:
+    {
+    uint16_t fpr = (unsigned int)(options[i+1].value<<8)+options[i].value;
+    lcd.print(fpr/100);
+    lcd_print_pgm(PSTR("."));
+    lcd.print((fpr/10)%10);
+    lcd.print(fpr%10);
+    }
+    break;
   case OPTION_STATION_DELAY_TIME:
     lcd.print(water_time_decode_signed(options[i].value));
     break;
@@ -1295,13 +1292,15 @@ void OpenSprinkler::ui_set_options(int oid)
     switch (button & BUTTON_MASK) {
     case BUTTON_1:
       if (i==OPTION_FW_VERSION || i==OPTION_HW_VERSION || i==OPTION_FW_MINOR ||
-          i==OPTION_HTTPPORT_0 || i==OPTION_HTTPPORT_1) break; // ignore non-editable options
+          i==OPTION_HTTPPORT_0 || i==OPTION_HTTPPORT_1 ||
+          i==OPTION_PULSE_RATE_0 || i==OPTION_PULSE_RATE_1) break; // ignore non-editable options
       if (options[i].max != options[i].value) options[i].value ++;
       break;
 
     case BUTTON_2:
       if (i==OPTION_FW_VERSION || i==OPTION_HW_VERSION || i==OPTION_FW_MINOR ||
-          i==OPTION_HTTPPORT_0 || i==OPTION_HTTPPORT_1) break; // ignore non-editable options
+          i==OPTION_HTTPPORT_0 || i==OPTION_HTTPPORT_1 ||
+          i==OPTION_PULSE_RATE_0 || i==OPTION_PULSE_RATE_1) break; // ignore non-editable options
       if (options[i].value != 0) options[i].value --;
       break;
 
@@ -1320,7 +1319,8 @@ void OpenSprinkler::ui_set_options(int oid)
         // click, move to the next option
         if (i==OPTION_USE_DHCP && options[i].value) i += 9; // if use DHCP, skip static ip set
         else if(i==OPTION_HTTPPORT_0) i+=2; // skip OPTION_HTTPPORT_1
-        else if(i==OPTION_USE_RAINSENSOR && options[i].value==0) i+=2; // if not using rain sensor, skip rain sensor type
+        else if(i==OPTION_PULSE_RATE_0) i+=2; // skip OPTION_PULSE_RATE_1
+        else if(i==OPTION_SENSOR_TYPE && options[i].value!=SENSOR_TYPE_RAIN) i+=2; // if not using rain sensor, skip rain sensor type
         else if(i==OPTION_MASTER_STATION && options[i].value==0) i+=3; // if not using master station, skip master on/off adjust
         else if(i==OPTION_MASTER_STATION_2&& options[i].value==0) i+=3; // if not using master2, skip master2 on/off adjust
         else  {
diff --git a/OpenSprinkler.h b/OpenSprinkler.h
index e3af1b98..870bb51e 100644
--- a/OpenSprinkler.h
+++ b/OpenSprinkler.h
@@ -56,6 +56,7 @@ struct NVConData {
   uint16_t sunrise_time;  // sunrise time (in minutes)
   uint16_t sunset_time;   // sunset time (in minutes)
   uint32_t rd_stop_time;  // rain delay stop time
+  uint32_t external_ip;   // external ip
 };
 
 /** Station special attribute data */
@@ -74,8 +75,10 @@ struct ConStatus {
   byte has_sd:1;            // HIGH means a microSD card is detected
   byte safe_reboot:1;       // HIGH means a safe reboot has been marked
   byte has_hwmac:1;         // has hardware MAC chip
-  byte display_board:4;     // the board that is being displayed onto the lcd
-  byte network_fails:4;     // number of network fails
+  byte req_ntpsync:1;       // request ntpsync
+  byte req_network:1;       // request check network
+  byte display_board:3;     // the board that is being displayed onto the lcd
+  byte network_fails:3;     // number of network fails
   byte mas:8;               // master station index
   byte mas2:8;              // master2 station index
 };
@@ -105,24 +108,13 @@ class OpenSprinkler {
 
   static byte station_bits[];     // station activation bits. each byte corresponds to a board (8 stations)
                                   // first byte-> master controller, second byte-> ext. board 1, and so on
-  // station attributes
-  static byte masop_bits[];       // master operation bits. each byte corresponds to a board (8 stations)
-  static byte ignrain_bits[];     // ignore rain bits.
-  static byte masop2_bits[];      // master2 operation bits.
-  static byte stndis_bits[];      // station disable bits.
-  static byte stnseq_bits[];      // station sequential bits.
-  static byte stnspe_bits[];      // station special bits. the bit marks if this is a non-standard station.
   
   // variables for time keeping
-  static ulong rainsense_start_time;  // time when the most recent rain sensor activation was detected
+  static ulong sensor_lasttime;  // time when the most recent sensor reading was performed
   static ulong raindelay_start_time;  // time when the most recent rain delay started
   static byte  button_timeout;        // button timeout
-  static ulong ntpsync_lasttime;      // time when ntp sync was performed
   static ulong checkwt_lasttime;      // time when weather was checked
   static ulong checkwt_success_lasttime; // time when weather check was successful
-  static ulong network_lasttime;      // time when network was checked
-  static ulong external_ip;           // external ip address
-
   // member functions
   // -- setup
   static void reboot_dev();   // reboot the microcontroller
@@ -139,6 +131,7 @@ class OpenSprinkler {
   static void send_rfstation_signal(byte sid, bool status);
   static void station_attrib_bits_save(int addr, byte bits[]); // save station attribute bits to nvm
   static void station_attrib_bits_load(int addr, byte bits[]); // load station attribute bits from nvm
+  static byte station_attrib_bits_read(int addr); // read one station attribte byte from nvm
   
   // -- options and data storeage
   static void nvdata_load();
diff --git a/defines.h b/defines.h
index 57b2972d..2c9f551b 100644
--- a/defines.h
+++ b/defines.h
@@ -53,23 +53,29 @@
 #define STN_TYPE_REMOTE      0x02
 #define STN_TYPE_OTHER       0xFF
 
+/** Sensor type macro defines */
+#define SENSOR_TYPE_NONE    0x00
+#define SENSOR_TYPE_RAIN    0x01
+#define SENSOR_TYPE_FLOW    0x02
+#define SENSOR_TYPE_OTHER   0xFF
+
 /** Non-volatile memory (NVM) defines */
 #if defined(ARDUINO)
 
 /** 2KB NVM (ATmega644) data structure:
   * |         |     |  ---STRING PARAMETERS---      |           |   ----STATION ATTRIBUTES-----      |          |
   * | PROGRAM | CON | PWD | LOC | JURL | WURL | KEY | STN_NAMES | MAS | IGR | MAS2 | DIS | SEQ | SPE | OPTIONS  |
-  * |  (996)  | (8) |(32) |(48) | (40) | (40) |(32) |   (768)   | (6) | (6) |  (6) | (6) | (6) | (6) |   (54)   |
+  * |  (996)  |(12) |(32) |(48) | (40) | (40) |(32) |   (768)   | (6) | (6) |  (6) | (6) | (6) | (6) |  (44)    |
   * |         |     |     |     |      |      |     |           |     |     |      |     |     |     |          |
-  * 0        996  1004   1036  1084  1124   1164   1196        1964  1970  1976   1982  1988  1994  2000      2048
+  * 0        996  1008   1040  1088  1128   1168   1200        1968  1974  1980   1986  1992  1998  2004      2048
   */
 
 /** 4KB NVM (ATmega1284) data structure:
   * |         |     |  ---STRING PARAMETERS---      |           |   ----STATION ATTRIBUTES-----      |          |
   * | PROGRAM | CON | PWD | LOC | JURL | WURL | KEY | STN_NAMES | MAS | IGR | MAS2 | DIS | SEQ | SPE | OPTIONS  |
-  * |  (2438) | (8) |(32) |(48) | (48) | (48) |(32) |   (1344)  | (7) | (7) |  (7) | (7) | (7) | (7) |   (56)   |
+  * |  (2438) |(12) |(32) |(48) | (48) | (48) |(32) |   (1344)  | (7) | (7) |  (7) | (7) | (7) | (7) |   (52)   |
   * |         |     |     |     |      |      |     |           |     |     |      |     |     |     |          |
-  * 0       2438  2446   2478  2526  2574   2622   2654        3998  4005  4012   4019  4026  4033  4040      4096
+  * 0       2438  2450   2482  2530  2578   2626   2658        4002  4009  4016   4023  4030  4037  4044      4096
   */
 
   #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__) // for 4KB NVM
@@ -81,7 +87,7 @@
     #define STATION_NAME_SIZE   24    // maximum number of characters in each station name
 
     #define MAX_PROGRAMDATA     2438  // program data
-    #define MAX_NVCONDATA       8     // non-volatile controller data
+    #define MAX_NVCONDATA       12    // non-volatile controller data
     #define MAX_USER_PASSWORD   32    // user password
     #define MAX_LOCATION        48    // location string
     #define MAX_JAVASCRIPTURL   48    // javascript url
@@ -97,7 +103,7 @@
     #define STATION_NAME_SIZE   16    // maximum number of characters in each station name
 
     #define MAX_PROGRAMDATA     996   // program data
-    #define MAX_NVCONDATA       8     // non-volatile controller data
+    #define MAX_NVCONDATA       12     // non-volatile controller data
     #define MAX_USER_PASSWORD   32    // user password
     #define MAX_LOCATION        48    // location string
     #define MAX_JAVASCRIPTURL   40    // javascript url
@@ -119,7 +125,7 @@
   #define STATION_NAME_SIZE   24    // maximum number of characters in each station name
 
   #define MAX_PROGRAMDATA     2438  // program data
-  #define MAX_NVCONDATA       8     // non-volatile controller data
+  #define MAX_NVCONDATA       12     // non-volatile controller data
   #define MAX_USER_PASSWORD   32    // user password
   #define MAX_LOCATION        48    // location string
   #define MAX_JAVASCRIPTURL   48    // javascript url
@@ -177,7 +183,7 @@ typedef enum {
   OPTION_MASTER_STATION,
   OPTION_MASTER_ON_ADJ,
   OPTION_MASTER_OFF_ADJ,
-  OPTION_USE_RAINSENSOR,
+  OPTION_SENSOR_TYPE,
   OPTION_RAINSENSOR_TYPE,
   OPTION_WATER_PERCENTAGE,
   OPTION_DEVICE_ENABLE,
@@ -197,6 +203,8 @@ typedef enum {
   OPTION_MASTER_ON_ADJ_2,
   OPTION_MASTER_OFF_ADJ_2,
   OPTION_FW_MINOR,
+  OPTION_PULSE_RATE_0,
+  OPTION_PULSE_RATE_1,
   OPTION_RESET,
   NUM_OPTIONS	// total number of options
 } OS_OPTION_t;
@@ -253,6 +261,8 @@ typedef enum {
   #define PIN_ETHER_CS       4    // Ethernet controller chip select pin
   #define PIN_SD_CS          0    // SD card chip select pin
   #define PIN_RAINSENSOR    11    // rain sensor is connected to pin D3
+  #define PIN_FLOWSENSOR    11    // flow sensor (currently shared with rain sensor, change if using a different pin)
+  #define PIN_FLOWSENSOR_INT 1    // flow sensor interrupt pin (INT1)
   #define PIN_EXP_SENSE      4    // expansion board sensing pin (A4)
   #define PIN_CURR_SENSE     7    // current sensing pin (A7)
   #define PIN_CURR_DIGITAL  24    // digital pin index for A7
@@ -296,7 +306,7 @@ typedef enum {
   #define PIN_SR_CLOCK       4    // shift register clock pin
   #define PIN_SR_OE         17    // shift register output enable pin
   #define PIN_RAINSENSOR    14    // rain sensor
-  //#define PIN_RELAY         15    // mini relay, relay support is now retired
+  #define PIN_FLOWSENSOR    14    // flow sensor (currently shared with rain sensor, change if using a different pin)
   #define PIN_RF_DATA       15    // RF transmitter pin
   #define PIN_BUTTON_1      23    // button 1
   #define PIN_BUTTON_2      24    // button 2
@@ -313,7 +323,7 @@ typedef enum {
   #define PIN_SR_CLOCK      31    // P9_13, shift register clock pin
   #define PIN_SR_OE         50    // P9_14, shift register output enable pin
   #define PIN_RAINSENSOR    48    // P9_15, rain sensor is connected to pin D3
-  //#define PIN_RELAY         51    // P9_16, mini relay is connected to pin D14, relay support is now retired
+  #define PIN_FLOWSENSOR    48    // flow sensor (currently shared with rain sensor, change if using a different pin)
   #define PIN_RF_DATA       51    // RF transmitter pin
 
   #else
@@ -329,7 +339,7 @@ typedef enum {
     #define PIN_SR_CLOCK    0
     #define PIN_SR_OE       0
     #define PIN_RAINSENSOR  0
-    //#define PIN_RELAY       0
+    #define PIN_FLOWSENSOR  0
     #define PIN_RF_DATA     0
 
   #endif
diff --git a/main.cpp b/main.cpp
index b20d5424..25041485 100644
--- a/main.cpp
+++ b/main.cpp
@@ -49,9 +49,9 @@ EthernetClient *m_client = 0;
 // to avoid two events happening too clost to each other
 // This is because Arduino is not good at handling multiple
 // web requests at the same time
-#define NTP_SYNC_TIMEOUT        86403L  // NYP sync timeout, 24 hrs
+#define NTP_SYNC_INTERVAL       86403L  // NYP sync interval, 24 hrs
 #define RTC_SYNC_INTERVAL       60      // RTC sync interval, 60 secs
-#define CHECK_NETWORK_TIMEOUT   59      // Network checking timeout, 59 secs
+#define CHECK_NETWORK_INTERVAL  601     // Network checking timeout, 10 minutes
 #define CHECK_WEATHER_TIMEOUT   3601    // Weather check interval: 1 hour
 #define CHECK_WEATHER_SUCCESS_TIMEOUT 86433L // Weather check success interval: 24 hrs
 #define LCD_BACKLIGHT_TIMEOUT   15      // LCD backlight timeout: 15 secs
@@ -121,7 +121,7 @@ void ui_state_machine() {
     case BUTTON_2:
       if (button & BUTTON_FLAG_HOLD) {  // holding B2: reboot
         if (digitalRead(PIN_BUTTON_1)==0) { // if B1 is pressed while holding B2, display external IP
-          os.lcd_print_ip((byte*)(&os.external_ip), 1);
+          os.lcd_print_ip((byte*)(&os.nvdata.external_ip), 1);
           os.lcd.setCursor(0, 1);
           os.lcd_print_pgm(PSTR("(eip)"));
           ui_state = UI_STATE_DISP_IP;
@@ -181,6 +181,15 @@ void ui_state_machine() {
   }
 }
 
+volatile ulong flow_count = 0;
+// Flow sensor interrupt service routine
+void flow_isr() {
+  ulong curr = millis();
+  if(curr-os.sensor_lasttime < 50) return;  // debounce threshold: 50ms
+  flow_count++;
+  os.sensor_lasttime = curr;
+}
+
 // ======================
 // Setup Function
 // ======================
@@ -190,7 +199,6 @@ void do_setup() {
 
   DEBUG_BEGIN(9600);
   DEBUG_PRINTLN("started.");
-  
   os.begin();          // OpenSprinkler init
   os.options_setup();  // Setup options
 
@@ -212,11 +220,17 @@ void do_setup() {
   /* Enable the WD interrupt (note no reset). */
   WDTCSR |= _BV(WDIE);
 
+  // set up flow sensor
+  if (os.options[OPTION_SENSOR_TYPE].value==SENSOR_TYPE_FLOW) {
+    attachInterrupt(PIN_FLOWSENSOR_INT, flow_isr, FALLING);
+  }
   if (os.start_network()) {  // initialize network
     os.status.network_fails = 0;
   } else {
     os.status.network_fails = 1;
   }
+  os.status.req_network = 0;
+  os.status.req_ntpsync = 1;
   delay(500);
 
   os.apply_all_station_bits(); // reset station bits
@@ -238,6 +252,7 @@ ISR(WDT_vect)
     sysReset();
   }
 }
+
 #else
 void do_setup() {
   os.begin();          // OpenSprinkler init
@@ -251,6 +266,7 @@ void do_setup() {
     DEBUG_PRINTLN("network failed.");
     os.status.network_fails = 1;
   }
+  os.status.req_network = 0;
 }
 #endif
 
@@ -330,9 +346,6 @@ void do_loop()
       }
     }
 
-    // ====== Check rain sensor status ======
-    os.rainsensor_status();
-
     // ====== Check controller status changes and write log ======
     if (os.old_status.rain_delayed != os.status.rain_delayed) {
       if (os.status.rain_delayed) {
@@ -344,10 +357,12 @@ void do_loop()
       }
       os.old_status.rain_delayed = os.status.rain_delayed;
     }
+    // ====== Check rain sensor status ======
+    os.rainsensor_status();
     if (os.old_status.rain_sensed != os.status.rain_sensed) {
       if (os.status.rain_sensed) {
         // rain sensor on, record time
-        os.rainsense_start_time = curr_time;
+        os.sensor_lasttime = curr_time;
       } else {
         // rain sensor off, write log
         write_log(LOGDATA_RAINSENSE, curr_time);
@@ -372,14 +387,12 @@ void do_loop()
           for(sid=0;sid<os.nstations;sid++) {
             bid=sid>>3;
             s=sid&0x07;
-            // skip if the station is:
-            // - master station (because master cannot be scheduled independently
-            // - disabled
-            if ((os.status.mas==sid+1) || (os.status.mas2==sid+1) || (os.stndis_bits[bid]&(1<<s)))
+            // skip if the station is a master station (because master cannot be scheduled independently
+            if ((os.status.mas==sid+1) || (os.status.mas2==sid+1))
               continue;
 
-            // if station has non-zero water time
-            if (prog.durations[sid]) {
+            // if station has non-zero water time and the station is not disabled
+            if (prog.durations[sid] && !(os.station_attrib_bits_read(ADDR_NVM_STNDISABLE+bid)&(1<<s))) {
               // water time is scaled by watering percentage
               ulong water_time = water_time_resolve(water_time_decode(prog.durations[sid]));
               // if the program is set to use weather scaling
@@ -469,7 +482,7 @@ void do_loop()
               // fix me
               // upon turning on station, process RF
               // if the station is a RF station
-              if(os.stnspe_bits[bid]&(1<<s)) {
+              if(os.station_attrib_bits_read(ADDR_NVM_STNSPE+bid)&(1<<s)) {
                 // send RF on signal
                 os.send_rfstation_signal(sid, true);
               }
@@ -503,7 +516,7 @@ void do_loop()
         // and the stop time must be larger than curr_time
         sst = q->st + q->dur;
         if (sst>curr_time) {
-          if (os.stnseq_bits[bid]&(1<<s)) {   // only need to update last_seq_stop_time for sequential stations
+          if (os.station_attrib_bits_read(ADDR_NVM_STNSEQ+bid)&(1<<s)) {   // only need to update last_seq_stop_time for sequential stations
             pd.last_seq_stop_time = (sst>pd.last_seq_stop_time ) ? sst : pd.last_seq_stop_time;
           }
         }
@@ -531,13 +544,14 @@ void do_loop()
       byte mas_on_adj = os.options[OPTION_MASTER_ON_ADJ].value;
       byte mas_off_adj= os.options[OPTION_MASTER_OFF_ADJ].value;
       byte masbit = 0;
+      os.station_attrib_bits_load(ADDR_NVM_MAS_OP, (byte*)tmp_buffer);  // tmp_buffer now stores masop_bits
       for(sid=0;sid<os.nstations;sid++) {
         // skip if this is the master station
         if (os.status.mas == sid+1) continue;
         bid = sid>>3;
         s = sid&0x07;
         // if this station is running and is set to activate master
-        if ((os.station_bits[bid]&(1<<s)) && (os.masop_bits[bid]&(1<<s))) {
+        if ((os.station_bits[bid]&(1<<s)) && (tmp_buffer[bid]&(1<<s))) {
           q=pd.queue+pd.station_qid[sid];
           // check if timing is within the acceptable range
           if (curr_time >= q->st + mas_on_adj &&
@@ -554,13 +568,14 @@ void do_loop()
       byte mas_on_adj_2 = os.options[OPTION_MASTER_ON_ADJ_2].value;
       byte mas_off_adj_2= os.options[OPTION_MASTER_OFF_ADJ_2].value;
       byte masbit2 = 0;
+      os.station_attrib_bits_load(ADDR_NVM_MAS_OP_2, (byte*)tmp_buffer);  // tmp_buffer now stores masop2_bits
       for(sid=0;sid<os.nstations;sid++) {
         // skip if this is the master station
         if (os.status.mas2 == sid+1) continue;
         bid = sid>>3;
         s = sid&0x07;
         // if this station is running and is set to activate master
-        if ((os.station_bits[bid]&(1<<s)) && (os.masop2_bits[bid]&(1<<s))) {
+        if ((os.station_bits[bid]&(1<<s)) && (tmp_buffer[bid]&(1<<s))) {
           q=pd.queue+pd.station_qid[sid];
           // check if timing is within the acceptable range
           if (curr_time >= q->st + mas_on_adj_2 &&
@@ -605,9 +620,13 @@ void do_loop()
 #endif
 
     // perform ntp sync
+    if (curr_time % NTP_SYNC_INTERVAL == 0)
+      os.status.req_ntpsync = 1;
     perform_ntp_sync();
 
     // check network connection
+    if (curr_time % CHECK_NETWORK_INTERVAL==0)
+      os.status.req_network = 1;
     check_network();
 
     // check weather
@@ -663,7 +682,9 @@ void turn_off_station(byte sid, ulong curr_time) {
     // upon turning off station, process RF station
     // if the station is a RF station
     // fix me
-    if(os.stnspe_bits[(sid>>3)]&(1<<(sid&0x07))) {
+    byte bid = sid>>3;
+    byte s = sid&0x07;
+    if(os.station_attrib_bits_read(ADDR_NVM_STNSPE+bid)&(1<<s)) {
       // turn off station
       os.send_rfstation_signal(sid, false);
     }
@@ -677,13 +698,13 @@ void turn_off_station(byte sid, ulong curr_time) {
 void process_dynamic_events(ulong curr_time) {
   // check if rain is detected
   bool rain = false;
-  if (os.status.rain_delayed || (os.options[OPTION_USE_RAINSENSOR].value && os.status.rain_sensed)) {
+  if (os.status.rain_delayed || (os.status.rain_sensed && os.options[OPTION_SENSOR_TYPE].value == SENSOR_TYPE_RAIN)) {
     rain = true;
   }
 
   byte sid, s, bid, rbits, sbits;
   for(bid=0;bid<os.nboards;bid++) {
-    rbits = os.ignrain_bits[bid];
+    rbits = os.station_attrib_bits_read(ADDR_NVM_IGNRAIN+bid);
     sbits = os.station_bits[bid];
     for(s=0;s<8;s++) {
       sid=bid*8+s;
@@ -733,7 +754,7 @@ void schedule_all_stations(ulong curr_time) {
     byte s=sid&0x07;
 
     // check if this is a sequential station
-    if (os.stnseq_bits[bid]&(1<<s)) {
+    if (os.station_attrib_bits_read(ADDR_NVM_STNSEQ+bid)&(1<<s)) {
       // sequential scheduling
       q->st = seq_start_time;
       seq_start_time += q->dur;
@@ -789,7 +810,7 @@ void manual_start_program(byte pid) {
     else if(pid>0)
       dur = water_time_resolve(water_time_decode(prog.durations[sid]));
     RuntimeQueueStruct *q = pd.enqueue();
-    if (q && dur>0 && !(os.stndis_bits[bid]&(1<<s))) {
+    if (q && dur>0 && !(os.station_attrib_bits_read(ADDR_NVM_STNDISABLE+bid)&(1<<s))) {
       q->st = 0;
       q->dur = dur;
       q->sid = sid;
@@ -883,7 +904,7 @@ void write_log(byte type, ulong curr_time) {
     strcat_P(tmp_buffer, PSTR("\","));
     switch(type) {
       case LOGDATA_RAINSENSE:
-        ultoa((curr_time - os.rainsense_start_time), tmp_buffer+strlen(tmp_buffer), 10);
+        ultoa((curr_time - os.sensor_lasttime), tmp_buffer+strlen(tmp_buffer), 10);
         break;
       case LOGDATA_RAINDELAY:
         ultoa((curr_time - os.raindelay_start_time), tmp_buffer+strlen(tmp_buffer), 10);
@@ -945,17 +966,9 @@ void check_network() {
   // do not perform network checking if the controller has just started, or if a program is running
   if (os.status.program_busy) {return;}
 
-  /*if (!os.network_lasttime) {
-    os.start_network();
-  }*/
-
   // check network condition periodically
-  // check interval depends on the fail times
-  // the more time it fails, the longer the gap between two checks
-  ulong timeout = 1 << (os.status.network_fails);
-  timeout *= CHECK_NETWORK_TIMEOUT;
-  if (now() > os.network_lasttime + timeout) {
-    os.network_lasttime = now();
+  if (os.status.req_network) {
+    os.status.req_network = 0;
     // change LCD icon to indicate it's checking network
     if (!ui_state) {
       os.lcd.setCursor(15, 1);
@@ -1002,8 +1015,8 @@ void perform_ntp_sync() {
   // do not perform sync if this option is disabled, or if network is not available, or if a program is running
   if (!os.options[OPTION_USE_NTP].value || os.status.network_fails>0 || os.status.program_busy) return;
 
-  if (!os.ntpsync_lasttime || (os.now_tz() > os.ntpsync_lasttime+NTP_SYNC_TIMEOUT)) {
-    os.ntpsync_lasttime = os.now_tz();
+  if (os.status.req_ntpsync) {
+    os.status.req_ntpsync = 0;
     if (!ui_state) {
       os.lcd_print_line_clear_pgm(PSTR("NTP Syncing..."),1);
     }
diff --git a/server.cpp b/server.cpp
index a2f7bac7..666fa3ec 100644
--- a/server.cpp
+++ b/server.cpp
@@ -30,6 +30,7 @@
 #include "SdFat.h"
 extern SdFat sd;
 static uint8_t ntpclientportL = 123; // Default NTP client port
+extern ulong flow_count;
 
 #else
 
@@ -349,8 +350,10 @@ boolean check_password(char *p)
   return false;
 }
 
-void server_json_stations_attrib(const char* name, const byte* attrib)
+void server_json_stations_attrib(const char* name, int addr)
 {
+  byte *attrib = (byte*)tmp_buffer;
+  os.station_attrib_bits_load(addr, attrib);
   bfill.emit_p(PSTR("\"$F\":["), name);
   for(byte i=0;i<os.nboards;i++) {
     bfill.emit_p(PSTR("$D"), attrib[i]);
@@ -362,12 +365,12 @@ void server_json_stations_attrib(const char* name, const byte* attrib)
 
 void server_json_stations_main()
 {
-  server_json_stations_attrib(PSTR("masop"), os.masop_bits);
-  server_json_stations_attrib(PSTR("ignore_rain"), os.ignrain_bits);
-  server_json_stations_attrib(PSTR("masop2"), os.masop2_bits);
-  server_json_stations_attrib(PSTR("stn_dis"), os.stndis_bits);
-  server_json_stations_attrib(PSTR("stn_seq"), os.stnseq_bits);
-  server_json_stations_attrib(PSTR("stn_spe"), os.stnspe_bits);
+  server_json_stations_attrib(PSTR("masop"), ADDR_NVM_MAS_OP);
+  server_json_stations_attrib(PSTR("ignore_rain"), ADDR_NVM_IGNRAIN);
+  server_json_stations_attrib(PSTR("masop2"), ADDR_NVM_MAS_OP_2);
+  server_json_stations_attrib(PSTR("stn_dis"), ADDR_NVM_STNDISABLE);
+  server_json_stations_attrib(PSTR("stn_seq"), ADDR_NVM_STNSEQ);
+  server_json_stations_attrib(PSTR("stn_spe"), ADDR_NVM_STNSPE);
   bfill.emit_p(PSTR("\"snames\":["));
   byte sid;
   for(sid=0;sid<os.nstations;sid++) {
@@ -390,8 +393,10 @@ byte server_json_stations(char *p) {
   return HTML_OK;
 }
 
-void server_change_stations_attrib(char *p, char header, byte *attrib)
+void server_change_stations_attrib(char *p, char header, int addr)
 {
+  byte attrib[MAX_EXT_BOARDS+1];
+  os.station_attrib_bits_load(addr, attrib);
   char tbuf2[3] = {0, 0, 0};
   byte bid;
   tbuf2[0]=header;
@@ -401,6 +406,7 @@ void server_change_stations_attrib(char *p, char header, byte *attrib)
       attrib[bid] = atoi(tmp_buffer);
     }
   }
+  os.station_attrib_bits_save(addr, attrib);
 }
 
 /**
@@ -427,23 +433,12 @@ byte server_change_stations(char *p)
     }
   }
 
-  server_change_stations_attrib(p, 'm', os.masop_bits); // master1
-  os.station_attrib_bits_save(ADDR_NVM_MAS_OP, os.masop_bits);
-
-  server_change_stations_attrib(p, 'i', os.ignrain_bits); // ignore rain
-  os.station_attrib_bits_save(ADDR_NVM_IGNRAIN, os.ignrain_bits);
-
-  server_change_stations_attrib(p, 'n', os.masop2_bits); // master2
-  os.station_attrib_bits_save(ADDR_NVM_MAS_OP_2, os.masop2_bits);
-
-  server_change_stations_attrib(p, 'd', os.stndis_bits); // disable
-  os.station_attrib_bits_save(ADDR_NVM_STNDISABLE, os.stndis_bits);
-
-  server_change_stations_attrib(p, 'q', os.stnseq_bits); // sequential
-  os.station_attrib_bits_save(ADDR_NVM_STNSEQ, os.stnseq_bits);
-
-  server_change_stations_attrib(p, 'p', os.stnseq_bits); // special
-  os.station_attrib_bits_save(ADDR_NVM_STNSPE, os.stnspe_bits);
+  server_change_stations_attrib(p, 'm', ADDR_NVM_MAS_OP); // master1
+  server_change_stations_attrib(p, 'i', ADDR_NVM_IGNRAIN); // ignore rain
+  server_change_stations_attrib(p, 'n', ADDR_NVM_MAS_OP_2); // master2
+  server_change_stations_attrib(p, 'd', ADDR_NVM_STNDISABLE); // disable
+  server_change_stations_attrib(p, 'q', ADDR_NVM_STNSEQ); // sequential
+  server_change_stations_attrib(p, 'p', ADDR_NVM_STNSPE); // special
 
   return HTML_SUCCESS;
 }
@@ -499,7 +494,7 @@ byte server_change_runonce(char *p) {
     s=sid&0x07;
     // if non-zero duration is given
     // and if the station has not been disabled
-    if (dur>0 && !(os.stndis_bits[bid]&(1<<s))) {
+    if (dur>0 && !(os.station_attrib_bits_read(ADDR_NVM_STNDISABLE+bid)&(1<<s))) {
       RuntimeQueueStruct *q = pd.enqueue();
       if (q) {
         q->st = 0;
@@ -760,7 +755,7 @@ void server_json_controller_main() {
               ADDR_NVM_WEATHER_KEY,
               os.nvdata.sunrise_time,
               os.nvdata.sunset_time,
-              os.external_ip,
+              os.nvdata.external_ip,
               os.checkwt_lasttime,
               os.checkwt_success_lasttime,
               pd.lastrun.station,
@@ -1014,7 +1009,7 @@ byte server_change_options(char *p)
   os.options_save();
 
   if(time_change) {
-    os.ntpsync_lasttime = 0;
+    os.status.req_ntpsync = 1;
   }
 
   if(weather_change) {
@@ -1369,32 +1364,10 @@ void handle_web_request(char *p)
 #endif
   rewind_ether_buffer();
 
-  char *com = p;  // command name
-  char *dat = NULL; // data
-  // check if this is GET or POST request
-  if (strncmp(p, "GET", 3)==0) {  // this is GET request
-    com = p+5;
-    dat = com+3;
-  } else {  // this is POST request
-    // find the start of POST data
-    com = p+6;
-    dat = com;
-    bool clb = true;
-    char c;
-    while(*dat) {
-      c = *dat;
-      if(c=='\n' && clb) {
-        dat++;
-        break;
-      }
-      if(c=='\n') {
-        clb = true;
-      } else if (c!='\r') {
-        clb = false;
-      }
-      dat++;
-    }
-  }
+  // assume this is a GET request
+  // GET /xx?xxxx
+  char *com = p+5;
+  char *dat = com+3;
 
   if(com[0]==' ') {
     server_home();  // home page handler
diff --git a/weather.cpp b/weather.cpp
index cb92f3e3..f7cc01d9 100644
--- a/weather.cpp
+++ b/weather.cpp
@@ -71,6 +71,11 @@ static void getweather_callback(byte status, uint16_t off, uint16_t len) {
       os.nvdata.sunset_time = v;
     }
   }
+
+  if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("eip"), true)) {
+    os.nvdata.external_ip = atol(tmp_buffer);
+  }
+
   os.nvdata_save(); // save non-volatile memory
 
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("scale"), true)) {
@@ -93,10 +98,6 @@ static void getweather_callback(byte status, uint16_t off, uint16_t len) {
     }
   }
   
-  if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("eip"), true)) {
-    os.external_ip = atol(tmp_buffer);
-  }
-
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("rd"), true)) {
     v = atoi(tmp_buffer);
     if (v>0) {

From 983b7317d2735129c5964f520421585cc971f61f Mon Sep 17 00:00:00 2001
From: Samer Albahra <salbahra@gmail.com>
Date: Tue, 4 Aug 2015 21:01:14 -0500
Subject: [PATCH 13/39] Add ability to trigger update using API for OSPi/OSBo

---
 OpenSprinkler.cpp | 58 +++++++++++++++++++++++++----------------------
 OpenSprinkler.h   |  5 ++--
 server.cpp        | 13 +++++++++--
 updater.sh        |  5 ++++
 utils.cpp         | 20 ++++++++--------
 5 files changed, 60 insertions(+), 41 deletions(-)
 create mode 100755 updater.sh

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index c8c09427..fe2a2261 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -192,8 +192,8 @@ OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
   {1,   1,   _str_log,  _json_log},   // enable logging: 0: disable; 1: enable.
   {0,   MAX_NUM_STATIONS, _str_mas2, _json_mas2},  // index of master 2. 0: no master2 station
   {0,   60,  _str_mton2,_json_mton2},
-  {60,  120, _str_mtof2,_json_mtof2}, 
-  {OS_FW_MINOR, 0, _str_fwm, _json_fwm}, // firmware version  
+  {60,  120, _str_mtof2,_json_mtof2},
+  {OS_FW_MINOR, 0, _str_fwm, _json_fwm}, // firmware version
   {100, 255, _str_fpr,  _json_fpr0},
   {0,   255, 0,         _json_fpr1},
   {0,   1,   _str_reset,_json_reset}
@@ -280,7 +280,7 @@ byte OpenSprinkler::start_network() {
     options[OPTION_STATIC_IP1].value = ip[0];
     options[OPTION_STATIC_IP2].value = ip[1];
     options[OPTION_STATIC_IP3].value = ip[2];
-    options[OPTION_STATIC_IP4].value = ip[3];            
+    options[OPTION_STATIC_IP4].value = ip[3];
 
     ip = ether.gwip;
     options[OPTION_GATEWAY_IP1].value = ip[0];
@@ -288,7 +288,7 @@ byte OpenSprinkler::start_network() {
     options[OPTION_GATEWAY_IP3].value = ip[2];
     options[OPTION_GATEWAY_IP4].value = ip[3];
     options_save();
-    
+
   } else {
     // set up static IP
     byte staticip[] = {
@@ -325,7 +325,7 @@ byte OpenSprinkler::start_network() {
     delete m_server;
     m_server = 0;
   }
-  
+
   m_server = new EthernetServer(port);
   return m_server->begin();
 }
@@ -333,13 +333,17 @@ byte OpenSprinkler::start_network() {
 #include <sys/reboot.h>
 void OpenSprinkler::reboot_dev() {
 #if defined(DEMO)
-  // do nothingb
+  // do nothing
 #else
   sync(); // add sync to prevent file corruption
 	reboot(RB_AUTOBOOT);
 #endif
 }
 
+#include <stdlib.h>
+void OpenSprinkler::update_dev() {
+  system("updater.sh");
+}
 #endif // end network init functions
 
 #if defined(ARDUINO)
@@ -372,12 +376,12 @@ void OpenSprinkler::begin() {
   digitalWrite(PIN_SR_LATCH, HIGH);
 
   pinMode(PIN_SR_CLOCK, OUTPUT);
-  
+
 #if defined(OSPI)
   pin_sr_data = PIN_SR_DATA;
   // detect RPi revision
   unsigned int rev = detect_rpi_rev();
-  if (rev==0x0002 || rev==0x0003) 
+  if (rev==0x0002 || rev==0x0003)
     pin_sr_data = PIN_SR_DATA_ALT;
   // if this is revision 1, use PIN_SR_DATA_ALT
   pinMode(pin_sr_data, OUTPUT);
@@ -406,7 +410,7 @@ void OpenSprinkler::begin() {
   // so only need to initialize non-zero ones
   status.enabled = 1;
   status.safe_reboot = 0;
-  
+
   old_status = status;
 
   nvdata.sunrise_time = 360;  // 6:00am default sunrise
@@ -444,7 +448,7 @@ void OpenSprinkler::begin() {
         // hardware type is not assigned
       }
     }
-    
+
     if (hw_type == HW_TYPE_DC) {
       pinMode(PIN_BOOST, OUTPUT);
       digitalWrite(PIN_BOOST, LOW);
@@ -474,12 +478,12 @@ void OpenSprinkler::begin() {
   _icon[6] = B00101;
   _icon[7] = B10101;
   lcd.createChar(1, _icon);
-  
+
   _icon[1]=0;
   _icon[2]=0;
   _icon[3]=1;
   lcd.createChar(0, _icon);
-  
+
   // uSD card icon
   _icon[0] = B00000;
   _icon[1] = B00000;
@@ -489,8 +493,8 @@ void OpenSprinkler::begin() {
   _icon[5] = B10001;
   _icon[6] = B10011;
   _icon[7] = B11110;
-  lcd.createChar(2, _icon);  
-  
+  lcd.createChar(2, _icon);
+
   // Rain icon
   _icon[0] = B00000;
   _icon[1] = B00000;
@@ -501,7 +505,7 @@ void OpenSprinkler::begin() {
   _icon[6] = B10101;
   _icon[7] = B10101;
   lcd.createChar(3, _icon);
-  
+
   // Connect icon
   _icon[0] = B00000;
   _icon[1] = B00000;
@@ -544,12 +548,12 @@ void OpenSprinkler::apply_all_station_bits() {
   byte bid, s, sbits;
 
   bool engage_booster = false;
-  
+
   #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
   // old station bits
   static byte old_station_bits[MAX_EXT_BOARDS+1];
   #endif
-  
+
   // Shift out all station bit values
   // from the highest bit to the lowest
   for(bid=0;bid<=MAX_EXT_BOARDS;bid++) {
@@ -557,7 +561,7 @@ void OpenSprinkler::apply_all_station_bits() {
       sbits = station_bits[MAX_EXT_BOARDS-bid];
     else
       sbits = 0;
-    
+
     #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
     // check if any station is changing from 0 to 1
     // take the bit inverse of the old status
@@ -567,18 +571,18 @@ void OpenSprinkler::apply_all_station_bits() {
     }
     old_station_bits[MAX_EXT_BOARDS-bid] = sbits;
     #endif
-          
+
     for(s=0;s<8;s++) {
       digitalWrite(PIN_SR_CLOCK, LOW);
 #if defined(OSPI) // if OSPi, use dynamically assigned pin_sr_data
       digitalWrite(pin_sr_data, (sbits & ((byte)1<<(7-s))) ? HIGH : LOW );
-#else      
+#else
       digitalWrite(PIN_SR_DATA, (sbits & ((byte)1<<(7-s))) ? HIGH : LOW );
 #endif
       digitalWrite(PIN_SR_CLOCK, HIGH);
     }
   }
-  
+
   #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
   if((hw_type==HW_TYPE_DC) && engage_booster) {
     DEBUG_PRINTLN(F("engage booster"));
@@ -586,7 +590,7 @@ void OpenSprinkler::apply_all_station_bits() {
     digitalWrite(PIN_BOOST, HIGH);
     delay((int)options[OPTION_BOOST_TIME].value<<2);
     digitalWrite(PIN_BOOST, LOW);
-   
+
     // enable boosted voltage for a short period of time
     digitalWrite(PIN_BOOST_EN, HIGH);
     digitalWrite(PIN_SR_LATCH, HIGH);
@@ -849,7 +853,7 @@ void OpenSprinkler::options_setup() {
     nvm_write_block(DEFAULT_PASSWORD, (void*)ADDR_NVM_PASSWORD, strlen(DEFAULT_PASSWORD)+1);
     nvm_write_block(DEFAULT_LOCATION, (void*)ADDR_NVM_LOCATION, strlen(DEFAULT_LOCATION)+1);
     nvm_write_block(DEFAULT_JAVASCRIPT_URL, (void*)ADDR_NVM_JAVASCRIPTURL, strlen(DEFAULT_JAVASCRIPT_URL)+1);
-    nvm_write_block(DEFAULT_WEATHER_URL, (void*)ADDR_NVM_WEATHERURL, strlen(DEFAULT_WEATHER_URL)+1);    
+    nvm_write_block(DEFAULT_WEATHER_URL, (void*)ADDR_NVM_WEATHERURL, strlen(DEFAULT_WEATHER_URL)+1);
     nvm_write_block(DEFAULT_WEATHER_KEY, (void*)ADDR_NVM_WEATHER_KEY, strlen(DEFAULT_WEATHER_KEY)+1);
 
     // 3. reset station names and special attributes, default Sxx
@@ -880,7 +884,7 @@ void OpenSprinkler::options_setup() {
 
     // 6. write options
     options_save(); // write default option values
-    
+
     //======== END OF NVM RESET CODE ========
 
     // restart after resetting NVM.
@@ -894,7 +898,7 @@ void OpenSprinkler::options_setup() {
     // load ram parameters from nvm
     // load options
     options_load();
-    
+
     // load non-volatile controller data
     nvdata_load();
   }
@@ -935,7 +939,7 @@ void OpenSprinkler::options_setup() {
   // turn on LCD backlight and contrast
   lcd_set_brightness();
   lcd_set_contrast();
-  
+
   if (!button) {
     // flash screen
     lcd_print_line_clear_pgm(PSTR(" OpenSprinkler"),0);
@@ -1358,7 +1362,7 @@ void OpenSprinkler::lcd_set_brightness(byte value) {
     if (value) {
       analogWrite(PIN_LCD_BACKLIGHT, 255-options[OPTION_LCD_BACKLIGHT].value);
     } else {
-      analogWrite(PIN_LCD_BACKLIGHT, 255-options[OPTION_LCD_DIMMING].value);    
+      analogWrite(PIN_LCD_BACKLIGHT, 255-options[OPTION_LCD_DIMMING].value);
     }
   }
 }
diff --git a/OpenSprinkler.h b/OpenSprinkler.h
index 870bb51e..b1625651 100644
--- a/OpenSprinkler.h
+++ b/OpenSprinkler.h
@@ -108,7 +108,7 @@ class OpenSprinkler {
 
   static byte station_bits[];     // station activation bits. each byte corresponds to a board (8 stations)
                                   // first byte-> master controller, second byte-> ext. board 1, and so on
-  
+
   // variables for time keeping
   static ulong sensor_lasttime;  // time when the most recent sensor reading was performed
   static ulong raindelay_start_time;  // time when the most recent rain delay started
@@ -117,6 +117,7 @@ class OpenSprinkler {
   static ulong checkwt_success_lasttime; // time when weather check was successful
   // member functions
   // -- setup
+  static void update_dev();   // update software for Linux instances
   static void reboot_dev();   // reboot the microcontroller
   static void begin();        // initialization, must call this function before calling other functions
   static byte start_network();  // initialize network with the given mac and port
@@ -132,7 +133,7 @@ class OpenSprinkler {
   static void station_attrib_bits_save(int addr, byte bits[]); // save station attribute bits to nvm
   static void station_attrib_bits_load(int addr, byte bits[]); // load station attribute bits from nvm
   static byte station_attrib_bits_read(int addr); // read one station attribte byte from nvm
-  
+
   // -- options and data storeage
   static void nvdata_load();
   static void nvdata_save();
diff --git a/server.cpp b/server.cpp
index 666fa3ec..26145833 100644
--- a/server.cpp
+++ b/server.cpp
@@ -665,7 +665,7 @@ void server_json_options_main() {
     #else
     if (oid==OPTION_BOOST_TIME) continue;
     #endif
-   
+
     if (os.options[oid].json_str==0) continue;
     if (oid==OPTION_DEVICE_ID && os.status.has_hwmac) continue; // do not send DEVICE ID if hardware MAC exists
     bfill.emit_p(PSTR("\"$F\":$D"),
@@ -834,6 +834,15 @@ byte server_change_values(char *p)
     reset_all_stations();
   }
 
+#ifndef ARDUINO
+    if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("update"), true) && atoi(tmp_buffer) > 0) {
+        print_html_standard_header();
+        //bfill.emit_p(PSTR("Updating..."));
+        send_packet(true);
+        os.update_dev();
+    }
+#endif
+
 #define TIME_REBOOT_DELAY  20
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("rbt"), true) && atoi(tmp_buffer) > 0) {
     print_html_standard_header();
@@ -890,7 +899,7 @@ byte server_change_scripturl(char *p)
     // trim unwanted space characters
     string_remove_space(tmp_buffer);
     nvm_write_block(tmp_buffer, (void *)ADDR_NVM_JAVASCRIPTURL, strlen(tmp_buffer)+1);
-  } 
+  }
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("wsp"), true)) {
     urlDecode(tmp_buffer);
     tmp_buffer[MAX_WEATHERURL]=0;
diff --git a/updater.sh b/updater.sh
new file mode 100755
index 00000000..bd6aa95f
--- /dev/null
+++ b/updater.sh
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+git pull
+./build.sh ospi
+/etc/init.d/OpenSprinkler.sh restart
diff --git a/utils.cpp b/utils.cpp
index cc632cb4..91cab484 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see
- * <http://www.gnu.org/licenses/>. 
+ * <http://www.gnu.org/licenses/>.
  */
 
 #include "utils.h"
@@ -33,7 +33,7 @@ extern SdFat sd;
 
 void write_to_file(const char *name, const char *data, int size, int pos, bool trunc) {
   if (!os.status.has_sd)  return;
-  
+
   char *fn = tmp_buffer+TMP_BUFFER_SIZE-12;
   strcpy_P(fn, name);
   sd.chdir("/");
@@ -46,13 +46,13 @@ void write_to_file(const char *name, const char *data, int size, int pos, bool t
   }
   file.seekSet(pos);
   file.write(data, size);
-  file.close();  
+  file.close();
 }
 
 bool read_from_file(const char *name, char *data, int maxsize) {
   if (!os.status.has_sd)  { data[0]=0; return false; }
-  
-  char *fn = tmp_buffer+TMP_BUFFER_SIZE-12;  
+
+  char *fn = tmp_buffer+TMP_BUFFER_SIZE-12;
   strcpy_P(fn, name);
   sd.chdir("/");
   SdFile file;
@@ -70,7 +70,7 @@ bool read_from_file(const char *name, char *data, int maxsize) {
 void remove_file(const char *name) {
   if (!os.status.has_sd)  return;
 
-  char *fn = tmp_buffer+TMP_BUFFER_SIZE-12;  
+  char *fn = tmp_buffer+TMP_BUFFER_SIZE-12;
   strcpy_P(fn, name);
   sd.chdir("/");
   DEBUG_PRINTLN(fn);
@@ -142,7 +142,7 @@ void write_to_file(const char *name, const char *data, int size, int pos, bool t
   }
 
   if (!file) { return; }
-  
+
   fseek(file, pos, SEEK_SET);
   fwrite(data, 1, size, file);
   fclose(file);
@@ -166,7 +166,7 @@ bool read_from_file(const char *name, char *data, int maxsize) {
   if (res <= 0) {
     data[0] = 0;
   }
-      
+
   data[maxsize-1]=0;
   fclose(file);
   return true;
@@ -225,7 +225,7 @@ byte strcmp_to_nvm(const char* src, int _addr) {
     c1 = nvm_read_byte(addr++);
     c2 = *src++;
     if (c1==0 || c2==0)
-      break;      
+      break;
     if (c1!=c2)  return 1;
   }
   return (c1==c2) ? 0 : 1;
@@ -257,7 +257,7 @@ byte water_time_encode(uint16_t i) {
     return 255;
   } else {
     return 254;
-  } 
+  }
 }
 
 // decode a 8-bit byte to a 16-bit unsigned water time

From c60c97af6a8faaa487d8a7cee9805c37ff96719d Mon Sep 17 00:00:00 2001
From: Samer Albahra <salbahra@gmail.com>
Date: Tue, 4 Aug 2015 21:26:51 -0500
Subject: [PATCH 14/39] Allow code to actually run update script

actually works!
---
 OpenSprinkler.cpp | 4 +++-
 updater.sh        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index fe2a2261..a2755375 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -342,7 +342,9 @@ void OpenSprinkler::reboot_dev() {
 
 #include <stdlib.h>
 void OpenSprinkler::update_dev() {
-  system("updater.sh");
+  char cmd[1024];
+  sprintf(cmd, "cd %s & ./updater.sh", get_runtime_path());
+  system(cmd);
 }
 #endif // end network init functions
 
diff --git a/updater.sh b/updater.sh
index bd6aa95f..6051b5ab 100755
--- a/updater.sh
+++ b/updater.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
 
 git pull
-./build.sh ospi
+./build.sh -s ospi
 /etc/init.d/OpenSprinkler.sh restart

From cc1f6a5bf258fba444f3dbf3f11b1afedf02d1ae Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Mon, 10 Aug 2015 02:08:39 -0400
Subject: [PATCH 15/39] check in intermediate support for remote/rf stations on
 sd card

---
 OpenSprinkler.cpp | 131 +++++++++++++++++++++++++++++++++-------------
 OpenSprinkler.h   |  21 ++++++--
 defines.h         |  22 ++++----
 main.cpp          |  18 +++----
 server.cpp        |  10 ++--
 utils.cpp         |   4 +-
 utils.h           |   2 +-
 7 files changed, 137 insertions(+), 71 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index c8c09427..3fdb63ab 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -33,6 +33,9 @@ byte OpenSprinkler::hw_type;
 byte OpenSprinkler::nboards;
 byte OpenSprinkler::nstations;
 byte OpenSprinkler::station_bits[MAX_EXT_BOARDS+1];
+#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
+byte OpenSprinkler::engage_booster;
+#endif
 
 ulong OpenSprinkler::sensor_lasttime;
 ulong OpenSprinkler::raindelay_start_time;
@@ -542,13 +545,11 @@ void OpenSprinkler::begin() {
 void OpenSprinkler::apply_all_station_bits() {
   digitalWrite(PIN_SR_LATCH, LOW);
   byte bid, s, sbits;
-
-  bool engage_booster = false;
   
-  #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
+  /*#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
   // old station bits
   static byte old_station_bits[MAX_EXT_BOARDS+1];
-  #endif
+  #endif*/
   
   // Shift out all station bit values
   // from the highest bit to the lowest
@@ -558,7 +559,7 @@ void OpenSprinkler::apply_all_station_bits() {
     else
       sbits = 0;
     
-    #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
+    /*#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
     // check if any station is changing from 0 to 1
     // take the bit inverse of the old status
     // and with the new status
@@ -566,7 +567,7 @@ void OpenSprinkler::apply_all_station_bits() {
       engage_booster = true;
     }
     old_station_bits[MAX_EXT_BOARDS-bid] = sbits;
-    #endif
+    #endif*/
           
     for(s=0;s<8;s++) {
       digitalWrite(PIN_SR_CLOCK, LOW);
@@ -583,15 +584,15 @@ void OpenSprinkler::apply_all_station_bits() {
   if((hw_type==HW_TYPE_DC) && engage_booster) {
     DEBUG_PRINTLN(F("engage booster"));
     // boost voltage
-    digitalWrite(PIN_BOOST, HIGH);
-    delay((int)options[OPTION_BOOST_TIME].value<<2);
-    digitalWrite(PIN_BOOST, LOW);
+    digitalWrite(PIN_BOOST_EN, LOW);  // disable output path
+    digitalWrite(PIN_BOOST, HIGH);    // enable boost converter
+    delay((int)options[OPTION_BOOST_TIME].value<<2);  // wait for capacitor to charge
+    digitalWrite(PIN_BOOST, LOW);     // disable boost converter
    
     // enable boosted voltage for a short period of time
-    digitalWrite(PIN_BOOST_EN, HIGH);
+    digitalWrite(PIN_BOOST_EN, HIGH); // enable output path
     digitalWrite(PIN_SR_LATCH, HIGH);
-    delay(500);
-    digitalWrite(PIN_BOOST_EN, LOW);
+    engage_booster = 0;
   } else {
     digitalWrite(PIN_SR_LATCH, HIGH);
   }
@@ -607,12 +608,12 @@ void OpenSprinkler::rainsensor_status() {
 }
 
 #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
-// OpenSprinkler DC uses a 0.22 ohm current sensing resistor
+// OpenSprinkler DC uses a 0.2 ohm current sensing resistor
 // Therefore the conversion from analog reading to milli-amp is:
-// (r/1024)*3.3*1000/0.22
+// (r/1024)*3.3*1000/0.2
 uint16_t OpenSprinkler::read_current() {
   if(status.has_curr_sense) {
-    return (uint16_t)(analogRead(PIN_CURR_SENSE) * 14.65);
+    return (uint16_t)(analogRead(PIN_CURR_SENSE) * 16.11);
   } else {
     return 0;
   }
@@ -653,12 +654,11 @@ int OpenSprinkler::detect_exp() { // AVR has capability to detect number of expa
 #endif
 }
 
-static ulong nvm_hex2ulong(byte *addr, byte len) {
+static ulong hex2ulong(byte *code, byte len) {
   char c;
   ulong v = 0;
-  nvm_read_block(tmp_buffer, (void*)addr, len);
   for(byte i=0;i<len;i++) {
-    c = tmp_buffer[i];
+    c = code[i];
     v <<= 4;
     if(c>='0' && c<='9') {
       v += (c-'0');
@@ -673,17 +673,16 @@ static ulong nvm_hex2ulong(byte *addr, byte len) {
   return v;
 }
 
-// Get station name from nvm and parse into RF code
-uint16_t OpenSprinkler::get_station_name_rf(byte sid, ulong* on, ulong *off) {
-  byte *start = (byte *)(ADDR_NVM_STN_NAMES) + (int)sid * STATION_NAME_SIZE;
+// Parse RF code into on/off/timeing sections
+uint16_t OpenSprinkler::parse_rfstation_code(byte *code, ulong* on, ulong *off) {
   ulong v;
-  v = nvm_hex2ulong(start, 6);
+  v = hex2ulong(code, 6);
   if (!v) return 0;
   if (on) *on = v;
-  v = nvm_hex2ulong(start+6, 6);
+  v = hex2ulong(code+6, 6);
   if (!v) return 0;
   if (off) *off = v;
-  v = nvm_hex2ulong(start+12, 4);
+  v = hex2ulong(code+12, 4);
   if (!v) return 0;
   return v;
 }
@@ -750,23 +749,60 @@ byte OpenSprinkler::weekday_today() {
 #endif
 }
 
+// Switch special station
+void OpenSprinkler::switch_special_station(byte sid, byte value) {
+  // check station special bit
+  if(station_attrib_bits_read(ADDR_NVM_STNSPE+(sid>>3))&(1<<(sid&0x07))) {
+    // read station special data from sd card
+    int stepsize=sizeof(StationSpecialData);
+    read_from_file(stns_filename, tmp_buffer, stepsize, sid*stepsize);
+    StationSpecialData *stn = (StationSpecialData *)tmp_buffer;
+    // check station type
+    if(stn->type==STN_TYPE_RF) {
+      // transmit RF signal
+      switch_rfstation(stn->data, value);
+    } else if(stn->type==STN_TYPE_REMOTE) {
+      // request remote station
+    }
+  }
+}
+
 // Set station bit
-void OpenSprinkler::set_station_bit(byte sid, byte value) {
-  byte bid = (sid>>3);  // board index
-  byte s = sid&0x07;    // station bit index
+byte OpenSprinkler::set_station_bit(byte sid, byte value) {
+  byte *data = station_bits+(sid>>3);  // pointer to the station byte
+  byte mask = (byte)1<<(sid&0x07); // mask
   if (value) {
-    station_bits[bid] = station_bits[bid] | ((byte)1<<s);
-  }
-  else {
-    station_bits[bid] = station_bits[bid] &~((byte)1<<s);
+    if((*data)&mask) return 0;  // if bit is already set, return no change
+    else {
+      (*data) = (*data) | mask;
+#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
+      engage_booster = true; // if bit is changing from 0 to 1, set engage_booster
+#endif
+      switch_special_station(sid, 1);
+      return 1;
+    }
+    //station_bits[bid] = station_bits[bid] | ((byte)1<<s);
+  } else {
+    if(!((*data)&mask)) return 0; // if bit is already reset, return no change
+    else {
+      (*data) = (*data) & (~mask);
+      switch_special_station(sid, 0);
+      return 255;
+    }
+    //station_bits[bid] = station_bits[bid] &~((byte)1<<s);
   }
+  return 0;
 }
 
 // Clear all station bits
 void OpenSprinkler::clear_all_station_bits() {
-  byte bid;
+  /*byte bid;
   for(bid=0;bid<=MAX_EXT_BOARDS;bid++) {
     station_bits[bid] = 0;
+  }*/
+  byte sid;
+  for(sid=0;sid<=MAX_NUM_STATIONS;sid++) {
+    set_station_bit(sid, 0);
   }
 }
 
@@ -787,7 +823,7 @@ void transmit_rfbit(ulong lenH, ulong lenL) {
 void send_rfsignal(ulong code, ulong len) {
   ulong len3 = len * 3;
   ulong len31 = len * 31;
-  for(byte n=0;n<24;n++) {
+  for(byte n=0;n<15;n++) {
     int i=23;
     // send code
     while(i>=0) {
@@ -803,17 +839,40 @@ void send_rfsignal(ulong code, ulong len) {
   }
 }
 
-void OpenSprinkler::send_rfstation_signal(byte sid, bool turnon) {
+void OpenSprinkler::switch_rfstation(byte *code, bool turnon) {
   ulong on, off;
-  uint16_t length = get_station_name_rf(sid, &on, &off);
+  uint16_t length = parse_rfstation_code(code, &on, &off);
 #if defined(ARDUINO)
-  length = (length>>1)+(length>>2);   // due to internal call delay, scale time down to 75%
+  length = length - (length>>5);   // due to internal call delay, scale time down to 97%
 #else
   length = (length>>2)+(length>>3);   // on RPi and BBB, there is even more overhead, scale to 37.5%
 #endif
   send_rfsignal(turnon ? on : off, length);
 }
 
+static void switchremote_callback(byte status, uint16_t off, uint16_t len) {
+  /* do nothing */
+}
+
+void OpenSprinkler::switch_remotestation(byte *code, bool turnon) {
+#if defined(ARDUINO)
+  // construct string
+  ulong ip = hex2ulong(code, 8);
+  ether.hisip[0] = ip>>24;
+  ether.hisip[1] = (ip>>16)&0xff;
+  ether.hisip[3] = (ip>>8)&0xff;
+  ether.hisip[4] = ip&0xff;
+
+  uint16_t _port = ether.hisport; // save current port number
+  ether.hisport = hex2ulong(code+8, 4);
+
+  char *p = tmp_buffer + sizeof(StationSpecialData);
+  BufferFiller bf = (byte*)p;
+  bf.emit_p(PSTR("cm?pw=$E&sid=$D&en=$D&t=65535"), ADDR_NVM_PASSWORD, (int)hex2ulong(code+12,2), turnon);
+  ether.browseUrl(PSTR("/"), p, PSTR("*"), switchremote_callback);
+  ether.hisport = _port;
+#endif
+}
 
 /** Options Functions */
 void OpenSprinkler::options_setup() {
diff --git a/OpenSprinkler.h b/OpenSprinkler.h
index 870bb51e..703f6bc1 100644
--- a/OpenSprinkler.h
+++ b/OpenSprinkler.h
@@ -62,7 +62,15 @@ struct NVConData {
 /** Station special attribute data */
 struct StationSpecialData {
   byte type;
-  byte data[MAX_STATION_SPECIAL_DATA];
+  byte data[STATION_SPECIAL_DATA_SIZE];
+};
+
+/** Remote station data structure */
+// this must fit in STATION_SPECIAL_DATA_SIZE
+struct RemoteStationData {
+  byte ip[4];
+  uint16_t port;
+  byte sid;
 };
 
 /** Volatile controller status bits */
@@ -127,8 +135,9 @@ class OpenSprinkler {
   // -- station names and attributes
   static void get_station_name(byte sid, char buf[]); // get station name
   static void set_station_name(byte sid, char buf[]); // set station name
-  static uint16_t get_station_name_rf(byte sid, ulong *on, ulong *off); // get station name and parse into RF code
-  static void send_rfstation_signal(byte sid, bool status);
+  static uint16_t parse_rfstation_code(byte *code, ulong *on, ulong *off); // parse rf code into on/off/time sections
+  static void switch_rfstation(byte *code, bool turnon);  // switch rf station
+  static void switch_remotestation(byte *code, bool turnon); // switch remote station
   static void station_attrib_bits_save(int addr, byte bits[]); // save station attribute bits to nvm
   static void station_attrib_bits_load(int addr, byte bits[]); // load station attribute bits from nvm
   static byte station_attrib_bits_read(int addr); // read one station attribte byte from nvm
@@ -155,7 +164,8 @@ class OpenSprinkler {
   static int detect_exp();        // detect the number of expansion boards
   static byte weekday_today();    // returns index of today's weekday (Monday is 0)
 
-  static void set_station_bit(byte sid, byte value); // set station bit of one station (sid->station index, value->0/1)
+  static byte set_station_bit(byte sid, byte value); // set station bit of one station (sid->station index, value->0/1)
+  static void switch_special_station(byte sid, byte value); // swtich special station
   static void clear_all_station_bits(); // clear all station bits
   static void apply_all_station_bits(); // apply all station bits (activate/deactive values)
 
@@ -184,6 +194,9 @@ class OpenSprinkler {
   static void lcd_print_2digit(int v);  // print a integer in 2 digits
   static void lcd_start();
   static byte button_read_busy(byte pin_butt, byte waitmode, byte butt, byte is_holding);
+#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
+  static byte engage_booster;
+#endif
 #endif // LCD functions
 };
 
diff --git a/defines.h b/defines.h
index 2c9f551b..1f358f6a 100644
--- a/defines.h
+++ b/defines.h
@@ -45,7 +45,7 @@
 /** File names */
 #define WEATHER_OPTS_FILENAME "wtopts.txt"    // weather options file
 #define STATION_ATTR_FILENAME "stns.dat"      // station attributes data file
-#define MAX_STATION_SPECIAL_DATA  16
+#define STATION_SPECIAL_DATA_SIZE  16
 
 /** Station type macro defines */
 #define STN_TYPE_STANDARD    0x00
@@ -65,17 +65,17 @@
 /** 2KB NVM (ATmega644) data structure:
   * |         |     |  ---STRING PARAMETERS---      |           |   ----STATION ATTRIBUTES-----      |          |
   * | PROGRAM | CON | PWD | LOC | JURL | WURL | KEY | STN_NAMES | MAS | IGR | MAS2 | DIS | SEQ | SPE | OPTIONS  |
-  * |  (996)  |(12) |(32) |(48) | (40) | (40) |(32) |   (768)   | (6) | (6) |  (6) | (6) | (6) | (6) |  (44)    |
+  * |  (996)  |(12) |(36) |(48) | (40) | (40) |(24) |   (768)   | (6) | (6) |  (6) | (6) | (6) | (6) |  (48)    |
   * |         |     |     |     |      |      |     |           |     |     |      |     |     |     |          |
-  * 0        996  1008   1040  1088  1128   1168   1200        1968  1974  1980   1986  1992  1998  2004      2048
+  * 0        996  1008   1044  1092  1132   1172   1196        1964  1970  1976   1982  1988  1994  2000      2048
   */
 
 /** 4KB NVM (ATmega1284) data structure:
   * |         |     |  ---STRING PARAMETERS---      |           |   ----STATION ATTRIBUTES-----      |          |
   * | PROGRAM | CON | PWD | LOC | JURL | WURL | KEY | STN_NAMES | MAS | IGR | MAS2 | DIS | SEQ | SPE | OPTIONS  |
-  * |  (2438) |(12) |(32) |(48) | (48) | (48) |(32) |   (1344)  | (7) | (7) |  (7) | (7) | (7) | (7) |   (52)   |
+  * |  (2438) |(12) |(36) |(48) | (48) | (48) |(24) |   (1344)  | (7) | (7) |  (7) | (7) | (7) | (7) |   (56)   |
   * |         |     |     |     |      |      |     |           |     |     |      |     |     |     |          |
-  * 0       2438  2450   2482  2530  2578   2626   2658        4002  4009  4016   4023  4030  4037  4044      4096
+  * 0       2438  2450   2486  2534  2582   2630   2654        3998  4005  4012   4019  4026  4033  4040      4096
   */
 
   #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__) // for 4KB NVM
@@ -88,11 +88,11 @@
 
     #define MAX_PROGRAMDATA     2438  // program data
     #define MAX_NVCONDATA       12    // non-volatile controller data
-    #define MAX_USER_PASSWORD   32    // user password
+    #define MAX_USER_PASSWORD   36    // user password
     #define MAX_LOCATION        48    // location string
     #define MAX_JAVASCRIPTURL   48    // javascript url
     #define MAX_WEATHERURL      48    // weather script url
-    #define MAX_WEATHER_KEY     32    // weather api key
+    #define MAX_WEATHER_KEY     24    // weather api key
 
   #else
 
@@ -104,11 +104,11 @@
 
     #define MAX_PROGRAMDATA     996   // program data
     #define MAX_NVCONDATA       12     // non-volatile controller data
-    #define MAX_USER_PASSWORD   32    // user password
+    #define MAX_USER_PASSWORD   36    // user password
     #define MAX_LOCATION        48    // location string
     #define MAX_JAVASCRIPTURL   40    // javascript url
     #define MAX_WEATHERURL      40    // weather script url
-    #define MAX_WEATHER_KEY     32    // weather api key,
+    #define MAX_WEATHER_KEY     24    // weather api key,
 
   #endif
 
@@ -126,11 +126,11 @@
 
   #define MAX_PROGRAMDATA     2438  // program data
   #define MAX_NVCONDATA       12     // non-volatile controller data
-  #define MAX_USER_PASSWORD   32    // user password
+  #define MAX_USER_PASSWORD   36    // user password
   #define MAX_LOCATION        48    // location string
   #define MAX_JAVASCRIPTURL   48    // javascript url
   #define MAX_WEATHERURL      48    // weather script url
-  #define MAX_WEATHER_KEY     32    // weather api key
+  #define MAX_WEATHER_KEY     24    // weather api key
 
 #endif  // end of NVM defines
 
diff --git a/main.cpp b/main.cpp
index 25041485..abd6f235 100644
--- a/main.cpp
+++ b/main.cpp
@@ -477,15 +477,10 @@ void do_loop()
           // if current station is not running, check if we should turn it on
           if(!((bitvalue>>s)&1)) {
             if (curr_time >= q->st && curr_time < q->st+q->dur) {
+
+              //turn_on_station(sid);
               os.set_station_bit(sid, 1);
 
-              // fix me
-              // upon turning on station, process RF
-              // if the station is a RF station
-              if(os.station_attrib_bits_read(ADDR_NVM_STNSPE+bid)&(1<<s)) {
-                // send RF on signal
-                os.send_rfstation_signal(sid, true);
-              }
             } //if curr_time > scheduled_start_time
           } // if current station is not running
         }//end_s
@@ -681,13 +676,12 @@ void turn_off_station(byte sid, ulong curr_time) {
 
     // upon turning off station, process RF station
     // if the station is a RF station
-    // fix me
-    byte bid = sid>>3;
+    /*byte bid = sid>>3;
     byte s = sid&0x07;
     if(os.station_attrib_bits_read(ADDR_NVM_STNSPE+bid)&(1<<s)) {
       // turn off station
-      os.send_rfstation_signal(sid, false);
-    }
+      //fix me os.send_rfstation_signal(sid, false);
+    }*/
   }
 
   // dequeue the element
@@ -762,6 +756,8 @@ void schedule_all_stations(ulong curr_time) {
     } else {
       // concurrent scheduling
       q->st = con_start_time;
+      // stagger concurrent stations by 1 second
+      con_start_time++;
     }
     DEBUG_PRINT("[");
     DEBUG_PRINT(sid);
diff --git a/server.cpp b/server.cpp
index 666fa3ec..bb512ea4 100644
--- a/server.cpp
+++ b/server.cpp
@@ -966,7 +966,7 @@ byte server_change_options(char *p)
 
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("loc"), true)) {
     urlDecode(tmp_buffer);
-    tmp_buffer[MAX_LOCATION]=0;   // make sure we don't exceed the maximum size
+    tmp_buffer[MAX_LOCATION-1]=0;   // make sure we don't exceed the maximum size
     if (strcmp_to_nvm(tmp_buffer, ADDR_NVM_LOCATION)) { // if location has changed
       nvm_write_block(tmp_buffer, (void*)ADDR_NVM_LOCATION, strlen(tmp_buffer)+1);
       weather_change = true;
@@ -975,7 +975,7 @@ byte server_change_options(char *p)
   uint8_t keyfound = 0;
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("wtkey"), true, &keyfound)) {
     urlDecode(tmp_buffer);
-    tmp_buffer[MAX_WEATHER_KEY]=0;
+    tmp_buffer[MAX_WEATHER_KEY-1]=0;
     if (strcmp_to_nvm(tmp_buffer, ADDR_NVM_WEATHER_KEY)) {  // if weather key has changed
       nvm_write_block(tmp_buffer, (void*)ADDR_NVM_WEATHER_KEY, strlen(tmp_buffer)+1);
       weather_change = true;
@@ -1040,10 +1040,8 @@ byte server_change_password(char *p)
         return HTML_SUCCESS;
       #endif
       urlDecode(tmp_buffer);
-      tmp_buffer[MAX_USER_PASSWORD]=0;  // make sure we don't exceed the maximum size
-      byte size = strlen(tmp_buffer)+1;
-      if(size >= MAX_USER_PASSWORD) size = MAX_USER_PASSWORD;
-      nvm_write_block(tmp_buffer, (void*)ADDR_NVM_PASSWORD, size);
+      tmp_buffer[MAX_USER_PASSWORD-1]=0;  // make sure we don't exceed the maximum size
+      nvm_write_block(tmp_buffer, (void*)ADDR_NVM_PASSWORD, strlen(tmp_buffer)+1);
       return HTML_SUCCESS;
     } else {
       return HTML_MISMATCH;
diff --git a/utils.cpp b/utils.cpp
index cc632cb4..40139951 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -49,7 +49,7 @@ void write_to_file(const char *name, const char *data, int size, int pos, bool t
   file.close();  
 }
 
-bool read_from_file(const char *name, char *data, int maxsize) {
+bool read_from_file(const char *name, char *data, int maxsize, int pos) {
   if (!os.status.has_sd)  { data[0]=0; return false; }
   
   char *fn = tmp_buffer+TMP_BUFFER_SIZE-12;  
@@ -148,7 +148,7 @@ void write_to_file(const char *name, const char *data, int size, int pos, bool t
   fclose(file);
 }
 
-bool read_from_file(const char *name, char *data, int maxsize) {
+bool read_from_file(const char *name, char *data, int maxsize, int pos) {
 
   FILE *file;
   file = fopen(name, "rb");
diff --git a/utils.h b/utils.h
index 3d1881b9..7fd03345 100644
--- a/utils.h
+++ b/utils.h
@@ -39,7 +39,7 @@ ulong water_time_resolve(uint16_t v);
 byte water_time_encode_signed(int16_t i);
 int16_t water_time_decode_signed(byte i);
 void write_to_file(const char *name, const char *data, int size, int pos=0, bool trunc=true);
-bool read_from_file(const char *name, char *data, int maxsize=TMP_BUFFER_SIZE);
+bool read_from_file(const char *name, char *data, int maxsize=TMP_BUFFER_SIZE, int pos=0);
 void remove_file(const char *name);
 #if defined(ARDUINO)
   #define nvm_read_block  eeprom_read_block

From 118255d2795b44ad7af13b520bb011e0d49d2eea Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Mon, 10 Aug 2015 02:16:48 -0400
Subject: [PATCH 16/39] fix ospi auto-update return value

---
 server.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server.cpp b/server.cpp
index a72dd82a..53d89a6e 100644
--- a/server.cpp
+++ b/server.cpp
@@ -836,9 +836,7 @@ byte server_change_values(char *p)
 
 #ifndef ARDUINO
     if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("update"), true) && atoi(tmp_buffer) > 0) {
-        print_html_standard_header();
         //bfill.emit_p(PSTR("Updating..."));
-        send_packet(true);
         os.update_dev();
     }
 #endif

From 0b61c866f53268924556cc278ed4fd1c7cc778a0 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Fri, 14 Aug 2015 02:18:41 -0400
Subject: [PATCH 17/39] initial support for rf and remote stations. /cs and /je
 are both working

---
 OpenSprinkler.cpp |  36 ++++++-
 defines.h         |   4 +-
 server.cpp        | 238 ++++++++++++++++++++++++++++------------------
 utils.cpp         |   1 +
 4 files changed, 177 insertions(+), 102 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 583b0d2f..cb4bd27e 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -183,7 +183,7 @@ OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
   {1,   1,   _str_den,  _json_den},   // device enable
   {0,   1,   _str_ipas, _json_ipas},  // 1: ignore password; 0: use password
   {0,   255, _str_devid,_json_devid}, // device id
-  {130, 255, _str_con,  _json_con},   // lcd contrast
+  {140, 255, _str_con,  _json_con},   // lcd contrast
   {100, 255, _str_lit,  _json_lit},   // lcd backlight
   {15,  255, _str_dim,  _json_dim},   // lcd dimming
   {80,  250, _str_bst,  _json_bst},   // boost time (only valid to DC and LATCH type)
@@ -360,7 +360,13 @@ void OpenSprinkler::lcd_start() {
   if (lcd.type() == LCD_STD) {
     // this is standard 16x2 LCD
     // set PWM frequency for adjustable LCD backlight and contrast
+#if OS_HW_VERSION==(OS_HW_VERSION_BASE+20)  // 8MHz
     TCCR1B = 0x01;
+#elif OS_HW_VERSION==(OS_HW_VERSION_BASE+21)  // 12MHz
+    TCCR1B = 0x02;  // increase division factor for faster clock
+#else // 16MHz
+    TCCR1B = 0x03;  // increase division factor for faster clock
+#endif
     // turn on LCD backlight and contrast
     lcd_set_brightness();
     lcd_set_contrast();
@@ -769,6 +775,7 @@ void OpenSprinkler::switch_special_station(byte sid, byte value) {
       switch_rfstation(stn->data, value);
     } else if(stn->type==STN_TYPE_REMOTE) {
       // request remote station
+      switch_remotestation(stn->data, value);
     }
   }
 }
@@ -858,6 +865,7 @@ void OpenSprinkler::switch_rfstation(byte *code, bool turnon) {
 
 static void switchremote_callback(byte status, uint16_t off, uint16_t len) {
   /* do nothing */
+  DEBUG_PRINTLN(off);
 }
 
 void OpenSprinkler::switch_remotestation(byte *code, bool turnon) {
@@ -866,17 +874,33 @@ void OpenSprinkler::switch_remotestation(byte *code, bool turnon) {
   ulong ip = hex2ulong(code, 8);
   ether.hisip[0] = ip>>24;
   ether.hisip[1] = (ip>>16)&0xff;
-  ether.hisip[3] = (ip>>8)&0xff;
-  ether.hisip[4] = ip&0xff;
+  ether.hisip[2] = (ip>>8)&0xff;
+  ether.hisip[3] = ip&0xff;
+
+  DEBUG_PRINT(ether.hisip[0]);
+  DEBUG_PRINT(":");
+  DEBUG_PRINT(ether.hisip[1]);
+  DEBUG_PRINT(":");
+  DEBUG_PRINT(ether.hisip[2]);
+  DEBUG_PRINT(":");
+  DEBUG_PRINT(ether.hisip[3]);
+  DEBUG_PRINT(":");
 
   uint16_t _port = ether.hisport; // save current port number
   ether.hisport = hex2ulong(code+8, 4);
 
+  DEBUG_PRINTLN(ether.hisport);
+
   char *p = tmp_buffer + sizeof(StationSpecialData);
   BufferFiller bf = (byte*)p;
-  bf.emit_p(PSTR("cm?pw=$E&sid=$D&en=$D&t=65535"), ADDR_NVM_PASSWORD, (int)hex2ulong(code+12,2), turnon);
-  ether.browseUrl(PSTR("/"), p, PSTR("*"), switchremote_callback);
+  bf.emit_p(PSTR("?pw=$E&sid=$D&en=$D&t=64800"), ADDR_NVM_PASSWORD, (int)hex2ulong(code+12,2), turnon);
+  DEBUG_PRINTLN(p);
+  ether.browseUrl(PSTR("/cm"), p, PSTR("*"), switchremote_callback);
+  for(int l=0;l<100;l++) {
+    ether.packetLoop(ether.packetReceive());
+  }
   ether.hisport = _port;
+
 #endif
 }
 
@@ -928,6 +952,8 @@ void OpenSprinkler::options_setup() {
 
     DEBUG_PRINTLN("write special data");
     tmp_buffer[0]=STN_TYPE_STANDARD;
+    tmp_buffer[1]='0';
+    tmp_buffer[2]=0;
     int stepsize=sizeof(StationSpecialData);
     for(i=0;i<MAX_NUM_STATIONS;i++) {
         write_to_file(stns_filename, tmp_buffer, stepsize, i*stepsize, false);
diff --git a/defines.h b/defines.h
index 1f358f6a..61a13ba6 100644
--- a/defines.h
+++ b/defines.h
@@ -45,7 +45,7 @@
 /** File names */
 #define WEATHER_OPTS_FILENAME "wtopts.txt"    // weather options file
 #define STATION_ATTR_FILENAME "stns.dat"      // station attributes data file
-#define STATION_SPECIAL_DATA_SIZE  16
+#define STATION_SPECIAL_DATA_SIZE  23
 
 /** Station type macro defines */
 #define STN_TYPE_STANDARD    0x00
@@ -347,7 +347,7 @@ typedef enum {
   #define ETHER_BUFFER_SIZE   16384
 
   #define DEBUG_BEGIN(x)          {}  /** Serial debug functions */
-  #define ENABLE_DEBUG
+  //#define ENABLE_DEBUG
   #if defined(ENABLE_DEBUG)
     inline  void DEBUG_PRINT(int x) {printf("%d", x);}
     inline  void DEBUG_PRINT(const char*s) {printf("%s", s);}
diff --git a/server.cpp b/server.cpp
index 53d89a6e..8fe1c042 100644
--- a/server.cpp
+++ b/server.cpp
@@ -393,6 +393,35 @@ byte server_json_stations(char *p) {
   return HTML_OK;
 }
 
+/**
+ * Output Station Special Attribute
+ * Command: /je?sid=x
+ *
+ * sid: station index (starting from 0)
+ */
+byte server_json_station_special(char *p) {
+#if defined(ARDUINO)
+  // if no sd card, return false
+  if (!os.status.has_sd)  return HTML_PAGE_NOT_FOUND;
+#endif
+  int sid;
+  if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("sid"), true)) {
+    sid = atoi(tmp_buffer);
+    if (sid< 0 || sid >= os.nstations) return HTML_DATA_OUTOFBOUND;
+
+    print_json_header();
+
+    int stepsize=sizeof(StationSpecialData);
+    read_from_file(stns_filename, tmp_buffer, stepsize, sid*stepsize);
+    StationSpecialData *stn = (StationSpecialData *)tmp_buffer;
+    bfill.emit_p(PSTR("\"st\":$D,\"sd\":$S}"), stn->type, stn->data);
+    delay(1);
+    return HTML_OK;
+  } else {
+    return HTML_DATA_MISSING;
+  }
+}
+
 void server_change_stations_attrib(char *p, char header, int addr)
 {
   byte attrib[MAX_EXT_BOARDS+1];
@@ -410,16 +439,18 @@ void server_change_stations_attrib(char *p, char header, int addr)
 }
 
 /**
-  Change Station Name and Attributes
-  Command: /cs?pw=xxx&s?=x&m?=x&i?=x&n?=x&d?=x
-
-  pw: password
-  s?: station name (? is station index, starting from 0)
-  m?: master operation bit field (? is board index, starting from 0)
-  i?: ignore rain bit field
-  n?: master2 operation bit field
-  d?: disable sation bit field
-*/
+ * Change Station Name and Attributes
+ * Command: /cs?pw=xxx&s?=x&m?=x&i?=x&n?=x&d?=x
+ *
+ * pw: password
+ * s?: station name (? is station index, starting from 0)
+ * m?: master operation bit field (? is board index, starting from 0)
+ * i?: ignore rain bit field
+ * n?: master2 operation bit field
+ * d?: disable sation bit field
+ * q?: station sequeitnal bit field
+ * p?: station special flag bit field
+ */
 byte server_change_stations(char *p)
 {
   byte sid;
@@ -440,6 +471,20 @@ byte server_change_stations(char *p)
   server_change_stations_attrib(p, 'q', ADDR_NVM_STNSEQ); // sequential
   server_change_stations_attrib(p, 'p', ADDR_NVM_STNSPE); // special
 
+  /* handle special data */
+  if(findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("sid"), true)) {
+    sid = atoi(tmp_buffer);
+    if(sid<0 || sid>os.nstations) return HTML_DATA_OUTOFBOUND;
+    if(findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("st"), true) &&
+       findKeyVal(p, tmp_buffer+1, TMP_BUFFER_SIZE, PSTR("sd"), true)) {
+      int stepsize=sizeof(StationSpecialData);
+      tmp_buffer[0]-='0';
+      tmp_buffer[stepsize-1] = 0;
+      write_to_file(stns_filename, tmp_buffer, strlen(tmp_buffer)+1, stepsize*sid, false);
+    } else {
+      return HTML_DATA_MISSING;
+    }
+  }
   return HTML_SUCCESS;
 }
 
@@ -461,12 +506,12 @@ uint16_t parse_listdata(char **p) {
 }
 
 /**
-  Change run-once program
-  Command: /cr?pw=xxx&t=[x,x,x...]
-
-  pw: password
-  t:  station water time
-*/
+ * Change run-once program
+ * Command: /cr?pw=xxx&t=[x,x,x...]
+ *
+ * pw: password
+ * t:  station water time
+ */
 byte server_change_runonce(char *p) {
   // decode url first
   urlDecode(p);
@@ -515,12 +560,12 @@ byte server_change_runonce(char *p) {
 
 
 /**
-  Delete a program
-  Command: /dp?pw=xxx&pid=xxx
-
-  pw: password
-  pid:program index (-1 will delete all programs)
-*/
+ * Delete a program
+ * Command: /dp?pw=xxx&pid=xxx
+ *
+ * pw: password
+ * pid:program index (-1 will delete all programs)
+ */
 byte server_delete_program(char *p) {
   if (!findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("pid"), true))
     return HTML_DATA_MISSING;
@@ -538,11 +583,11 @@ byte server_delete_program(char *p) {
 }
 
 /**
-  Move up a program
-  Command: /up?pw=xxx&pid=xxx
-
-  pw: password
-  pid:program index
+ * Move up a program
+ * Command: /up?pw=xxx&pid=xxx
+ *
+ * pw:  password
+ * pid: program index (must be 1 or larger, because we can't move up program 0)
 */
 byte server_moveup_program(char *p) {
   if (!findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("pid"), true)) {
@@ -557,15 +602,15 @@ byte server_moveup_program(char *p) {
 }
 
 /**
-  Change a program
-  Command: /cp?pw=xxx&pid=x&v=[flag,days0,days1,[start0,start1,start2,start3],[dur0,dur1,dur2..]]&name=x
-
-  pw:    password
-  pid:   program index
-  flag:  program flag
-  start?:up to 4 start times
-  dur?:  station water time
-  name:  program name
+ * Change a program
+ * Command: /cp?pw=xxx&pid=x&v=[flag,days0,days1,[start0,start1,start2,start3],[dur0,dur1,dur2..]]&name=x
+ *
+ * pw:    password
+ * pid:   program index
+ * flag:  program flag
+ * start?:up to 4 start times
+ * dur?:  station water time
+ * name:  program name
 */
 prog_char _str_program[] PROGMEM = "Program ";
 byte server_change_program(char *p) {
@@ -818,15 +863,15 @@ byte server_home()
 }
 
 /**
-  Change controller variables
-  Command: /cv?pw=xxx&rsn=x&rbt=x&en=x&rd=x
-
-  pw:  password
-  rsn: reset all stations (0 or 1)
-  rbt: reboot controller (0 or 1)
-  en:  enable (0 or 1)
-  rd:  rain delay hours (0 turns off rain delay)
-*/
+ * Change controller variables
+ * Command: /cv?pw=xxx&rsn=x&rbt=x&en=x&rd=x
+ *
+ * pw:  password
+ * rsn: reset all stations (0 or 1)
+ * rbt: reboot controller (0 or 1)
+ * en:  enable (0 or 1)
+ * rd:  rain delay hours (0 turns off rain delay)
+ */
 
 byte server_change_values(char *p)
 {
@@ -880,12 +925,12 @@ void string_remove_space(char *src) {
 }
 
 /**
-  Change script url
-  Command: /cu?pw=xxx&jsp=x
-
-  pw:  password
-  jsp: Javascript path
-*/
+ * Change script url
+ * Command: /cu?pw=xxx&jsp=x
+ *
+ * pw:  password
+ * jsp: Javascript path
+ */
 byte server_change_scripturl(char *p)
 {
 #if defined(DEMO)
@@ -908,15 +953,15 @@ byte server_change_scripturl(char *p)
 }
 
 /**
-  Change options
-  Command: /co?pw=xxx&o?=x&loc=x&wtkey=x&ttt=x
-
-  pw:  password
-  o?:  option name (? is option index)
-  loc: location
-  wtkey: weather underground api key
-  ttt: manual time (applicable only if ntp=0)
-*/
+ * Change options
+ * Command: /co?pw=xxx&o?=x&loc=x&wtkey=x&ttt=x
+ *
+ * pw:  password
+ * o?:  option name (? is option index)
+ * loc: location
+ * wtkey: weather underground api key
+ * ttt: manual time (applicable only if ntp=0)
+ */
 byte server_change_options(char *p)
 {
   // temporarily save some old options values
@@ -1031,13 +1076,13 @@ byte server_change_options(char *p)
 }
 
 /**
-  Change password
-  Command: /sp?pw=xxx&npw=x&cpw=x
-
-  pw:  password
-  npw: new password
-  cpw: confirm new password
-*/
+ * Change password
+ * Command: /sp?pw=xxx&npw=x&cpw=x
+ *
+ * pw:  password
+ * npw: new password
+ * cpw: confirm new password
+ */
 byte server_change_password(char *p)
 {
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("npw"), true)) {
@@ -1078,14 +1123,14 @@ byte server_json_status(char *p)
 }
 
 /**
-  Test station (previously manual operation)
-  Command: /cm?pw=xxx&sid=x&en=x&t=x
-
-  pw: password
-  sid:station name (starting from 0)
-  en: enable (0 or 1)
-  t:  timer (required if en=1)
-*/
+ * Test station (previously manual operation)
+ * Command: /cm?pw=xxx&sid=x&en=x&t=x
+ *
+ * pw: password
+ * sid:station name (starting from 0)
+ * en: enable (0 or 1)
+ * t:  timer (required if en=1)
+ */
 byte server_change_manual(char *p) {
   int sid=-1;
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("sid"), true)) {
@@ -1140,18 +1185,18 @@ byte server_change_manual(char *p) {
 }
 
 /**
-  Get log data
-  Command: /jl?start=x&end=x&hist=x&type=x
-
-  hist:  history (past n days)
-         when hist is speceified, the start
-         and end parameters below will be ignored
-  start: start time (epoch time)
-  end:   end time (epoch time)
-  type:  type of log records (optional)
-         rs, rd, wl
-         if unspecified, output all records
-*/
+ * Get log data
+ * Command: /jl?start=x&end=x&hist=x&type=x
+ *
+ * hist:  history (past n days)
+ *        when hist is speceified, the start
+ *        and end parameters below will be ignored
+ * start: start time (epoch time)
+ * end:   end time (epoch time)
+ * type:  type of log records (optional)
+ *        rs, rd, wl
+ *        if unspecified, output all records
+ */
 byte server_json_log(char *p) {
 
 #if defined(ARDUINO)
@@ -1255,14 +1300,14 @@ byte server_json_log(char *p) {
   return HTML_OK;
 }
 /**
-  Delete log
-  Command: /dl?pw=xxx&day=xxx
-           /dl?pw=xxx&day=all
-
-  pw: password
-  day:day (epoch time / 86400)
-  if day=all: delete all log files)
-*/
+ * Delete log
+ * Command: /dl?pw=xxx&day=xxx
+ *          /dl?pw=xxx&day=all
+ *
+ * pw: password
+ * day:day (epoch time / 86400)
+ * if day=all: delete all log files)
+ */
 byte server_delete_log(char *p) {
 
   if (!findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("day"), true))
@@ -1320,6 +1365,7 @@ prog_char _url_cm [] PROGMEM = "cm";
 
 prog_char _url_cs [] PROGMEM = "cs";
 prog_char _url_jn [] PROGMEM = "jn";
+prog_char _url_je [] PROGMEM = "je";
 
 prog_char _url_jl [] PROGMEM = "jl";
 prog_char _url_dl [] PROGMEM = "dl";
@@ -1350,6 +1396,7 @@ URLStruct urls[] = {
 
   {_url_cs,server_change_stations},
   {_url_jn,server_json_stations},
+  {_url_je,server_json_station_special},
 
   {_url_jl,server_json_log},
   {_url_dl,server_delete_log},
@@ -1369,6 +1416,7 @@ void handle_web_request(char *p)
 #endif
   rewind_ether_buffer();
 
+  DEBUG_PRINTLN(p);
   // assume this is a GET request
   // GET /xx?xxxx
   char *com = p+5;
diff --git a/utils.cpp b/utils.cpp
index e76f1afb..cb4da321 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -61,6 +61,7 @@ bool read_from_file(const char *name, char *data, int maxsize, int pos) {
     data[0]=0;
     return true;  // return true but with empty string
   }
+  file.seekSet(pos);
   ret = file.fgets(data, maxsize);
   data[maxsize-1]=0;
   file.close();

From 343d3f05fedea4e52f8f0e21008a2183600fdeb6 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Fri, 14 Aug 2015 16:45:16 -0400
Subject: [PATCH 18/39] add support to refresh RF and Remote stations to ensure
 they are in sync with the main controller

---
 OpenSprinkler.cpp | 28 +++++++++-------------------
 defines.h         |  2 +-
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index cb4bd27e..6fb5857c 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -558,11 +558,6 @@ void OpenSprinkler::apply_all_station_bits() {
   digitalWrite(PIN_SR_LATCH, LOW);
   byte bid, s, sbits;
   
-  /*#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
-  // old station bits
-  static byte old_station_bits[MAX_EXT_BOARDS+1];
-  #endif*/
-  
   // Shift out all station bit values
   // from the highest bit to the lowest
   for(bid=0;bid<=MAX_EXT_BOARDS;bid++) {
@@ -571,16 +566,6 @@ void OpenSprinkler::apply_all_station_bits() {
     else
       sbits = 0;
 
-    /*#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
-    // check if any station is changing from 0 to 1
-    // take the bit inverse of the old status
-    // and with the new status
-    if ((~old_station_bits[MAX_EXT_BOARDS-bid]) & sbits) {
-      engage_booster = true;
-    }
-    old_station_bits[MAX_EXT_BOARDS-bid] = sbits;
-    #endif*/
-
     for(s=0;s<8;s++) {
       digitalWrite(PIN_SR_CLOCK, LOW);
 #if defined(OSPI) // if OSPi, use dynamically assigned pin_sr_data
@@ -598,10 +583,9 @@ void OpenSprinkler::apply_all_station_bits() {
     // boost voltage
     digitalWrite(PIN_BOOST_EN, LOW);  // disable output path
     digitalWrite(PIN_BOOST, HIGH);    // enable boost converter
-    delay((int)options[OPTION_BOOST_TIME].value<<2);  // wait for capacitor to charge
+    delay((int)options[OPTION_BOOST_TIME].value<<2);  // wait for booster to charge
     digitalWrite(PIN_BOOST, LOW);     // disable boost converter
    
-    // enable boosted voltage for a short period of time
     digitalWrite(PIN_BOOST_EN, HIGH); // enable output path
     digitalWrite(PIN_SR_LATCH, HIGH);
     engage_booster = 0;
@@ -611,6 +595,14 @@ void OpenSprinkler::apply_all_station_bits() {
   #else
   digitalWrite(PIN_SR_LATCH, HIGH);
   #endif
+
+  // handle refresh of rf and remote stations
+  // each time apply_all_station_bits is called
+  // we refresh the station whose index is the time modulo MAX_NUM_STATIONS
+  byte sid = now() % MAX_NUM_STATIONS;
+  bid=sid>>3;
+  s=sid&0x07;
+  switch_special_station(sid, (station_bits[bid]>>s)&0x01);
 }
 
 void OpenSprinkler::rainsensor_status() {
@@ -794,7 +786,6 @@ byte OpenSprinkler::set_station_bit(byte sid, byte value) {
       switch_special_station(sid, 1);
       return 1;
     }
-    //station_bits[bid] = station_bits[bid] | ((byte)1<<s);
   } else {
     if(!((*data)&mask)) return 0; // if bit is already reset, return no change
     else {
@@ -802,7 +793,6 @@ byte OpenSprinkler::set_station_bit(byte sid, byte value) {
       switch_special_station(sid, 0);
       return 255;
     }
-    //station_bits[bid] = station_bits[bid] &~((byte)1<<s);
   }
   return 0;
 }
diff --git a/defines.h b/defines.h
index 61a13ba6..5d12f698 100644
--- a/defines.h
+++ b/defines.h
@@ -347,7 +347,7 @@ typedef enum {
   #define ETHER_BUFFER_SIZE   16384
 
   #define DEBUG_BEGIN(x)          {}  /** Serial debug functions */
-  //#define ENABLE_DEBUG
+  #define ENABLE_DEBUG
   #if defined(ENABLE_DEBUG)
     inline  void DEBUG_PRINT(int x) {printf("%d", x);}
     inline  void DEBUG_PRINT(const char*s) {printf("%s", s);}

From 538b6c27e337a574c831c7506a312fcaa1efa9e7 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Sat, 15 Aug 2015 15:01:56 -0400
Subject: [PATCH 19/39] fix read_from_file function for Linux

---
 utils.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils.cpp b/utils.cpp
index cb4da321..4af61c96 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -159,6 +159,7 @@ bool read_from_file(const char *name, char *data, int maxsize, int pos) {
   }
 
   int res;
+  fseek(file, pos, SEEK_SET);
   if(fgets(data, maxsize, file)) {
     res = strlen(data);
   } else {

From e47bcd0fd1d614acc4ce8e550d91e70630c2a6c5 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Sat, 15 Aug 2015 16:58:58 -0400
Subject: [PATCH 20/39] add OSPi support for remote station

---
 OpenSprinkler.cpp | 63 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 14 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 6fb5857c..138253d7 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -317,7 +317,14 @@ void OpenSprinkler::reboot_dev() {
 
 #else // RPI/BBB/LINUX network init functions
 
+#include "etherport.h"
+#include <sys/reboot.h>
+#include <stdlib.h>
+#include "utils.h"
+#include "server.h"
+
 extern EthernetServer *m_server;
+extern char ether_buffer[];
 
 byte OpenSprinkler::start_network() {
   unsigned int port = (unsigned int)(options[OPTION_HTTPPORT_1].value<<8) + (unsigned int)options[OPTION_HTTPPORT_0].value;
@@ -333,7 +340,6 @@ byte OpenSprinkler::start_network() {
   return m_server->begin();
 }
 
-#include <sys/reboot.h>
 void OpenSprinkler::reboot_dev() {
 #if defined(DEMO)
   // do nothing
@@ -343,7 +349,6 @@ void OpenSprinkler::reboot_dev() {
 #endif
 }
 
-#include <stdlib.h>
 void OpenSprinkler::update_dev() {
   char cmd[1024];
   sprintf(cmd, "cd %s & ./updater.sh", get_runtime_path());
@@ -855,7 +860,6 @@ void OpenSprinkler::switch_rfstation(byte *code, bool turnon) {
 
 static void switchremote_callback(byte status, uint16_t off, uint16_t len) {
   /* do nothing */
-  DEBUG_PRINTLN(off);
 }
 
 void OpenSprinkler::switch_remotestation(byte *code, bool turnon) {
@@ -867,20 +871,9 @@ void OpenSprinkler::switch_remotestation(byte *code, bool turnon) {
   ether.hisip[2] = (ip>>8)&0xff;
   ether.hisip[3] = ip&0xff;
 
-  DEBUG_PRINT(ether.hisip[0]);
-  DEBUG_PRINT(":");
-  DEBUG_PRINT(ether.hisip[1]);
-  DEBUG_PRINT(":");
-  DEBUG_PRINT(ether.hisip[2]);
-  DEBUG_PRINT(":");
-  DEBUG_PRINT(ether.hisip[3]);
-  DEBUG_PRINT(":");
-
   uint16_t _port = ether.hisport; // save current port number
   ether.hisport = hex2ulong(code+8, 4);
 
-  DEBUG_PRINTLN(ether.hisport);
-
   char *p = tmp_buffer + sizeof(StationSpecialData);
   BufferFiller bf = (byte*)p;
   bf.emit_p(PSTR("?pw=$E&sid=$D&en=$D&t=64800"), ADDR_NVM_PASSWORD, (int)hex2ulong(code+12,2), turnon);
@@ -890,7 +883,49 @@ void OpenSprinkler::switch_remotestation(byte *code, bool turnon) {
     ether.packetLoop(ether.packetReceive());
   }
   ether.hisport = _port;
+#else
+  EthernetClient client;
 
+  uint8_t hisip[4];
+  uint16_t hisport;
+  ulong ip = hex2ulong(code, 8);
+  hisip[0] = ip>>24;
+  hisip[1] = (ip>>16)&0xff;
+  hisip[2] = (ip>>8)&0xff;
+  hisip[3] = ip&0xff;
+  hisport = hex2ulong(code+8, 4);
+
+  if (!client.connect(hisip, hisport)) {
+    DEBUG_PRINTLN("failed to connect to remote controller");
+    client.stop();
+    return;
+  }
+
+  char *p = tmp_buffer + sizeof(StationSpecialData);
+  BufferFiller bf = p;
+  bf.emit_p(PSTR("GET /cm?pw=$E&sid=$D&en=$D&t=64800"),
+            ADDR_NVM_PASSWORD,
+            (int)hex2ulong(code+12,2),
+            turnon);
+  bf.emit_p(PSTR(" HTTP/1.0\r\nHOST: *\r\n\r\n"));
+
+  DEBUG_PRINTLN(p);
+  client.write((uint8_t *)p, strlen(p));
+
+  bzero(ether_buffer, ETHER_BUFFER_SIZE);
+
+  time_t timeout = now() + 5; // 5 seconds timeout
+  while(now() < timeout) {
+    int len=client.read((uint8_t *)ether_buffer, ETHER_BUFFER_SIZE);
+    if (len<=0) {
+      if(!client.connected())
+        break;
+      else
+        continue;
+    }
+    switchremote_callback(0, 0, ETHER_BUFFER_SIZE);
+  }
+  client.stop();
 #endif
 }
 

From d12c7f4db6f0b88b416b4bee0d9b3cf0860de26e Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Sat, 15 Aug 2015 17:53:55 -0400
Subject: [PATCH 21/39] fix missing quote for sd in /je

---
 server.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.cpp b/server.cpp
index 8fe1c042..37c8f13b 100644
--- a/server.cpp
+++ b/server.cpp
@@ -414,7 +414,7 @@ byte server_json_station_special(char *p) {
     int stepsize=sizeof(StationSpecialData);
     read_from_file(stns_filename, tmp_buffer, stepsize, sid*stepsize);
     StationSpecialData *stn = (StationSpecialData *)tmp_buffer;
-    bfill.emit_p(PSTR("\"st\":$D,\"sd\":$S}"), stn->type, stn->data);
+    bfill.emit_p(PSTR("\"st\":$D,\"sd\":\"$S\"}"), stn->type, stn->data);
     delay(1);
     return HTML_OK;
   } else {

From 8deb8739f3ebbd906e97568fdd09b47570b97bc2 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Sun, 16 Aug 2015 12:30:16 -0400
Subject: [PATCH 22/39] change remote station command to use a shorter timer
 (twice the refresh interval). change /cm to allow only one queue instance at
 a time

---
 OpenSprinkler.cpp | 21 +++++++++++++--------
 etherport.cpp     |  4 ++--
 main.cpp          |  7 +++++--
 server.cpp        | 30 +++++++++++++++++++++++-------
 weather.cpp       |  1 -
 5 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 138253d7..5aa9ed88 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -604,10 +604,14 @@ void OpenSprinkler::apply_all_station_bits() {
   // handle refresh of rf and remote stations
   // each time apply_all_station_bits is called
   // we refresh the station whose index is the time modulo MAX_NUM_STATIONS
+  static byte last_sid = 0;
   byte sid = now() % MAX_NUM_STATIONS;
-  bid=sid>>3;
-  s=sid&0x07;
-  switch_special_station(sid, (station_bits[bid]>>s)&0x01);
+  if (sid != last_sid) {
+    last_sid = sid;
+    bid=sid>>3;
+    s=sid&0x07;
+    switch_special_station(sid, (station_bits[bid]>>s)&0x01);
+  }
 }
 
 void OpenSprinkler::rainsensor_status() {
@@ -876,7 +880,10 @@ void OpenSprinkler::switch_remotestation(byte *code, bool turnon) {
 
   char *p = tmp_buffer + sizeof(StationSpecialData);
   BufferFiller bf = (byte*)p;
-  bf.emit_p(PSTR("?pw=$E&sid=$D&en=$D&t=64800"), ADDR_NVM_PASSWORD, (int)hex2ulong(code+12,2), turnon);
+  bf.emit_p(PSTR("?pw=$E&sid=$D&en=$D&t=$D"),
+            ADDR_NVM_PASSWORD,
+            (int)hex2ulong(code+12,2),
+            turnon, 2*MAX_NUM_STATIONS);  // MAX_NUM_STATIONS is the refresh cycle
   DEBUG_PRINTLN(p);
   ether.browseUrl(PSTR("/cm"), p, PSTR("*"), switchremote_callback);
   for(int l=0;l<100;l++) {
@@ -896,20 +903,18 @@ void OpenSprinkler::switch_remotestation(byte *code, bool turnon) {
   hisport = hex2ulong(code+8, 4);
 
   if (!client.connect(hisip, hisport)) {
-    DEBUG_PRINTLN("failed to connect to remote controller");
     client.stop();
     return;
   }
 
   char *p = tmp_buffer + sizeof(StationSpecialData);
   BufferFiller bf = p;
-  bf.emit_p(PSTR("GET /cm?pw=$E&sid=$D&en=$D&t=64800"),
+  bf.emit_p(PSTR("GET /cm?pw=$E&sid=$D&en=$D&t=$D"),
             ADDR_NVM_PASSWORD,
             (int)hex2ulong(code+12,2),
-            turnon);
+            turnon, 2*MAX_NUM_STATIONS);  // MAX_NUM_STATIONS is the refresh cycle
   bf.emit_p(PSTR(" HTTP/1.0\r\nHOST: *\r\n\r\n"));
 
-  DEBUG_PRINTLN(p);
   client.write((uint8_t *)p, strlen(p));
 
   bzero(ether_buffer, ETHER_BUFFER_SIZE);
diff --git a/etherport.cpp b/etherport.cpp
index 7a4b357c..5a981e22 100644
--- a/etherport.cpp
+++ b/etherport.cpp
@@ -135,8 +135,8 @@ int EthernetClient::connect(uint8_t ip[4], uint16_t port)
 	m_sock = socket(AF_INET, SOCK_STREAM, 0);
 	if (::connect(m_sock, (struct sockaddr *) &sin, sizeof(sin)) < 0)
 	{
-		DEBUG_PRINTLN("error connecting to weather server");
-		return false;
+    DEBUG_PRINTLN("error connecting to server");
+    return 0;
 	}
 	m_connected = true;
 	return 1;
diff --git a/main.cpp b/main.cpp
index abd6f235..f74bf042 100644
--- a/main.cpp
+++ b/main.cpp
@@ -490,7 +490,9 @@ void do_loop()
       int qi;
       for(qi=pd.nqueue-1;qi>=0;qi--) {
         q=pd.queue+qi;
-        if(!q->dur || curr_time>=q->st+q->dur)  pd.dequeue(qi);
+        if(!q->dur || curr_time>=q->st+q->dur)  {
+          pd.dequeue(qi);
+        }
       }
 
       // process dynamic events
@@ -765,7 +767,8 @@ void schedule_all_stations(ulong curr_time) {
     DEBUG_PRINT(q->st);
     DEBUG_PRINT(",");
     DEBUG_PRINT(q->dur);
-    DEBUG_PRINTLN("]");
+    DEBUG_PRINT("]");
+    DEBUG_PRINTLN(pd.nqueue);
     os.status.program_busy = 1;  // set program busy bit
   }
 }
diff --git a/server.cpp b/server.cpp
index 37c8f13b..558c1cae 100644
--- a/server.cpp
+++ b/server.cpp
@@ -370,7 +370,13 @@ void server_json_stations_main()
   server_json_stations_attrib(PSTR("masop2"), ADDR_NVM_MAS_OP_2);
   server_json_stations_attrib(PSTR("stn_dis"), ADDR_NVM_STNDISABLE);
   server_json_stations_attrib(PSTR("stn_seq"), ADDR_NVM_STNSEQ);
+#if defined(ARDUINO)  // only output stn_spe if it's supported
+  if (os.status.has_sd) {
+    server_json_stations_attrib(PSTR("stn_spe"), ADDR_NVM_STNSPE);
+  }
+#else
   server_json_stations_attrib(PSTR("stn_spe"), ADDR_NVM_STNSPE);
+#endif
   bfill.emit_p(PSTR("\"snames\":["));
   byte sid;
   for(sid=0;sid<os.nstations;sid++) {
@@ -469,8 +475,13 @@ byte server_change_stations(char *p)
   server_change_stations_attrib(p, 'n', ADDR_NVM_MAS_OP_2); // master2
   server_change_stations_attrib(p, 'd', ADDR_NVM_STNDISABLE); // disable
   server_change_stations_attrib(p, 'q', ADDR_NVM_STNSEQ); // sequential
+#if defined(ARDUINO)  // only parse station special bits if it's supported
+  if(os.status.has_sd) {
+    server_change_stations_attrib(p, 'p', ADDR_NVM_STNSPE); // special
+  }
+#else
   server_change_stations_attrib(p, 'p', ADDR_NVM_STNSPE); // special
-
+#endif
   /* handle special data */
   if(findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("sid"), true)) {
     sid = atoi(tmp_buffer);
@@ -1156,15 +1167,21 @@ byte server_change_manual(char *p) {
         return HTML_DATA_OUTOFBOUND;
       }
       // schedule manual station
-      // skip if the station is:
-      // - master station (because master cannot be scheduled independently
-      // - currently running (cannot handle overlapping schedules of the same station)
+      // skip if the station is a master station
+      // (because master cannot be scheduled independently)
       byte bid = sid>>3;
       byte s = sid&0x07;
-      if ((os.status.mas==sid+1) || (os.status.mas2==sid+1) || (os.station_bits[bid]&(1<<s)))
+      if ((os.status.mas==sid+1) || (os.status.mas2==sid+1))
         return HTML_NOT_PERMITTED;
 
-      RuntimeQueueStruct *q = pd.enqueue();
+      RuntimeQueueStruct *q = NULL;
+      byte sqi = pd.station_qid[sid];
+      // check if the station already has a schedule
+      if (sqi!=0xFF) {  // if we, we will overwrite the schedule
+        q = pd.queue+sqi;
+      } else {  // otherwise create a new queue element
+        q = pd.enqueue();
+      }
       // if the queue is not full
       if (q) {
         q->st = 0;
@@ -1416,7 +1433,6 @@ void handle_web_request(char *p)
 #endif
   rewind_ether_buffer();
 
-  DEBUG_PRINTLN(p);
   // assume this is a GET request
   // GET /xx?xxxx
   char *com = p+5;
diff --git a/weather.cpp b/weather.cpp
index f7cc01d9..4eb020c4 100644
--- a/weather.cpp
+++ b/weather.cpp
@@ -202,7 +202,6 @@ void GetWeather() {
   DEBUG_PRINTLN(((uint8_t*)server->h_addr)[3]);
 
   if (!client.connect((uint8_t*)server->h_addr, 80)) {
-    DEBUG_PRINTLN("failed to connect to weather server");
     client.stop();
     return;
   }

From 53219fe1131aafaa4930d9cfb83060a301ade42a Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Sun, 16 Aug 2015 16:12:01 -0400
Subject: [PATCH 23/39] add support to set controller in slave mode. in this
 mode, sequential flags are ignored, and check_weather() function is not
 performed

---
 OpenSprinkler.cpp |  3 +++
 defines.h         |  1 +
 main.cpp          | 21 ++++++++++++++-------
 server.cpp        | 18 +++++++++++++++---
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 5aa9ed88..c1c0f727 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -108,6 +108,7 @@ static prog_char _json_mtof2[]PROGMEM = "mtof2";
 static prog_char _json_fwm[]  PROGMEM = "fwm";
 static prog_char _json_fpr0[] PROGMEM = "fpr0";
 static prog_char _json_fpr1[] PROGMEM = "fpr1";
+static prog_char _json_slave[]PROGMEM = "sl";
 static prog_char _json_reset[] PROGMEM = "reset";
 
 /** Option names */
@@ -148,6 +149,7 @@ static prog_char _str_mton2[]PROGMEM = "Mas2  on adj:";
 static prog_char _str_mtof2[]PROGMEM = "Mas2 off adj:";
 static prog_char _str_fwm[]  PROGMEM = "FWm:";
 static prog_char _str_fpr [] PROGMEM = "Pulse rate:";
+static prog_char _str_slave[]PROGMEM = "Slave mode:";
 static prog_char _str_reset[] PROGMEM = "Reset all?";
 
 OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
@@ -199,6 +201,7 @@ OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
   {OS_FW_MINOR, 0, _str_fwm, _json_fwm}, // firmware version
   {100, 255, _str_fpr,  _json_fpr0},
   {0,   255, 0,         _json_fpr1},
+  {0,   1,   _str_slave,_json_slave},
   {0,   1,   _str_reset,_json_reset}
 };
 
diff --git a/defines.h b/defines.h
index 5d12f698..9fcf4f1e 100644
--- a/defines.h
+++ b/defines.h
@@ -205,6 +205,7 @@ typedef enum {
   OPTION_FW_MINOR,
   OPTION_PULSE_RATE_0,
   OPTION_PULSE_RATE_1,
+  OPTION_SLAVE_MODE,
   OPTION_RESET,
   NUM_OPTIONS	// total number of options
 } OS_OPTION_t;
diff --git a/main.cpp b/main.cpp
index f74bf042..89276a4d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -504,6 +504,7 @@ void do_loop()
       // check through runtime queue, calculate the last stop time of sequential stations
       pd.last_seq_stop_time = 0;
       ulong sst;
+      byte slave=os.options[OPTION_SLAVE_MODE].value;
       q = pd.queue;
       for(;q<pd.queue+pd.nqueue;q++) {
         sid = q->sid;
@@ -513,7 +514,8 @@ void do_loop()
         // and the stop time must be larger than curr_time
         sst = q->st + q->dur;
         if (sst>curr_time) {
-          if (os.station_attrib_bits_read(ADDR_NVM_STNSEQ+bid)&(1<<s)) {   // only need to update last_seq_stop_time for sequential stations
+          // only need to update last_seq_stop_time for sequential stations
+          if (os.station_attrib_bits_read(ADDR_NVM_STNSEQ+bid)&(1<<s) && !slave) {
             pd.last_seq_stop_time = (sst>pd.last_seq_stop_time ) ? sst : pd.last_seq_stop_time;
           }
         }
@@ -637,8 +639,11 @@ void do_loop()
 }
 
 void check_weather() {
-  // do not check weather if the Use Weather option is disabled, or if network is not available, or if a program is running
-  if (os.status.network_fails>0 || os.status.program_busy) return;
+  // do not check weather if
+  // - network check has failed, or
+  // - a program is currently running
+  // - the controller is in slave mode
+  if (os.status.network_fails>0 || os.status.program_busy || os.options[OPTION_SLAVE_MODE].value) return;
 
   ulong ntz = os.now_tz();
   if (os.checkwt_success_lasttime && (ntz > os.checkwt_success_lasttime + CHECK_WEATHER_SUCCESS_TIMEOUT)) {
@@ -651,7 +656,7 @@ void check_weather() {
   if (!os.checkwt_lasttime || (ntz > os.checkwt_lasttime + CHECK_WEATHER_TIMEOUT)) {
     os.checkwt_lasttime = ntz;
     GetWeather();
-    write_log(LOGDATA_WATERLEVEL, ntz); // warning: water level may update a few seconds after getweather is called
+    write_log(LOGDATA_WATERLEVEL, ntz);
   }
 }
 
@@ -741,6 +746,7 @@ void schedule_all_stations(ulong curr_time) {
   }
 
   RuntimeQueueStruct *q = pd.queue;
+  byte slave = os.options[OPTION_SLAVE_MODE].value;
   // go through runtime queue and calculate start time of each station
   for(;q<pd.queue+pd.nqueue;q++) {
     if(q->st) continue; // if this queue element has already been scheduled, skip
@@ -749,14 +755,15 @@ void schedule_all_stations(ulong curr_time) {
     byte bid=sid>>3;
     byte s=sid&0x07;
 
-    // check if this is a sequential station
-    if (os.station_attrib_bits_read(ADDR_NVM_STNSEQ+bid)&(1<<s)) {
+    // if this is a sequential station and the controller is not in slave mode
+    // use sequential scheduling. station delay time apples
+    if (os.station_attrib_bits_read(ADDR_NVM_STNSEQ+bid)&(1<<s) && !slave) {
       // sequential scheduling
       q->st = seq_start_time;
       seq_start_time += q->dur;
       seq_start_time += station_delay; // add station delay time
     } else {
-      // concurrent scheduling
+      // otherwise, concurrent scheduling
       q->st = con_start_time;
       // stagger concurrent stations by 1 second
       con_start_time++;
diff --git a/server.cpp b/server.cpp
index 558c1cae..936e21fc 100644
--- a/server.cpp
+++ b/server.cpp
@@ -875,13 +875,15 @@ byte server_home()
 
 /**
  * Change controller variables
- * Command: /cv?pw=xxx&rsn=x&rbt=x&en=x&rd=x
+ * Command: /cv?pw=xxx&rsn=x&rbt=x&en=x&rd=x&sl=x
  *
  * pw:  password
  * rsn: reset all stations (0 or 1)
  * rbt: reboot controller (0 or 1)
  * en:  enable (0 or 1)
  * rd:  rain delay hours (0 turns off rain delay)
+ * sl:  slave mode
+ * update: launch update script (for OSPi/OSBo/Linux only)
  */
 
 byte server_change_values(char *p)
@@ -920,6 +922,15 @@ byte server_change_values(char *p)
     } else  return HTML_DATA_OUTOFBOUND;
   }
 
+  if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("sl"), true)) {
+    if (tmp_buffer[0]=='1' && !os.options[OPTION_SLAVE_MODE].value) {
+      os.options[OPTION_SLAVE_MODE].value = 1;
+      os.options_save();
+    } else if(tmp_buffer[0]=='0' && os.options[OPTION_SLAVE_MODE].value) {
+      os.options[OPTION_SLAVE_MODE].value = 0;
+      os.options_save();
+    }
+  }
   return HTML_SUCCESS;
 }
 
@@ -988,10 +999,11 @@ byte server_change_options(char *p)
   for (byte oid=0; oid<NUM_OPTIONS; oid++) {
     //if ((os.options[oid].flag&OPFLAG_WEB_EDIT)==0) continue;
 
-    // skip options that cannot be set through web UI
+    // skip options that cannot be set through /co command
     if (oid==OPTION_RESET || oid==OPTION_DEVICE_ENABLE ||
         oid==OPTION_FW_VERSION || oid==OPTION_HW_VERSION ||
-        oid==OPTION_FW_MINOR || oid==OPTION_SEQUENTIAL_RETIRED)
+        oid==OPTION_FW_MINOR || oid==OPTION_SEQUENTIAL_RETIRED ||
+        oid==OPTION_SLAVE_MODE)
       continue;
     prev_value = os.options[oid].value;
     if (os.options[oid].max==1)  os.options[oid].value = 0;  // set a bool variable to 0 first

From 1d40345c95188514fd8c0abd0c600e7e5061d575 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Mon, 17 Aug 2015 00:09:22 -0400
Subject: [PATCH 24/39] rename the term 'slave' to 'remote extender'

---
 OpenSprinkler.cpp |  4 ++--
 defines.h         |  2 +-
 main.cpp          |  6 +++---
 server.cpp        | 14 +++++++-------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index c1c0f727..7c6f72c3 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -108,7 +108,7 @@ static prog_char _json_mtof2[]PROGMEM = "mtof2";
 static prog_char _json_fwm[]  PROGMEM = "fwm";
 static prog_char _json_fpr0[] PROGMEM = "fpr0";
 static prog_char _json_fpr1[] PROGMEM = "fpr1";
-static prog_char _json_slave[]PROGMEM = "sl";
+static prog_char _json_slave[]PROGMEM = "re";
 static prog_char _json_reset[] PROGMEM = "reset";
 
 /** Option names */
@@ -149,7 +149,7 @@ static prog_char _str_mton2[]PROGMEM = "Mas2  on adj:";
 static prog_char _str_mtof2[]PROGMEM = "Mas2 off adj:";
 static prog_char _str_fwm[]  PROGMEM = "FWm:";
 static prog_char _str_fpr [] PROGMEM = "Pulse rate:";
-static prog_char _str_slave[]PROGMEM = "Slave mode:";
+static prog_char _str_slave[]PROGMEM = "As remote ext.:";
 static prog_char _str_reset[] PROGMEM = "Reset all?";
 
 OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
diff --git a/defines.h b/defines.h
index 9fcf4f1e..784b61ba 100644
--- a/defines.h
+++ b/defines.h
@@ -205,7 +205,7 @@ typedef enum {
   OPTION_FW_MINOR,
   OPTION_PULSE_RATE_0,
   OPTION_PULSE_RATE_1,
-  OPTION_SLAVE_MODE,
+  OPTION_REMOTE_EXT_MODE,
   OPTION_RESET,
   NUM_OPTIONS	// total number of options
 } OS_OPTION_t;
diff --git a/main.cpp b/main.cpp
index 89276a4d..1e65b33d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -504,7 +504,7 @@ void do_loop()
       // check through runtime queue, calculate the last stop time of sequential stations
       pd.last_seq_stop_time = 0;
       ulong sst;
-      byte slave=os.options[OPTION_SLAVE_MODE].value;
+      byte slave=os.options[OPTION_REMOTE_EXT_MODE].value;
       q = pd.queue;
       for(;q<pd.queue+pd.nqueue;q++) {
         sid = q->sid;
@@ -643,7 +643,7 @@ void check_weather() {
   // - network check has failed, or
   // - a program is currently running
   // - the controller is in slave mode
-  if (os.status.network_fails>0 || os.status.program_busy || os.options[OPTION_SLAVE_MODE].value) return;
+  if (os.status.network_fails>0 || os.status.program_busy || os.options[OPTION_REMOTE_EXT_MODE].value) return;
 
   ulong ntz = os.now_tz();
   if (os.checkwt_success_lasttime && (ntz > os.checkwt_success_lasttime + CHECK_WEATHER_SUCCESS_TIMEOUT)) {
@@ -746,7 +746,7 @@ void schedule_all_stations(ulong curr_time) {
   }
 
   RuntimeQueueStruct *q = pd.queue;
-  byte slave = os.options[OPTION_SLAVE_MODE].value;
+  byte slave = os.options[OPTION_REMOTE_EXT_MODE].value;
   // go through runtime queue and calculate start time of each station
   for(;q<pd.queue+pd.nqueue;q++) {
     if(q->st) continue; // if this queue element has already been scheduled, skip
diff --git a/server.cpp b/server.cpp
index 936e21fc..1b42b8e7 100644
--- a/server.cpp
+++ b/server.cpp
@@ -882,7 +882,7 @@ byte server_home()
  * rbt: reboot controller (0 or 1)
  * en:  enable (0 or 1)
  * rd:  rain delay hours (0 turns off rain delay)
- * sl:  slave mode
+ * re:  remote extension mode
  * update: launch update script (for OSPi/OSBo/Linux only)
  */
 
@@ -922,12 +922,12 @@ byte server_change_values(char *p)
     } else  return HTML_DATA_OUTOFBOUND;
   }
 
-  if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("sl"), true)) {
-    if (tmp_buffer[0]=='1' && !os.options[OPTION_SLAVE_MODE].value) {
-      os.options[OPTION_SLAVE_MODE].value = 1;
+  if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("re"), true)) {
+    if (tmp_buffer[0]=='1' && !os.options[OPTION_REMOTE_EXT_MODE].value) {
+      os.options[OPTION_REMOTE_EXT_MODE].value = 1;
       os.options_save();
-    } else if(tmp_buffer[0]=='0' && os.options[OPTION_SLAVE_MODE].value) {
-      os.options[OPTION_SLAVE_MODE].value = 0;
+    } else if(tmp_buffer[0]=='0' && os.options[OPTION_REMOTE_EXT_MODE].value) {
+      os.options[OPTION_REMOTE_EXT_MODE].value = 0;
       os.options_save();
     }
   }
@@ -1003,7 +1003,7 @@ byte server_change_options(char *p)
     if (oid==OPTION_RESET || oid==OPTION_DEVICE_ENABLE ||
         oid==OPTION_FW_VERSION || oid==OPTION_HW_VERSION ||
         oid==OPTION_FW_MINOR || oid==OPTION_SEQUENTIAL_RETIRED ||
-        oid==OPTION_SLAVE_MODE)
+        oid==OPTION_REMOTE_EXT_MODE)
       continue;
     prev_value = os.options[oid].value;
     if (os.options[oid].max==1)  os.options[oid].value = 0;  // set a bool variable to 0 first

From 2409a26d4e7ea7ac3d5cea7e7a6551db422fdacc Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Mon, 17 Aug 2015 01:42:35 -0400
Subject: [PATCH 25/39] change /je to dump all special station data

---
 server.cpp | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/server.cpp b/server.cpp
index 1b42b8e7..41288fcf 100644
--- a/server.cpp
+++ b/server.cpp
@@ -399,33 +399,28 @@ byte server_json_stations(char *p) {
   return HTML_OK;
 }
 
-/**
- * Output Station Special Attribute
- * Command: /je?sid=x
- *
- * sid: station index (starting from 0)
- */
+/** Output Station Special Attribute */
 byte server_json_station_special(char *p) {
 #if defined(ARDUINO)
   // if no sd card, return false
   if (!os.status.has_sd)  return HTML_PAGE_NOT_FOUND;
 #endif
-  int sid;
-  if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("sid"), true)) {
-    sid = atoi(tmp_buffer);
-    if (sid< 0 || sid >= os.nstations) return HTML_DATA_OUTOFBOUND;
-
-    print_json_header();
-
-    int stepsize=sizeof(StationSpecialData);
-    read_from_file(stns_filename, tmp_buffer, stepsize, sid*stepsize);
-    StationSpecialData *stn = (StationSpecialData *)tmp_buffer;
-    bfill.emit_p(PSTR("\"st\":$D,\"sd\":\"$S\"}"), stn->type, stn->data);
-    delay(1);
-    return HTML_OK;
-  } else {
-    return HTML_DATA_MISSING;
+  byte sid;
+  byte comma=0;
+  int stepsize=sizeof(StationSpecialData);
+  StationSpecialData *stn = (StationSpecialData *)tmp_buffer;
+  print_json_header();
+  for(sid=0;sid<os.nstations;sid++) {
+    if(os.station_attrib_bits_read(ADDR_NVM_STNSPE+(sid>>3))&(1<<(sid&0x07))) {
+      read_from_file(stns_filename, (char*)stn, stepsize, sid*stepsize);
+      if (comma) bfill.emit_p(PSTR(","));
+      else {comma=1;}
+      bfill.emit_p(PSTR("$D:{\"st\":$D,\"sd\":\"$S\"}"), sid, stn->type, stn->data);
+    }
   }
+  bfill.emit_p(PSTR("}"));
+  delay(1);
+  return HTML_OK;
 }
 
 void server_change_stations_attrib(char *p, char header, int addr)

From 4643288ee01a00acce0434ff5ca35dedf38a773a Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Mon, 17 Aug 2015 01:50:29 -0400
Subject: [PATCH 26/39] add missing quotes

---
 server.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.cpp b/server.cpp
index 41288fcf..5ee9d922 100644
--- a/server.cpp
+++ b/server.cpp
@@ -415,7 +415,7 @@ byte server_json_station_special(char *p) {
       read_from_file(stns_filename, (char*)stn, stepsize, sid*stepsize);
       if (comma) bfill.emit_p(PSTR(","));
       else {comma=1;}
-      bfill.emit_p(PSTR("$D:{\"st\":$D,\"sd\":\"$S\"}"), sid, stn->type, stn->data);
+      bfill.emit_p(PSTR("\"$D\":{\"st\":$D,\"sd\":\"$S\"}"), sid, stn->type, stn->data);
     }
   }
   bfill.emit_p(PSTR("}"));

From f76984d7b05063aa9768df9192b45a1de4d45835 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Tue, 18 Aug 2015 16:04:31 -0400
Subject: [PATCH 27/39] initial support for logging flow reading. optimize RAM
 usage by eliminating program memory pointer. add remote extension icon and
 flow sensor icon (for LCD display)

---
 OpenSprinkler.cpp |  62 ++++++++++++--------
 OpenSprinkler.h   |   1 +
 defines.h         |   3 +-
 main.cpp          |  41 ++++++++++----
 server.cpp        | 141 +++++++++++++++++++++-------------------------
 5 files changed, 135 insertions(+), 113 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 7c6f72c3..26f120f9 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -38,6 +38,7 @@ byte OpenSprinkler::engage_booster;
 #endif
 
 ulong OpenSprinkler::sensor_lasttime;
+ulong OpenSprinkler::flowcount_start;
 ulong OpenSprinkler::raindelay_start_time;
 byte OpenSprinkler::button_timeout;
 ulong OpenSprinkler::checkwt_lasttime;
@@ -206,23 +207,14 @@ OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
 };
 
 /** Weekday display strings */
-static prog_char str_day0[] PROGMEM = "Mon";
-static prog_char str_day1[] PROGMEM = "Tue";
-static prog_char str_day2[] PROGMEM = "Wed";
-static prog_char str_day3[] PROGMEM = "Thu";
-static prog_char str_day4[] PROGMEM = "Fri";
-static prog_char str_day5[] PROGMEM = "Sat";
-static prog_char str_day6[] PROGMEM = "Sun";
-
-prog_char* days_str[7] = {
-  str_day0,
-  str_day1,
-  str_day2,
-  str_day3,
-  str_day4,
-  str_day5,
-  str_day6
-};
+static prog_char days_str[] PROGMEM =
+  "Mon\0"
+  "Tue\0"
+  "Wed\0"
+  "Thu\0"
+  "Fri\0"
+  "Sat\0"
+  "Sun\0";
 
 // return local time (UTC time plus time zone offset)
 time_t OpenSprinkler::now_tz() {
@@ -504,7 +496,6 @@ void OpenSprinkler::begin() {
   lcd.createChar(0, _icon);
 
   // uSD card icon
-  _icon[0] = B00000;
   _icon[1] = B00000;
   _icon[2] = B11111;
   _icon[3] = B10001;
@@ -515,8 +506,6 @@ void OpenSprinkler::begin() {
   lcd.createChar(2, _icon);
 
   // Rain icon
-  _icon[0] = B00000;
-  _icon[1] = B00000;
   _icon[2] = B00110;
   _icon[3] = B01001;
   _icon[4] = B11111;
@@ -526,8 +515,6 @@ void OpenSprinkler::begin() {
   lcd.createChar(3, _icon);
 
   // Connect icon
-  _icon[0] = B00000;
-  _icon[1] = B00000;
   _icon[2] = B00111;
   _icon[3] = B00011;
   _icon[4] = B00101;
@@ -536,6 +523,24 @@ void OpenSprinkler::begin() {
   _icon[7] = B00000;
   lcd.createChar(4, _icon);
 
+  // Remote extension icon
+  _icon[2] = B00000;
+  _icon[3] = B00111;
+  _icon[4] = B01000;
+  _icon[5] = B10011;
+  _icon[6] = B10100;
+  _icon[7] = B10101;
+  lcd.createChar(5, _icon);
+
+  // Flow sensor icon
+  _icon[2] = B01110;
+  _icon[3] = B00100;
+  _icon[4] = B01110;
+  _icon[5] = B11011;
+  _icon[6] = B11011;
+  _icon[7] = B01110;
+  lcd.createChar(6, _icon);
+
   // set sd cs pin high to release SD
   pinMode(PIN_SD_CS, OUTPUT);
   digitalWrite(PIN_SD_CS, HIGH);
@@ -1184,7 +1189,8 @@ void OpenSprinkler::lcd_print_time(time_t t)
   lcd_print_pgm(PSTR(":"));
   lcd_print_2digit(minute(t));
   lcd_print_pgm(PSTR("  "));
-  lcd_print_pgm(days_str[weekday_today()]);
+  // each weekday string has 3 characters + ending 0
+  lcd_print_pgm(days_str+4*weekday_today());
   lcd_print_pgm(PSTR(" "));
   lcd_print_2digit(month(t));
   lcd_print_pgm(PSTR("-"));
@@ -1243,11 +1249,17 @@ void OpenSprinkler::lcd_print_station(byte line, char c) {
 	  }
 	}
 	lcd_print_pgm(PSTR("    "));
+  lcd.setCursor(12, 1);
+  if(options[OPTION_REMOTE_EXT_MODE].value) {
+    lcd.write(5);
+  }
 	lcd.setCursor(13, 1);
-  if(status.rain_delayed || (status.rain_sensed && options[OPTION_SENSOR_TYPE].value==SENSOR_TYPE_RAIN))
-  {
+  if(status.rain_delayed || (status.rain_sensed && options[OPTION_SENSOR_TYPE].value==SENSOR_TYPE_RAIN))  {
     lcd.write(3);
   }
+  if(options[OPTION_SENSOR_TYPE].value==SENSOR_TYPE_FLOW) {
+    lcd.write(6);
+  }
   lcd.setCursor(14, 1);
   if (status.has_sd)  lcd.write(2);
 
diff --git a/OpenSprinkler.h b/OpenSprinkler.h
index 4fed9127..e1698006 100644
--- a/OpenSprinkler.h
+++ b/OpenSprinkler.h
@@ -119,6 +119,7 @@ class OpenSprinkler {
 
   // variables for time keeping
   static ulong sensor_lasttime;  // time when the most recent sensor reading was performed
+  static ulong flowcount_start; // starting flow count
   static ulong raindelay_start_time;  // time when the most recent rain delay started
   static byte  button_timeout;        // button timeout
   static ulong checkwt_lasttime;      // time when weather was checked
diff --git a/defines.h b/defines.h
index 784b61ba..00a60e61 100644
--- a/defines.h
+++ b/defines.h
@@ -215,6 +215,7 @@ typedef enum {
 #define LOGDATA_RAINSENSE  0x01
 #define LOGDATA_RAINDELAY  0x02
 #define LOGDATA_WATERLEVEL 0x03
+#define LOGDATA_FLOWSENSE  0x04
 
 #undef OS_HW_VERSION
 
@@ -292,7 +293,7 @@ typedef enum {
 
   #endif
   typedef unsigned char   uint8_t;
-  typedef unsigned int uint16_t;
+  typedef unsigned int    uint16_t;
   typedef int int16_t;
 
 #else // Hardware defines for RPI/BBB
diff --git a/main.cpp b/main.cpp
index 1e65b33d..79f53dbf 100644
--- a/main.cpp
+++ b/main.cpp
@@ -531,6 +531,9 @@ void do_loop()
         pd.reset_runtime();
         // reset program busy bit
         os.status.program_busy = 0;
+        // log flow sensor reading
+        DEBUG_PRINTLN("log flow count");
+        write_log(LOGDATA_FLOWSENSE, curr_time);
 
         // in case some options have changed while executing the program
         os.status.mas = os.options[OPTION_MASTER_STATION].value; // update master station
@@ -736,6 +739,7 @@ void process_dynamic_events(ulong curr_time) {
 }
 
 void schedule_all_stations(ulong curr_time) {
+  DEBUG_PRINTLN(curr_time);
   ulong con_start_time = curr_time + 1;   // concurrent start time
   ulong seq_start_time = con_start_time;  // sequential start time
 
@@ -776,7 +780,12 @@ void schedule_all_stations(ulong curr_time) {
     DEBUG_PRINT(q->dur);
     DEBUG_PRINT("]");
     DEBUG_PRINTLN(pd.nqueue);
-    os.status.program_busy = 1;  // set program busy bit
+    if (!os.status.program_busy) {
+      os.status.program_busy = 1;  // set program busy bit
+      // start flow count
+      os.flowcount_start = flow_count;
+      DEBUG_PRINTLN("flow count started");
+    }
   }
 }
 
@@ -849,12 +858,17 @@ void make_logfile_name(char *name) {
   strcat_P(tmp_buffer, PSTR(".txt"));
 }
 
-const char *log_type_names[] = {
-  "",
-  "rs",
-  "rd",
-  "wl"
-};
+/* To save RAM space, we store log type names
+ * in program memory, and each name
+ * must be strictly two characters with an ending 0
+ * so each name is 3 characters total
+ */
+static prog_char log_type_names[] PROGMEM =
+    "  \0"
+    "rs\0"
+    "rd\0"
+    "wl\0"
+    "fl\0";
 
 // write run record to log on SD card
 void write_log(byte type, ulong curr_time) {
@@ -906,19 +920,24 @@ void write_log(byte type, ulong curr_time) {
     itoa(pd.lastrun.duration, tmp_buffer+strlen(tmp_buffer), 10);
   } else {
     strcat_P(tmp_buffer, PSTR("0,\""));
-    strcat(tmp_buffer, log_type_names[type]);
+    strcat_P(tmp_buffer, log_type_names+type*3);
     strcat_P(tmp_buffer, PSTR("\","));
+    ulong logvalue = 0;
     switch(type) {
       case LOGDATA_RAINSENSE:
-        ultoa((curr_time - os.sensor_lasttime), tmp_buffer+strlen(tmp_buffer), 10);
+        logvalue = (curr_time>os.sensor_lasttime)?(curr_time-os.sensor_lasttime):0;
         break;
       case LOGDATA_RAINDELAY:
-        ultoa((curr_time - os.raindelay_start_time), tmp_buffer+strlen(tmp_buffer), 10);
+        logvalue = (curr_time>os.raindelay_start_time)?(curr_time-os.raindelay_start_time):0;
         break;
       case LOGDATA_WATERLEVEL:
-        itoa(os.options[OPTION_WATER_PERCENTAGE].value, tmp_buffer+strlen(tmp_buffer), 10);
+        logvalue = os.options[OPTION_WATER_PERCENTAGE].value;
+        break;
+      case LOGDATA_FLOWSENSE:
+        logvalue = (flow_count>os.flowcount_start)?(flow_count-os.flowcount_start):0;
         break;
     }
+    ultoa(logvalue, tmp_buffer+strlen(tmp_buffer), 10);
   }
   strcat_P(tmp_buffer, PSTR(","));
   ultoa(curr_time, tmp_buffer+strlen(tmp_buffer), 10);
diff --git a/server.cpp b/server.cpp
index 5ee9d922..96e08860 100644
--- a/server.cpp
+++ b/server.cpp
@@ -1260,7 +1260,7 @@ byte server_json_log(char *p) {
   print_json_header(false);
   bfill.emit_p(PSTR("["));
 
-  bool first = true;
+  bool comma = 0;
   for(int i=start;i<=end;i++) {
     itoa(i, tmp_buffer, 10);
     make_logfile_name(tmp_buffer);
@@ -1296,25 +1296,24 @@ byte server_json_log(char *p) {
     #endif
 
       // remove the \n character
-      if (tmp_buffer[res-1] == '\n')  tmp_buffer[res-1] = 0;
+      //if (tmp_buffer[res-1] == '\n')  tmp_buffer[res-1] = 0;
 
       // check record type
       // special records are all in the form of [0,"xx",...]
       // where xx is the type name
       if (type_specified && strncmp(type, tmp_buffer+4, 2))
         continue;
-      // if type is not specified, output everything except "wl" records
-      if (!type_specified && !strncmp("wl", tmp_buffer+4, 2))
+      // if type is not specified, output everything except "wl" and "fl" records
+      if (!type_specified && (!strncmp("wl", tmp_buffer+4, 2) || !strncmp("fl", tmp_buffer+4, 2)))
         continue;
       // if this is the first record, do not print comma
-      if (first)  { bfill.emit_p(PSTR("$S"), tmp_buffer); first=false;}
-      else {  bfill.emit_p(PSTR(",$S"), tmp_buffer); }
-      //count ++;
+      if (comma)  bfill.emit_p(PSTR(","));
+      else {comma=1;}
+      bfill.emit_p(PSTR("$S"), tmp_buffer);
       // if the available ether buffer size is getting small
       // push out a packet
       if (available_ether_buffer() < 80) {
         send_packet();
-        //count = 0;
       }
     }
   }
@@ -1363,73 +1362,63 @@ byte server_json_all(char *p) {
   return HTML_OK;
 }
 
-struct URLStruct{
+typedef byte (*URLHandler)(char*);
+/*struct URLStruct{
   PGM_P PROGMEM url;
-  byte (*handler)(char*);
-};
-
-
-// Server function urls
-// !!!Important!!!: to save space, each url must be two characters long
-prog_char _url_cv [] PROGMEM = "cv";
-prog_char _url_jc [] PROGMEM = "jc";
-
-prog_char _url_dp [] PROGMEM = "dp";
-prog_char _url_cp [] PROGMEM = "cp";
-prog_char _url_cr [] PROGMEM = "cr";
-prog_char _url_up [] PROGMEM = "up";
-prog_char _url_jp [] PROGMEM = "jp";
 
-prog_char _url_co [] PROGMEM = "co";
-prog_char _url_jo [] PROGMEM = "jo";
-prog_char _url_sp [] PROGMEM = "sp";
+};*/
 
-prog_char _url_js [] PROGMEM = "js";
-prog_char _url_cm [] PROGMEM = "cm";
 
-prog_char _url_cs [] PROGMEM = "cs";
-prog_char _url_jn [] PROGMEM = "jn";
-prog_char _url_je [] PROGMEM = "je";
-
-prog_char _url_jl [] PROGMEM = "jl";
-prog_char _url_dl [] PROGMEM = "dl";
-
-prog_char _url_su [] PROGMEM = "su";
-prog_char _url_cu [] PROGMEM = "cu";
-
-prog_char _url_ja [] PROGMEM = "ja";
+/* Server function urls
+ * To save RAM space, each GET command keyword is exactly
+ * 2 characters long, with no ending 0
+ * The order must exactly match the order of the
+ * handler functions below
+ */
+prog_char _url_keys[] PROGMEM =
+  "cv"
+  "jc"
+  "dp"
+  "cp"
+  "cr"
+  "up"
+  "jp"
+  "co"
+  "jo"
+  "sp"
+  "js"
+  "cm"
+  "cs"
+  "jn"
+  "je"
+  "jl"
+  "dl"
+  "su"
+  "cu"
+  "ja";
 
 // Server function handlers
-URLStruct urls[] = {
-  {_url_cv,server_change_values},
-  {_url_jc,server_json_controller},
-
-  {_url_dp,server_delete_program},
-  {_url_cp,server_change_program},
-  {_url_cr,server_change_runonce},
-  {_url_up,server_moveup_program},
-  {_url_jp,server_json_programs},
-
-
-  {_url_co,server_change_options},
-  {_url_jo,server_json_options},
-  {_url_sp,server_change_password},
-
-  {_url_js,server_json_status},
-  {_url_cm,server_change_manual},
-
-  {_url_cs,server_change_stations},
-  {_url_jn,server_json_stations},
-  {_url_je,server_json_station_special},
-
-  {_url_jl,server_json_log},
-  {_url_dl,server_delete_log},
-
-  {_url_su,server_view_scripturl},
-  {_url_cu,server_change_scripturl},
-
-  {_url_ja,server_json_all},
-
+URLHandler urls[] = {
+  server_change_values,   // cv
+  server_json_controller, // jc
+  server_delete_program,  // dp
+  server_change_program,  // cp
+  server_change_runonce,  // cr
+  server_moveup_program,  // up
+  server_json_programs,   // jp
+  server_change_options,  // co
+  server_json_options,    // jo
+  server_change_password, // sp
+  server_json_status,     // js
+  server_change_manual,   // cm
+  server_change_stations, // cs
+  server_json_stations,   // jn
+  server_json_station_special,// je
+  server_json_log,        // jl
+  server_delete_log,      // dl
+  server_view_scripturl,  // su
+  server_change_scripturl,// cu
+  server_json_all         // ja
 };
 
 // handle Ethernet request
@@ -1451,15 +1440,15 @@ void handle_web_request(char *p)
   } else {
     // server funtion handlers
     byte i;
-    for(i=0;i<sizeof(urls)/sizeof(URLStruct);i++) {
-      if(pgm_read_byte(urls[i].url)==com[0]
-       &&pgm_read_byte(urls[i].url+1)==com[1]) {
+    for(i=0;i<sizeof(urls)/sizeof(URLHandler);i++) {
+      if(pgm_read_byte(_url_keys+2*i)==com[0]
+       &&pgm_read_byte(_url_keys+2*i+1)==com[1]) {
 
         // check password
         byte ret = HTML_UNAUTHORIZED;
 
         if (com[0]=='s' && com[1]=='u') { // for /su do not require password
-          ret = (urls[i].handler)(dat);
+          ret = (urls[i])(dat);
         } else if ((com[0]=='j' && com[1]=='o') ||
                    (com[0]=='j' && com[1]=='a'))  { // for /jo and /ja we output fwv if password fails
           if(check_password(dat)==false) {
@@ -1468,14 +1457,14 @@ void handle_web_request(char *p)
                    os.options[0].json_str, os.options[0].value);
             ret = HTML_OK;
           } else {
-            ret = (urls[i].handler)(dat);
+            ret = (urls[i])(dat);
           }
         } else {
           // first check password
           if(check_password(dat)==false) {
             ret = HTML_UNAUTHORIZED;
           } else {
-            ret = (urls[i].handler)(dat);
+            ret = (urls[i])(dat);
           }
         }
         switch(ret) {
@@ -1493,7 +1482,7 @@ void handle_web_request(char *p)
       }
     }
 
-    if(i==sizeof(urls)/sizeof(URLStruct)) {
+    if(i==sizeof(urls)/sizeof(URLHandler)) {
       // no server funtion found
       print_json_header();
       bfill.emit_p(PSTR("\"result\":$D}"), HTML_PAGE_NOT_FOUND);

From f24956970cc377bf5095133b36b84420377b8b38 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Wed, 19 Aug 2015 00:48:30 -0400
Subject: [PATCH 28/39] add support for logging flow readings

---
 OpenSprinkler.cpp | 25 ++++++++++----------
 OpenSprinkler.h   |  5 ++--
 main.cpp          | 60 +++++++++++++++++++++++++++++------------------
 server.cpp        | 28 +++++++++++++++-------
 4 files changed, 72 insertions(+), 46 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 26f120f9..c58d9da0 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -39,6 +39,7 @@ byte OpenSprinkler::engage_booster;
 
 ulong OpenSprinkler::sensor_lasttime;
 ulong OpenSprinkler::flowcount_start;
+ulong OpenSprinkler::flowcount_time_ms;
 ulong OpenSprinkler::raindelay_start_time;
 byte OpenSprinkler::button_timeout;
 ulong OpenSprinkler::checkwt_lasttime;
@@ -181,7 +182,7 @@ OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
   {0,   60,  _str_mton, _json_mton},  // master on time [0,60] seconds
   {60,  120, _str_mtof, _json_mtof},  // master off time [-60,60] seconds
   {0,   255, _str_sf,   _json_sf},    // sensor function (see SENSOR_TYPE macro defines)
-  {1,   1,   _str_rso,  _json_rso},   // rain sensor type. 0: normally closed; 1: normally open.
+  {0,   1,   _str_rso,  _json_rso},   // rain sensor type. 0: normally closed; 1: normally open.
   {100, 250, _str_wl,   _json_wl},    // water level (default 100%),
   {1,   1,   _str_den,  _json_den},   // device enable
   {0,   1,   _str_ipas, _json_ipas},  // 1: ignore password; 0: use password
@@ -525,20 +526,20 @@ void OpenSprinkler::begin() {
 
   // Remote extension icon
   _icon[2] = B00000;
-  _icon[3] = B00111;
-  _icon[4] = B01000;
-  _icon[5] = B10011;
-  _icon[6] = B10100;
-  _icon[7] = B10101;
+  _icon[3] = B10001;
+  _icon[4] = B01011;
+  _icon[5] = B00101;
+  _icon[6] = B01001;
+  _icon[7] = B11110;
   lcd.createChar(5, _icon);
 
   // Flow sensor icon
-  _icon[2] = B01110;
-  _icon[3] = B00100;
-  _icon[4] = B01110;
-  _icon[5] = B11011;
-  _icon[6] = B11011;
-  _icon[7] = B01110;
+  _icon[2] = B00000;
+  _icon[3] = B11010;
+  _icon[4] = B10010;
+  _icon[5] = B11010;
+  _icon[6] = B10011;
+  _icon[7] = B00000;
   lcd.createChar(6, _icon);
 
   // set sd cs pin high to release SD
diff --git a/OpenSprinkler.h b/OpenSprinkler.h
index e1698006..60a1da8b 100644
--- a/OpenSprinkler.h
+++ b/OpenSprinkler.h
@@ -118,8 +118,9 @@ class OpenSprinkler {
                                   // first byte-> master controller, second byte-> ext. board 1, and so on
 
   // variables for time keeping
-  static ulong sensor_lasttime;  // time when the most recent sensor reading was performed
-  static ulong flowcount_start; // starting flow count
+  static ulong sensor_lasttime;  // time when the last sensor reading is recorded
+  static ulong flowcount_time_ms;// time stamp when new flow sensor click is received (in milliseconds)
+  static ulong flowcount_start;  // starting flow count
   static ulong raindelay_start_time;  // time when the most recent rain delay started
   static byte  button_timeout;        // button timeout
   static ulong checkwt_lasttime;      // time when weather was checked
diff --git a/main.cpp b/main.cpp
index 79f53dbf..d67710df 100644
--- a/main.cpp
+++ b/main.cpp
@@ -185,9 +185,9 @@ volatile ulong flow_count = 0;
 // Flow sensor interrupt service routine
 void flow_isr() {
   ulong curr = millis();
-  if(curr-os.sensor_lasttime < 50) return;  // debounce threshold: 50ms
+  if(curr-os.flowcount_time_ms < 50) return;  // debounce threshold: 50ms
   flow_count++;
-  os.sensor_lasttime = curr;
+  os.flowcount_time_ms = curr;
 }
 
 // ======================
@@ -254,6 +254,8 @@ ISR(WDT_vect)
 }
 
 #else
+volatile ulong flow_count = 0;
+
 void do_setup() {
   os.begin();          // OpenSprinkler init
   os.options_setup();  // Setup options
@@ -358,18 +360,23 @@ void do_loop()
       os.old_status.rain_delayed = os.status.rain_delayed;
     }
     // ====== Check rain sensor status ======
-    os.rainsensor_status();
-    if (os.old_status.rain_sensed != os.status.rain_sensed) {
-      if (os.status.rain_sensed) {
-        // rain sensor on, record time
-        os.sensor_lasttime = curr_time;
-      } else {
-        // rain sensor off, write log
-        write_log(LOGDATA_RAINSENSE, curr_time);
+    if (os.options[OPTION_SENSOR_TYPE].value == SENSOR_TYPE_RAIN) {
+      os.rainsensor_status();
+      if (os.old_status.rain_sensed != os.status.rain_sensed) {
+        if (os.status.rain_sensed) {
+          // rain sensor on, record time
+          os.sensor_lasttime = curr_time;
+        } else {
+          // rain sensor off, write log
+          if (curr_time>os.sensor_lasttime+10) {  // add a 10 second threshold
+                                                  // to avoid faulty rain sensors generating
+                                                  // too many log records
+            write_log(LOGDATA_RAINSENSE, curr_time);
+          }
+        }
+        os.old_status.rain_sensed = os.status.rain_sensed;
       }
-      os.old_status.rain_sensed = os.status.rain_sensed;
     }
-
     // ====== Schedule program data ======
     ulong curr_minute = curr_time / 60;
     boolean match_found = false;
@@ -532,7 +539,6 @@ void do_loop()
         // reset program busy bit
         os.status.program_busy = 0;
         // log flow sensor reading
-        DEBUG_PRINTLN("log flow count");
         write_log(LOGDATA_FLOWSENSE, curr_time);
 
         // in case some options have changed while executing the program
@@ -783,7 +789,10 @@ void schedule_all_stations(ulong curr_time) {
     if (!os.status.program_busy) {
       os.status.program_busy = 1;  // set program busy bit
       // start flow count
-      os.flowcount_start = flow_count;
+      if(os.options[OPTION_SENSOR_TYPE].value == SENSOR_TYPE_FLOW) {
+        os.flowcount_start = flow_count;
+        os.sensor_lasttime = curr_time;
+      }
       DEBUG_PRINTLN("flow count started");
     }
   }
@@ -919,25 +928,30 @@ void write_log(byte type, ulong curr_time) {
     strcat_P(tmp_buffer, PSTR(","));
     itoa(pd.lastrun.duration, tmp_buffer+strlen(tmp_buffer), 10);
   } else {
-    strcat_P(tmp_buffer, PSTR("0,\""));
+    ulong lvalue;
+    if(type==LOGDATA_FLOWSENSE) {
+      lvalue = (flow_count>os.flowcount_start)?(flow_count-os.flowcount_start):0;
+    } else {
+      lvalue = 0;
+    }
+    ultoa(lvalue, tmp_buffer+strlen(tmp_buffer), 10);
+    strcat_P(tmp_buffer, PSTR(",\""));
     strcat_P(tmp_buffer, log_type_names+type*3);
     strcat_P(tmp_buffer, PSTR("\","));
-    ulong logvalue = 0;
+
     switch(type) {
       case LOGDATA_RAINSENSE:
-        logvalue = (curr_time>os.sensor_lasttime)?(curr_time-os.sensor_lasttime):0;
+      case LOGDATA_FLOWSENSE:
+        lvalue = (curr_time>os.sensor_lasttime)?(curr_time-os.sensor_lasttime):0;
         break;
       case LOGDATA_RAINDELAY:
-        logvalue = (curr_time>os.raindelay_start_time)?(curr_time-os.raindelay_start_time):0;
+        lvalue = (curr_time>os.raindelay_start_time)?(curr_time-os.raindelay_start_time):0;
         break;
       case LOGDATA_WATERLEVEL:
-        logvalue = os.options[OPTION_WATER_PERCENTAGE].value;
-        break;
-      case LOGDATA_FLOWSENSE:
-        logvalue = (flow_count>os.flowcount_start)?(flow_count-os.flowcount_start):0;
+        lvalue = os.options[OPTION_WATER_PERCENTAGE].value;
         break;
     }
-    ultoa(logvalue, tmp_buffer+strlen(tmp_buffer), 10);
+    ultoa(lvalue, tmp_buffer+strlen(tmp_buffer), 10);
   }
   strcat_P(tmp_buffer, PSTR(","));
   ultoa(curr_time, tmp_buffer+strlen(tmp_buffer), 10);
diff --git a/server.cpp b/server.cpp
index 96e08860..ecb4cc7f 100644
--- a/server.cpp
+++ b/server.cpp
@@ -791,17 +791,22 @@ byte server_view_scripturl(char *p) {
   return HTML_OK;
 }
 
+extern ulong flow_count;
 void server_json_controller_main() {
   byte bid, sid;
   ulong curr_time = os.now_tz();
   //os.nvm_string_get(ADDR_NVM_LOCATION, tmp_buffer);
-  bfill.emit_p(PSTR("\"devt\":$L,\"nbrd\":$D,\"en\":$D,\"rd\":$D,\"rs\":$D,\"rdst\":$L,\"loc\":\"$E\",\"wtkey\":\"$E\",\"sunrise\":$D,\"sunset\":$D,\"eip\":$L,\"lwc\":$L,\"lswc\":$L,\"lrun\":[$D,$D,$D,$L],\"sbits\":["),
+  bfill.emit_p(PSTR("\"devt\":$L,\"nbrd\":$D,\"en\":$D,\"rd\":$D,\"rs\":$D,\"rdst\":$L,\"flt\":$L,\"flc\":$L,"
+                    "\"loc\":\"$E\",\"wtkey\":\"$E\",\"sunrise\":$D,\"sunset\":$D,\"eip\":$L,\"lwc\":$L,\"lswc\":$L,"
+                    "\"lrun\":[$D,$D,$D,$L],\"sbits\":["),
               curr_time,
               os.nboards,
               os.status.enabled,
               os.status.rain_delayed,
               os.status.rain_sensed,
               os.nvdata.rd_stop_time,
+              (os.options[OPTION_SENSOR_TYPE].value==SENSOR_TYPE_FLOW)?os.flowcount_time_ms:0,
+              (os.options[OPTION_SENSOR_TYPE].value==SENSOR_TYPE_FLOW)?flow_count:0,
               ADDR_NVM_LOCATION,
               ADDR_NVM_WEATHER_KEY,
               os.nvdata.sunrise_time,
@@ -1294,17 +1299,22 @@ byte server_json_log(char *p) {
         break;
       }
     #endif
-
-      // remove the \n character
-      //if (tmp_buffer[res-1] == '\n')  tmp_buffer[res-1] = 0;
-
       // check record type
-      // special records are all in the form of [0,"xx",...]
-      // where xx is the type name
-      if (type_specified && strncmp(type, tmp_buffer+4, 2))
+      // records are all in the form of [x,"xx",...]
+      // where x is program index (>0) if this is a station record
+      // and "xx" is the type name if this is a special record (e.g. wl, fl, rs)
+
+      // search string until we find the first comma
+      char *ptype = tmp_buffer;
+      tmp_buffer[TMP_BUFFER_SIZE-1]=0; // make sure the search will end
+      while(*ptype && *ptype != ',') ptype++;
+      if(*ptype != ',') continue; // didn't find comma, move on
+      ptype++;  // move past comma
+
+      if (type_specified && strncmp(type, ptype+1, 2))
         continue;
       // if type is not specified, output everything except "wl" and "fl" records
-      if (!type_specified && (!strncmp("wl", tmp_buffer+4, 2) || !strncmp("fl", tmp_buffer+4, 2)))
+      if (!type_specified && (!strncmp("wl", ptype+1, 2) || !strncmp("fl", ptype+1, 2)))
         continue;
       // if this is the first record, do not print comma
       if (comma)  bfill.emit_p(PSTR(","));

From 72d465a681884508d712f4835909292cb9b605ae Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Wed, 19 Aug 2015 23:44:50 -0400
Subject: [PATCH 29/39] store option maximum values, json strings, LCD prompt
 string to program memory space, freeing up about 10% RAM usage

---
 Arduino.mk        |   2 +-
 OpenSprinkler.cpp | 620 +++++++++++++++++++++++++++-------------------
 OpenSprinkler.h   |  10 +-
 defines.h         |   8 +-
 main.cpp          | 149 ++++++-----
 program.cpp       |  30 ++-
 program.h         |   6 +-
 server.cpp        |  67 ++---
 utils.cpp         |  10 +
 utils.h           |   1 +
 weather.cpp       |  16 +-
 11 files changed, 531 insertions(+), 388 deletions(-)

diff --git a/Arduino.mk b/Arduino.mk
index 1e840bf6..023d2e49 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -951,7 +951,7 @@ endif
 # Using += instead of =, so that CPPFLAGS can be set per sketch level
 CPPFLAGS      += -$(MCU_FLAG_NAME)=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) $(ARDUINO_ARCH_FLAG) -D__PROG_TYPES_COMPAT__ \
         -I. -I$(ARDUINO_CORE_PATH) -I$(ARDUINO_VAR_PATH)/$(VARIANT) \
-        $(SYS_INCLUDES) $(PLATFORM_INCLUDES) $(USER_INCLUDES) -Wall -ffunction-sections \
+        $(SYS_INCLUDES) $(PLATFORM_INCLUDES) $(USER_INCLUDES) -ffunction-sections \
         -fdata-sections
 
 ifdef DEBUG
diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index c58d9da0..7a93923f 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -67,147 +67,223 @@ char tmp_buffer[TMP_BUFFER_SIZE+1];       // scratch buffer
   byte OpenSprinkler::pin_sr_data = PIN_SR_DATA;
 #endif
 
-/** Option json names */
-static prog_char _json_fwv [] PROGMEM = "fwv";
-static prog_char _json_tz  [] PROGMEM = "tz";
-static prog_char _json_ntp [] PROGMEM = "ntp";
-static prog_char _json_dhcp[] PROGMEM = "dhcp";
-static prog_char _json_ip1 [] PROGMEM = "ip1";
-static prog_char _json_ip2 [] PROGMEM = "ip2";
-static prog_char _json_ip3 [] PROGMEM = "ip3";
-static prog_char _json_ip4 [] PROGMEM = "ip4";
-static prog_char _json_gw1 [] PROGMEM = "gw1";
-static prog_char _json_gw2 [] PROGMEM = "gw2";
-static prog_char _json_gw3 [] PROGMEM = "gw3";
-static prog_char _json_gw4 [] PROGMEM = "gw4";
-static prog_char _json_hp0 [] PROGMEM = "hp0";
-static prog_char _json_hp1 [] PROGMEM = "hp1";
-static prog_char _json_hwv [] PROGMEM = "hwv";
-static prog_char _json_ext [] PROGMEM = "ext";
-static prog_char _json_sdt [] PROGMEM = "sdt";
-static prog_char _json_mas [] PROGMEM = "mas";
-static prog_char _json_mton[] PROGMEM = "mton";
-static prog_char _json_mtof[] PROGMEM = "mtof";
-static prog_char _json_sf  [] PROGMEM = "urs";
-static prog_char _json_rso [] PROGMEM = "rso";
-static prog_char _json_wl  [] PROGMEM = "wl";
-static prog_char _json_den [] PROGMEM = "den";
-static prog_char _json_ipas[] PROGMEM = "ipas";
-static prog_char _json_devid[]PROGMEM = "devid";
-static prog_char _json_con [] PROGMEM = "con";
-static prog_char _json_lit [] PROGMEM = "lit";
-static prog_char _json_dim [] PROGMEM = "dim";
-static prog_char _json_bst [] PROGMEM = "bst";
-static prog_char _json_uwt [] PROGMEM = "uwt";
-static prog_char _json_ntp1[] PROGMEM = "ntp1";
-static prog_char _json_ntp2[] PROGMEM = "ntp2";
-static prog_char _json_ntp3[] PROGMEM = "ntp3";
-static prog_char _json_ntp4[] PROGMEM = "ntp4";
-static prog_char _json_log [] PROGMEM = "lg";
-static prog_char _json_mas2[] PROGMEM = "mas2";
-static prog_char _json_mton2[]PROGMEM = "mton2";
-static prog_char _json_mtof2[]PROGMEM = "mtof2";
-static prog_char _json_fwm[]  PROGMEM = "fwm";
-static prog_char _json_fpr0[] PROGMEM = "fpr0";
-static prog_char _json_fpr1[] PROGMEM = "fpr1";
-static prog_char _json_slave[]PROGMEM = "re";
-static prog_char _json_reset[] PROGMEM = "reset";
-
-/** Option names */
-static prog_char _str_fwv [] PROGMEM = "FW:";
-static prog_char _str_tz  [] PROGMEM = "TZone:";
-static prog_char _str_ntp [] PROGMEM = "NTP?";
-static prog_char _str_dhcp[] PROGMEM = "DHCP?";
-static prog_char _str_ip1 [] PROGMEM = "OS.ip1:";
-static prog_char _str_ip2 [] PROGMEM = ".ip2:";
-static prog_char _str_ip3 [] PROGMEM = ".ip3:";
-static prog_char _str_ip4 [] PROGMEM = ".ip4:";
-static prog_char _str_gw1 [] PROGMEM = "GW.ip1:";
-static prog_char _str_hp  [] PROGMEM = "Port:";
-static prog_char _str_hwv [] PROGMEM = "HW: ";
-static prog_char _str_ext [] PROGMEM = "Exp. board:";
-static prog_char _str_sdt [] PROGMEM = "Stn delay:";
-static prog_char _str_mas [] PROGMEM = "Mas1:";
-static prog_char _str_mton[] PROGMEM = "Mas1  on adj:";
-static prog_char _str_mtof[] PROGMEM = "Mas1 off adj:";
-static prog_char _str_sf  [] PROGMEM = "Sensor:";
-static prog_char _str_rso [] PROGMEM = "Normally open?";
-static prog_char _str_wl  [] PROGMEM = "% Watering:";
-static prog_char _str_den [] PROGMEM = "Dev. enable?";
-static prog_char _str_ipas[] PROGMEM = "Ign pwd?";
-static prog_char _str_devid[]PROGMEM = "Dev. ID:";
-static prog_char _str_con [] PROGMEM = "LCD con.:";
-static prog_char _str_lit [] PROGMEM = "LCD lit.:";
-static prog_char _str_dim [] PROGMEM = "LCD dim.:";
-static prog_char _str_bst [] PROGMEM = "Boost:";
-static prog_char _str_uwt [] PROGMEM = "Use weather?";
-static prog_char _str_ntp1[] PROGMEM = "NTP.ip1:";
-static prog_char _str_ntp2[] PROGMEM = ".ip2:";
-static prog_char _str_ntp3[] PROGMEM = ".ip3:";
-static prog_char _str_ntp4[] PROGMEM = ".ip4:";
-static prog_char _str_log [] PROGMEM = "Log?";
-static prog_char _str_mas2[] PROGMEM = "Mas2:";
-static prog_char _str_mton2[]PROGMEM = "Mas2  on adj:";
-static prog_char _str_mtof2[]PROGMEM = "Mas2 off adj:";
-static prog_char _str_fwm[]  PROGMEM = "FWm:";
-static prog_char _str_fpr [] PROGMEM = "Pulse rate:";
-static prog_char _str_slave[]PROGMEM = "As remote ext.:";
-static prog_char _str_reset[] PROGMEM = "Reset all?";
-
-OptionStruct OpenSprinkler::options[NUM_OPTIONS] = {
-  {OS_FW_VERSION, 0, _str_fwv, _json_fwv}, // firmware version
-  {28,  108, _str_tz,   _json_tz},    // default time zone: GMT-5
-  {1,   1,   _str_ntp,  _json_ntp},   // use NTP sync
-  {1,   1,   _str_dhcp, _json_dhcp},  // 0: use static ip, 1: use dhcp
-  {0,   255, _str_ip1,  _json_ip1},   // this and next 3 bytes define static ip
-  {0,   255, _str_ip2,  _json_ip2},
-  {0,   255, _str_ip3,  _json_ip3},
-  {0,   255, _str_ip4,  _json_ip4},
-  {0,   255, _str_gw1,  _json_gw1},   // this and next 3 bytes define static gateway ip
-  {0,   255, _str_ip2,  _json_gw2},
-  {0,   255, _str_ip3,  _json_gw3},
-  {0,   255, _str_ip4,  _json_gw4},
-#if defined(ARDUINO)                  // on AVR, the default HTTP port is 80
-  {80,  255, _str_hp,   _json_hp0},   // this and next byte define http port number
-  {0,   255, 0,         _json_hp1},
-#else                                 // on RPI/BBB/LINUX, the default HTTP port is 8080
-  {144, 255, _str_hp,   _json_hp0},   // this and next byte define http port number
-  {31,  255, 0,         _json_hp1},
+/** Option json names (stored in progmem) */
+// IMPORTANT: each json name is strictly 5 characters
+// with 0 fillings if less
+#define OP_JSON_NAME_STEPSIZE 5
+#if defined(ARDUINO)
+prog_char op_json_names[] PROGMEM =
+#else
+char op_json_names[] =
 #endif
-  {OS_HW_VERSION, 0, _str_hwv, _json_hwv},
-  {0,   MAX_EXT_BOARDS, _str_ext, _json_ext}, // number of extension board. 0: no extension boards
-  {1,   1,   0,         0},           // the option 'sequential' is now retired
-  {128, 247, _str_sdt,  _json_sdt},   // station delay time (-59 minutes to 59 minutes).
-  {0,   MAX_NUM_STATIONS, _str_mas,  _json_mas},   // index of master station. 0: no master station
-  {0,   60,  _str_mton, _json_mton},  // master on time [0,60] seconds
-  {60,  120, _str_mtof, _json_mtof},  // master off time [-60,60] seconds
-  {0,   255, _str_sf,   _json_sf},    // sensor function (see SENSOR_TYPE macro defines)
-  {0,   1,   _str_rso,  _json_rso},   // rain sensor type. 0: normally closed; 1: normally open.
-  {100, 250, _str_wl,   _json_wl},    // water level (default 100%),
-  {1,   1,   _str_den,  _json_den},   // device enable
-  {0,   1,   _str_ipas, _json_ipas},  // 1: ignore password; 0: use password
-  {0,   255, _str_devid,_json_devid}, // device id
-  {140, 255, _str_con,  _json_con},   // lcd contrast
-  {100, 255, _str_lit,  _json_lit},   // lcd backlight
-  {15,  255, _str_dim,  _json_dim},   // lcd dimming
-  {80,  250, _str_bst,  _json_bst},   // boost time (only valid to DC and LATCH type)
-  {0,   255, _str_uwt,  _json_uwt},   // weather algorithm (0 means not using weather algorithm)
-  {50,  255, _str_ntp1, _json_ntp1},  // this and the next three bytes define the ntp server ip
-  {97,  255, _str_ntp2, _json_ntp2},
-  {210, 255, _str_ntp3, _json_ntp3},
-  {169, 255, _str_ntp4, _json_ntp4},
-  {1,   1,   _str_log,  _json_log},   // enable logging: 0: disable; 1: enable.
-  {0,   MAX_NUM_STATIONS, _str_mas2, _json_mas2},  // index of master 2. 0: no master2 station
-  {0,   60,  _str_mton2,_json_mton2},
-  {60,  120, _str_mtof2,_json_mtof2},
-  {OS_FW_MINOR, 0, _str_fwm, _json_fwm}, // firmware version
-  {100, 255, _str_fpr,  _json_fpr0},
-  {0,   255, 0,         _json_fpr1},
-  {0,   1,   _str_slave,_json_slave},
-  {0,   1,   _str_reset,_json_reset}
+    "fwv\0\0"
+    "tz\0\0\0"
+    "ntp\0\0"
+    "dhcp\0"
+    "ip1\0\0"
+    "ip2\0\0"
+    "ip3\0\0"
+    "ip4\0\0"
+    "gw1\0\0"
+    "gw2\0\0"
+    "gw3\0\0"
+    "gw4\0\0"
+    "hp0\0\0"
+    "hp1\0\0"
+    "hwv\0\0"
+    "ext\0\0"
+    "seq\0\0"
+    "sdt\0\0"
+    "mas\0\0"
+    "mton\0"
+    "mtof\0"
+    "urs\0\0"
+    "rso\0\0"
+    "wl\0\0\0"
+    "den\0\0"
+    "ipas\0"
+    "devid"
+    "con\0\0"
+    "lit\0\0"
+    "dim\0\0"
+    "bst\0\0"
+    "uwt\0\0"
+    "ntp1\0"
+    "ntp2\0"
+    "ntp3\0"
+    "ntp4\0"
+    "lg\0\0\0"
+    "mas2\0"
+    "mton2"
+    "mtof2"
+    "fwm\0\0"
+    "fpr0\0"
+    "fpr1\0"
+    "re\0\0\0"
+    "reset";
+
+/** Option promopts (stored in progmem, for LCD display) */
+// Each string is strictly 16 characters
+// with SPACE fillings if less
+#if defined(ARDUINO)
+prog_char op_prompts[] PROGMEM =
+#else
+char op_promopts[] =
+#endif
+    "Firmware version"
+    "Time zone (GMT):"
+    "Enable NTP sync?"
+    "Enable DHCP?    "
+    "Static.ip1:     "
+    "Static.ip2:     "
+    "Static.ip3:     "
+    "Static.ip4:     "
+    "Gateway.ip1:    "
+    "Gateway.ip2:    "
+    "Gateway.ip3:    "
+    "Gateway.ip4:    "
+    "HTTP Port:      "
+    "----------------"
+    "Hardware version"
+    "# of exp. board:"
+    "----------------"
+    "Stn. delay (sec)"
+    "Master 1 (Mas1):"
+    "Mas1  on adjust:"
+    "Mas1 off adjust:"
+    "Sensor type:    "
+    "Normally open?  "
+    "Watering level: "
+    "Device enabled? "
+    "Ignore password?"
+    "Device ID:      "
+    "LCD contrast:   "
+    "LCD brightness: "
+    "LCD dimming:    "
+    "DC boost time:  "
+    "Weather algo.:  "
+    "NTP server.ip1: "
+    "NTP server.ip2: "
+    "NTP server.ip3: "
+    "NTP server.ip4: "
+    "Enable logging? "
+    "Master 2 (Mas2):"
+    "Mas2  on adjust:"
+    "Mas2 off adjust:"
+    "Firmware minor: "
+    "Pulse rate:     "
+    "----------------"
+    "As remote ext.? "
+    "Factory reset?  ";
+
+/** Option maximum values (stored in progmem) */
+#if defined(ARDUINO)
+prog_char op_max[] PROGMEM = {
+#else
+char op_max[] = {
+#endif
+  0,
+  108,
+  1,
+  1,
+  255,
+  255,
+  255,
+  255,
+  255,
+  255,
+  255,
+  255,
+  255,
+  255,
+  0,
+  MAX_EXT_BOARDS,
+  1,
+  247,
+  MAX_NUM_STATIONS,
+  60,
+  120,
+  255,
+  1,
+  250,
+  1,
+  1,
+  255,
+  255,
+  255,
+  255,
+  250,
+  255,
+  255,
+  255,
+  255,
+  255,
+  1,
+  MAX_NUM_STATIONS,
+  60,
+  120,
+  0,
+  255,
+  255,
+  1,
+  1
+};
+
+/** Option values (stored in RAM) */
+byte OpenSprinkler::options[] = {
+  OS_FW_VERSION, // firmware version
+  28, // default time zone: GMT-5
+  1,  // 0: disable NTP sync, 1: enable NTP sync
+  1,  // 0: use static ip, 1: use dhcp
+  0,  // this and next 3 bytes define static ip
+  0,
+  0,
+  0,
+  0,  // this and next 3 bytes define static gateway ip
+  0,
+  0,
+  0,
+#if defined(ARDUINO)  // on AVR, the default HTTP port is 80
+  80, // this and next byte define http port number
+  0,
+#else // on RPI/BBB/LINUX, the default HTTP port is 8080
+  144,// this and next byte define http port number
+  31,
+#endif
+  OS_HW_VERSION,
+  0,  // number of 8-station extension board. 0: no extension boards
+  1,  // the option 'sequential' is now retired
+  128,// station delay time (-59 minutes to 59 minutes).
+  0,  // index of master station. 0: no master station
+  0,  // master on time [0,60] seconds
+  60, // master off time [-60,60] seconds
+  0,  // sensor function (see SENSOR_TYPE macro defines)
+  0,  // rain sensor type. 0: normally closed; 1: normally open.
+  100,// water level (default 100%),
+  1,  // device enable
+  0,  // 1: ignore password; 0: use password
+  0,  // device id
+  140,// lcd contrast
+  100,// lcd backlight
+  15, // lcd dimming
+  80, // boost time (only valid to DC and LATCH type)
+  0,  // weather algorithm (0 means not using weather algorithm)
+  50, // this and the next three bytes define the ntp server ip
+  97,
+  210,
+  169,
+  1,  // enable logging: 0: disable; 1: enable.
+  0,  // index of master 2. 0: no master2 station
+  0,
+  60,
+  OS_FW_MINOR, // firmware minor version
+  100,// this and next byte define flow pulse rate (100x)
+  0,
+  0,  // set as remote extension
+  0   // reset
 };
 
-/** Weekday display strings */
+/** Weekday strings (stored in progmem, for LCD display) */
 static prog_char days_str[] PROGMEM =
   "Mon\0"
   "Tue\0"
@@ -217,14 +293,14 @@ static prog_char days_str[] PROGMEM =
   "Sat\0"
   "Sun\0";
 
-// return local time (UTC time plus time zone offset)
+/** Calculate local time (UTC time plus time zone offset) */
 time_t OpenSprinkler::now_tz() {
-  return now()+(int32_t)3600/4*(int32_t)(options[OPTION_TIMEZONE].value-48);
+  return now()+(int32_t)3600/4*(int32_t)(options[OPTION_TIMEZONE]-48);
 }
 
 #if defined(ARDUINO)  // AVR network init functions
 
-// read hardware MAC
+/** read hardware MAC */
 #define MAC_CTRL_ID 0x50
 bool OpenSprinkler::read_hardware_mac() {
   uint8_t ret;
@@ -260,7 +336,7 @@ byte OpenSprinkler::start_network() {
     tmp_buffer[2] = 0x69;
     tmp_buffer[3] = 0x2D;
     tmp_buffer[4] = 0x31;
-    tmp_buffer[5] = options[OPTION_DEVICE_ID].value;
+    tmp_buffer[5] = options[OPTION_DEVICE_ID];
   } else {
     // has hardware MAC chip
     status.has_hwmac = 1;
@@ -268,39 +344,39 @@ byte OpenSprinkler::start_network() {
 
   if(!ether.begin(ETHER_BUFFER_SIZE, (uint8_t*)tmp_buffer, PIN_ETHER_CS))  return 0;
   // calculate http port number
-  ether.hisport = (unsigned int)(options[OPTION_HTTPPORT_1].value<<8) + (unsigned int)options[OPTION_HTTPPORT_0].value;
+  ether.hisport = (unsigned int)(options[OPTION_HTTPPORT_1]<<8) + (unsigned int)options[OPTION_HTTPPORT_0];
 
-  if (options[OPTION_USE_DHCP].value) {
+  if (options[OPTION_USE_DHCP]) {
     // set up DHCP
     // register with domain name "OS-xx" where xx is the last byte of the MAC address
     if (!ether.dhcpSetup()) return 0;
     // once we have valid DHCP IP, we write these into static IP / gateway IP
     byte *ip = ether.myip;
-    options[OPTION_STATIC_IP1].value = ip[0];
-    options[OPTION_STATIC_IP2].value = ip[1];
-    options[OPTION_STATIC_IP3].value = ip[2];
-    options[OPTION_STATIC_IP4].value = ip[3];
+    options[OPTION_STATIC_IP1] = ip[0];
+    options[OPTION_STATIC_IP2] = ip[1];
+    options[OPTION_STATIC_IP3] = ip[2];
+    options[OPTION_STATIC_IP4] = ip[3];
 
     ip = ether.gwip;
-    options[OPTION_GATEWAY_IP1].value = ip[0];
-    options[OPTION_GATEWAY_IP2].value = ip[1];
-    options[OPTION_GATEWAY_IP3].value = ip[2];
-    options[OPTION_GATEWAY_IP4].value = ip[3];
+    options[OPTION_GATEWAY_IP1] = ip[0];
+    options[OPTION_GATEWAY_IP2] = ip[1];
+    options[OPTION_GATEWAY_IP3] = ip[2];
+    options[OPTION_GATEWAY_IP4] = ip[3];
     options_save();
 
   } else {
     // set up static IP
     byte staticip[] = {
-      options[OPTION_STATIC_IP1].value,
-      options[OPTION_STATIC_IP2].value,
-      options[OPTION_STATIC_IP3].value,
-      options[OPTION_STATIC_IP4].value};
+      options[OPTION_STATIC_IP1],
+      options[OPTION_STATIC_IP2],
+      options[OPTION_STATIC_IP3],
+      options[OPTION_STATIC_IP4]};
 
     byte gateway[] = {
-      options[OPTION_GATEWAY_IP1].value,
-      options[OPTION_GATEWAY_IP2].value,
-      options[OPTION_GATEWAY_IP3].value,
-      options[OPTION_GATEWAY_IP4].value};
+      options[OPTION_GATEWAY_IP1],
+      options[OPTION_GATEWAY_IP2],
+      options[OPTION_GATEWAY_IP3],
+      options[OPTION_GATEWAY_IP4]};
     if (!ether.staticSetup(staticip, gateway, gateway))  return 0;
   }
   return 1;
@@ -322,8 +398,9 @@ void OpenSprinkler::reboot_dev() {
 extern EthernetServer *m_server;
 extern char ether_buffer[];
 
+/** Initialize network with the given mac address and http port */
 byte OpenSprinkler::start_network() {
-  unsigned int port = (unsigned int)(options[OPTION_HTTPPORT_1].value<<8) + (unsigned int)options[OPTION_HTTPPORT_0].value;
+  unsigned int port = (unsigned int)(options[OPTION_HTTPPORT_1]<<8) + (unsigned int)options[OPTION_HTTPPORT_0];
 #if defined(DEMO)
   port = 8080;
 #endif
@@ -336,6 +413,7 @@ byte OpenSprinkler::start_network() {
   return m_server->begin();
 }
 
+/** Reboot controller */
 void OpenSprinkler::reboot_dev() {
 #if defined(DEMO)
   // do nothing
@@ -345,6 +423,7 @@ void OpenSprinkler::reboot_dev() {
 #endif
 }
 
+/** Launch update script */
 void OpenSprinkler::update_dev() {
   char cmd[1024];
   sprintf(cmd, "cd %s & ./updater.sh", get_runtime_path());
@@ -353,6 +432,7 @@ void OpenSprinkler::update_dev() {
 #endif // end network init functions
 
 #if defined(ARDUINO)
+/** Initialize LCD */
 void OpenSprinkler::lcd_start() {
   // turn on lcd
   lcd.init(1, PIN_LCD_RS, 255, PIN_LCD_EN, PIN_LCD_D4, PIN_LCD_D5, PIN_LCD_D6, PIN_LCD_D7, 0,0,0,0);
@@ -372,12 +452,12 @@ void OpenSprinkler::lcd_start() {
     lcd_set_brightness();
     lcd_set_contrast();
   } else {
-    // this is I2C LCD
-    // handle brightness
+    // for I2C LCD, we don't need to do anything
   }
 }
 #endif
 
+/** Initialize pins, controller variables, LCD */
 void OpenSprinkler::begin() {
 
   // shift register setup
@@ -414,11 +494,11 @@ void OpenSprinkler::begin() {
 #if defined(ARDUINO)
   digitalWrite(PIN_RAINSENSOR, HIGH); // enabled internal pullup on rain sensor
 #else
-  // RPI and BBB have external pullups
+  // OSPI and OSBO use external pullups
 #endif
 
   // Default controller status variables
-  // AVR assigns 0 to static variables by default
+  // Static variables are assigned 0 by default
   // so only need to initialize non-zero ones
   status.enabled = 1;
   status.safe_reboot = 0;
@@ -435,9 +515,6 @@ void OpenSprinkler::begin() {
   pinMode(PIN_RF_DATA, OUTPUT);
   digitalWrite(PIN_RF_DATA, LOW);
 
-  /*pinMode(PIN_RELAY, OUTPUT);
-  digitalWrite(PIN_RELAY, LOW);*/
-
   hw_type = HW_TYPE_AC;
 #if defined(ARDUINO)  // AVR SD and LCD functions
   // Init I2C
@@ -566,8 +643,9 @@ void OpenSprinkler::begin() {
 #endif
 }
 
-// Apply all station bits
-// !!! This will activate/deactivate valves !!!
+/** Apply all station bits
+ * !!! This will activate/deactivate valves !!!
+ */
 void OpenSprinkler::apply_all_station_bits() {
   digitalWrite(PIN_SR_LATCH, LOW);
   byte bid, s, sbits;
@@ -582,7 +660,7 @@ void OpenSprinkler::apply_all_station_bits() {
 
     for(s=0;s<8;s++) {
       digitalWrite(PIN_SR_CLOCK, LOW);
-#if defined(OSPI) // if OSPi, use dynamically assigned pin_sr_data
+#if defined(OSPI) // if OSPI, use dynamically assigned pin_sr_data
       digitalWrite(pin_sr_data, (sbits & ((byte)1<<(7-s))) ? HIGH : LOW );
 #else
       digitalWrite(PIN_SR_DATA, (sbits & ((byte)1<<(7-s))) ? HIGH : LOW );
@@ -594,10 +672,10 @@ void OpenSprinkler::apply_all_station_bits() {
   #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
   if((hw_type==HW_TYPE_DC) && engage_booster) {
     DEBUG_PRINTLN(F("engage booster"));
-    // boost voltage
+    // for DC controller: boost voltage
     digitalWrite(PIN_BOOST_EN, LOW);  // disable output path
     digitalWrite(PIN_BOOST, HIGH);    // enable boost converter
-    delay((int)options[OPTION_BOOST_TIME].value<<2);  // wait for booster to charge
+    delay((int)options[OPTION_BOOST_TIME]<<2);  // wait for booster to charge
     digitalWrite(PIN_BOOST, LOW);     // disable boost converter
    
     digitalWrite(PIN_BOOST_EN, HIGH); // enable output path
@@ -610,12 +688,12 @@ void OpenSprinkler::apply_all_station_bits() {
   digitalWrite(PIN_SR_LATCH, HIGH);
   #endif
 
-  // handle refresh of rf and remote stations
+  // handle refresh of RF and remote stations
   // each time apply_all_station_bits is called
-  // we refresh the station whose index is the time modulo MAX_NUM_STATIONS
+  // we refresh the station whose index is the current time modulo MAX_NUM_STATIONS
   static byte last_sid = 0;
   byte sid = now() % MAX_NUM_STATIONS;
-  if (sid != last_sid) {
+  if (sid != last_sid) {  // avoid refreshing the same station twice in a roll
     last_sid = sid;
     bid=sid>>3;
     s=sid&0x07;
@@ -623,16 +701,19 @@ void OpenSprinkler::apply_all_station_bits() {
   }
 }
 
+/** Read rain sensor status */
 void OpenSprinkler::rainsensor_status() {
   // options[OPTION_RS_TYPE]: 0 if normally closed, 1 if normally open
-  if(options[OPTION_SENSOR_TYPE].value!=SENSOR_TYPE_RAIN) return;
-  status.rain_sensed = (digitalRead(PIN_RAINSENSOR) == options[OPTION_RAINSENSOR_TYPE].value ? 0 : 1);
+  if(options[OPTION_SENSOR_TYPE]!=SENSOR_TYPE_RAIN) return;
+  status.rain_sensed = (digitalRead(PIN_RAINSENSOR) == options[OPTION_RAINSENSOR_TYPE] ? 0 : 1);
 }
 
+/** Read current sensing value
+ * OpenSprinkler DC has a 0.2 ohm current sensing resistor.
+ * Therefore the conversion from analog reading to milli-amp is:
+ * (r/1024)*3.3*1000/0.2
+ */
 #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
-// OpenSprinkler DC uses a 0.2 ohm current sensing resistor
-// Therefore the conversion from analog reading to milli-amp is:
-// (r/1024)*3.3*1000/0.2
 uint16_t OpenSprinkler::read_current() {
   if(status.has_curr_sense) {
     return (uint16_t)(analogRead(PIN_CURR_SENSE) * 16.11);
@@ -642,7 +723,9 @@ uint16_t OpenSprinkler::read_current() {
 }
 #endif
 
-int OpenSprinkler::detect_exp() { // AVR has capability to detect number of expansion boards
+/** Read the number of 8-station expansion boards */
+// AVR has capability to detect number of expansion boards
+int OpenSprinkler::detect_exp() {
 #if defined(ARDUINO)
   unsigned int v = analogRead(PIN_EXP_SENSE);
   // OpenSprinkler uses voltage divider to detect expansion boards
@@ -676,6 +759,7 @@ int OpenSprinkler::detect_exp() { // AVR has capability to detect number of expa
 #endif
 }
 
+/** Convert hex code to ulong integer */
 static ulong hex2ulong(byte *code, byte len) {
   char c;
   ulong v = 0;
@@ -695,7 +779,7 @@ static ulong hex2ulong(byte *code, byte len) {
   return v;
 }
 
-// Parse RF code into on/off/timeing sections
+/** Parse RF code into on/off/timeing sections */
 uint16_t OpenSprinkler::parse_rfstation_code(byte *code, ulong* on, ulong *off) {
   ulong v;
   v = hex2ulong(code, 6);
@@ -709,34 +793,34 @@ uint16_t OpenSprinkler::parse_rfstation_code(byte *code, ulong* on, ulong *off)
   return v;
 }
 
-// Get station name from nvm
+/** Get station name from NVM */
 void OpenSprinkler::get_station_name(byte sid, char tmp[]) {
   tmp[STATION_NAME_SIZE]=0;
   nvm_read_block(tmp, (void*)(ADDR_NVM_STN_NAMES+(int)sid*STATION_NAME_SIZE), STATION_NAME_SIZE);
-  return;
 }
 
-// Set station name to nvm
+/** Set station name to NVM */
 void OpenSprinkler::set_station_name(byte sid, char tmp[]) {
   tmp[STATION_NAME_SIZE]=0;
   nvm_write_block(tmp, (void*)(ADDR_NVM_STN_NAMES+(int)sid*STATION_NAME_SIZE), STATION_NAME_SIZE);
-  return;
 }
 
-// Save station attribute bits to NVM
+/** Save station attribute bits to NVM */
 void OpenSprinkler::station_attrib_bits_save(int addr, byte bits[]) {
   nvm_write_block(bits, (void*)addr, MAX_EXT_BOARDS+1);
 }
 
+/** Load all station attribute bits from NVM */
 void OpenSprinkler::station_attrib_bits_load(int addr, byte bits[]) {
   nvm_read_block(bits, (void*)addr, MAX_EXT_BOARDS+1);
 }
 
+/** Read one station attribute byte from NVM */
 byte OpenSprinkler::station_attrib_bits_read(int addr) {
   return nvm_read_byte((byte*)addr);
 }
 
-// verify if a string matches password
+/** verify if a string matches password */
 byte OpenSprinkler::password_verify(char *pw) {
   byte *addr = (byte*)ADDR_NVM_PASSWORD;
   byte c1, c2;
@@ -759,7 +843,7 @@ byte OpenSprinkler::password_verify(char *pw) {
 // Schedule Functions
 // ==================
 
-// Index of today's weekday (Monday is 0)
+/** Index of today's weekday (Monday is 0) */
 byte OpenSprinkler::weekday_today() {
   //return ((byte)weekday()+5)%7; // Time::weekday() assumes Sunday is 1
 #if defined(ARDUINO)
@@ -771,7 +855,7 @@ byte OpenSprinkler::weekday_today() {
 #endif
 }
 
-// Switch special station
+/** Switch special station */
 void OpenSprinkler::switch_special_station(byte sid, byte value) {
   // check station special bit
   if(station_attrib_bits_read(ADDR_NVM_STNSPE+(sid>>3))&(1<<(sid&0x07))) {
@@ -790,7 +874,11 @@ void OpenSprinkler::switch_special_station(byte sid, byte value) {
   }
 }
 
-// Set station bit
+/** Set station bit
+ * This function sets/resets the corresponding station bit variable
+ * You have to call apply_all_station_bits next to apply the bits
+ * (which results in physical actions of opening/closing valves).
+ */
 byte OpenSprinkler::set_station_bit(byte sid, byte value) {
   byte *data = station_bits+(sid>>3);  // pointer to the station byte
   byte mask = (byte)1<<(sid&0x07); // mask
@@ -801,32 +889,29 @@ byte OpenSprinkler::set_station_bit(byte sid, byte value) {
 #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
       engage_booster = true; // if bit is changing from 0 to 1, set engage_booster
 #endif
-      switch_special_station(sid, 1);
+      switch_special_station(sid, 1); // handle special stations
       return 1;
     }
   } else {
     if(!((*data)&mask)) return 0; // if bit is already reset, return no change
     else {
       (*data) = (*data) & (~mask);
-      switch_special_station(sid, 0);
+      switch_special_station(sid, 0); // handle special stations
       return 255;
     }
   }
   return 0;
 }
 
-// Clear all station bits
+/** Clear all station bits */
 void OpenSprinkler::clear_all_station_bits() {
-  /*byte bid;
-  for(bid=0;bid<=MAX_EXT_BOARDS;bid++) {
-    station_bits[bid] = 0;
-  }*/
   byte sid;
   for(sid=0;sid<=MAX_NUM_STATIONS;sid++) {
     set_station_bit(sid, 0);
   }
 }
 
+/** Transmit one RF signal bit */
 void transmit_rfbit(ulong lenH, ulong lenL) {
 #if defined(ARDUINO)
   PORT_RF |= (1<<PINX_RF);
@@ -841,6 +926,7 @@ void transmit_rfbit(ulong lenH, ulong lenL) {
 #endif
 }
 
+/** Transmit RF signal */
 void send_rfsignal(ulong code, ulong len) {
   ulong len3 = len * 3;
   ulong len31 = len * 31;
@@ -860,6 +946,11 @@ void send_rfsignal(ulong code, ulong len) {
   }
 }
 
+/** Switch RF station
+ * This function takes a RF code,
+ * parses it into signals and timing,
+ * and sends it out through RF transmitter.
+ */
 void OpenSprinkler::switch_rfstation(byte *code, bool turnon) {
   ulong on, off;
   uint16_t length = parse_rfstation_code(code, &on, &off);
@@ -871,10 +962,18 @@ void OpenSprinkler::switch_rfstation(byte *code, bool turnon) {
   send_rfsignal(turnon ? on : off, length);
 }
 
+/** Callback function for remote station calls */
 static void switchremote_callback(byte status, uint16_t off, uint16_t len) {
   /* do nothing */
 }
 
+/** Switch remote station
+ * This function takes a remote station code,
+ * parses it into remote IP, port, station index,
+ * and makes a HTTP GET request.
+ * The remote controller is assumed to have the same
+ * password as the main controller
+ */
 void OpenSprinkler::switch_remotestation(byte *code, bool turnon) {
 #if defined(ARDUINO)
   // construct string
@@ -943,16 +1042,16 @@ void OpenSprinkler::switch_remotestation(byte *code, bool turnon) {
 #endif
 }
 
-/** Options Functions */
+/** Setup function for options */
 void OpenSprinkler::options_setup() {
 
-  // add 0.5 second delay to allow nvm to stablize
-  delay(500);
+  // add 0.25 second delay to allow nvm to stablize
+  delay(250);
 
-  // check reset condition: either firmware version has changed, or reset flag is up
   byte curr_ver = nvm_read_byte((byte*)(ADDR_NVM_OPTIONS+OPTION_FW_VERSION));
 
-  //if (curr_ver<100) curr_ver = curr_ver*10; // adding a default 0 if version number is the old type
+  // check reset condition: either firmware version has changed, or reset flag is up
+  // if so, trigger a factory reset
   if (curr_ver != OS_FW_VERSION || nvm_read_byte((byte*)(ADDR_NVM_OPTIONS+OPTION_RESET))==0xAA)  {
 #if defined(ARDUINO)
     lcd_print_line_clear_pgm(PSTR("Resetting..."), 0);
@@ -989,7 +1088,6 @@ void OpenSprinkler::options_setup() {
       nvm_write_block(tmp_buffer, (void*)i, strlen(tmp_buffer)+1);
     }
 
-    DEBUG_PRINTLN("write special data");
     tmp_buffer[0]=STN_TYPE_STANDARD;
     tmp_buffer[1]='0';
     tmp_buffer[2]=0;
@@ -1037,7 +1135,7 @@ void OpenSprinkler::options_setup() {
   case BUTTON_1:
   	// if BUTTON_2 is pressed during startup, go to 'reset all options'
 		ui_set_options(OPTION_RESET);
-		if (options[OPTION_RESET].value) {
+    if (options[OPTION_RESET]) {
 			reboot_dev();
 		}
 		break;
@@ -1056,7 +1154,7 @@ void OpenSprinkler::options_setup() {
     } while (!(button & BUTTON_FLAG_DOWN));
     lcd.clear();
     ui_set_options(0);
-    if (options[OPTION_RESET].value) {
+    if (options[OPTION_RESET]) {
       reboot_dev();
     }
     break;
@@ -1071,7 +1169,7 @@ void OpenSprinkler::options_setup() {
     lcd_print_line_clear_pgm(PSTR(" OpenSprinkler"),0);
     lcd.setCursor(2, 1);
     lcd_print_pgm(PSTR("HW v"));
-    byte hwv = options[OPTION_HW_VERSION].value;
+    byte hwv = options[OPTION_HW_VERSION];
     lcd.print((char)('0'+(hwv/10)));
     lcd.print('.');
     lcd.print((char)('0'+(hwv%10)));
@@ -1090,72 +1188,74 @@ void OpenSprinkler::options_setup() {
 #endif
 }
 
-// Load non-volatile controller status data from internal nvm
+/** Load non-volatile controller status data from internal NVM */
 void OpenSprinkler::nvdata_load() {
   nvm_read_block(&nvdata, (void*)ADDR_NVM_NVCONDATA, sizeof(NVConData));
   old_status = status;
 }
 
-// Save non-volatile controller status data to internal nvm
+/** Save non-volatile controller status data to internal NVM */
 void OpenSprinkler::nvdata_save() {
   nvm_write_block(&nvdata, (void*)ADDR_NVM_NVCONDATA, sizeof(NVConData));
 }
 
-// Load options from internal nvm
+/** Load options from internal NVM */
 void OpenSprinkler::options_load() {
   nvm_read_block(tmp_buffer, (void*)ADDR_NVM_OPTIONS, NUM_OPTIONS);
   for (byte i=0; i<NUM_OPTIONS; i++) {
-    options[i].value = tmp_buffer[i];
+    options[i] = tmp_buffer[i];
   }
-  nboards = options[OPTION_EXT_BOARDS].value+1;
+  nboards = options[OPTION_EXT_BOARDS]+1;
   nstations = nboards * 8;
-  status.enabled = options[OPTION_DEVICE_ENABLE].value;
-  options[OPTION_FW_MINOR].value = OS_FW_MINOR;
+  status.enabled = options[OPTION_DEVICE_ENABLE];
+  options[OPTION_FW_MINOR] = OS_FW_MINOR;
 }
 
-// Save options to internal nvm
+/** Save options to internal NVM */
 void OpenSprinkler::options_save() {
   // save options in reverse order so version number is written the last
   for (int i=NUM_OPTIONS-1; i>=0; i--) {
-    tmp_buffer[i] = options[i].value;
+    tmp_buffer[i] = options[i];
   }
   nvm_write_block(tmp_buffer, (void*)ADDR_NVM_OPTIONS, NUM_OPTIONS);
-  nboards = options[OPTION_EXT_BOARDS].value+1;
+  nboards = options[OPTION_EXT_BOARDS]+1;
   nstations = nboards * 8;
-  status.enabled = options[OPTION_DEVICE_ENABLE].value;
+  status.enabled = options[OPTION_DEVICE_ENABLE];
 }
 
 // ==============================
 // Controller Operation Functions
 // ==============================
 
-// Enable controller operation
+/** Enable controller operation */
 void OpenSprinkler::enable() {
   status.enabled = 1;
-  options[OPTION_DEVICE_ENABLE].value = 1;
+  options[OPTION_DEVICE_ENABLE] = 1;
   options_save();
 }
 
-// Disable controller operation
+/** Disable controller operation */
 void OpenSprinkler::disable() {
   status.enabled = 0;
-  options[OPTION_DEVICE_ENABLE].value = 0;
+  options[OPTION_DEVICE_ENABLE] = 0;
   options_save();
 }
 
+/** Start rain delay */
 void OpenSprinkler::raindelay_start() {
   status.rain_delayed = 1;
   nvdata_save();
 }
 
+/** Stop rain delay */
 void OpenSprinkler::raindelay_stop() {
   status.rain_delayed = 0;
   nvdata.rd_stop_time = 0;
   nvdata_save();
 }
 
-#if defined(ARDUINO)    // AVR LCD and button functions
 /** LCD and button functions */
+#if defined(ARDUINO)    // AVR LCD and button functions
 /** print a program memory string */
 void OpenSprinkler::lcd_print_pgm(PGM_P PROGMEM str) {
   uint8_t c;
@@ -1239,9 +1339,9 @@ void OpenSprinkler::lcd_print_station(byte line, char c) {
 	  for (byte s=0; s<8; s++) {
 	    byte sid = (byte)status.display_board<<3;
 	    sid += (s+1);
-	    if (sid == options[OPTION_MASTER_STATION].value) {
+      if (sid == options[OPTION_MASTER_STATION]) {
 	      lcd.print((bitvalue&1) ? (char)c : 'M'); // print master station
-	    } else if (sid == options[OPTION_MASTER_STATION_2].value) {
+      } else if (sid == options[OPTION_MASTER_STATION_2]) {
 	      lcd.print((bitvalue&1) ? (char)c : 'N'); // print master2 station
 	    } else {
 	      lcd.print((bitvalue&1) ? (char)c : '_');
@@ -1251,14 +1351,14 @@ void OpenSprinkler::lcd_print_station(byte line, char c) {
 	}
 	lcd_print_pgm(PSTR("    "));
   lcd.setCursor(12, 1);
-  if(options[OPTION_REMOTE_EXT_MODE].value) {
+  if(options[OPTION_REMOTE_EXT_MODE]) {
     lcd.write(5);
   }
 	lcd.setCursor(13, 1);
-  if(status.rain_delayed || (status.rain_sensed && options[OPTION_SENSOR_TYPE].value==SENSOR_TYPE_RAIN))  {
+  if(status.rain_delayed || (status.rain_sensed && options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_RAIN))  {
     lcd.write(3);
   }
-  if(options[OPTION_SENSOR_TYPE].value==SENSOR_TYPE_FLOW) {
+  if(options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW) {
     lcd.write(6);
   }
   lcd.setCursor(14, 1);
@@ -1284,7 +1384,10 @@ void OpenSprinkler::lcd_print_version(byte v) {
 
 /** print an option value */
 void OpenSprinkler::lcd_print_option(int i) {
-  lcd_print_line_clear_pgm(options[i].str, 0);
+  // each prompt string takes 16 characters
+  strncpy_P0(tmp_buffer, op_prompts+16*i, 16);
+  lcd.setCursor(0, 0);
+  lcd.print(tmp_buffer);
   lcd_print_line_clear_pgm(PSTR(""), 1);
   lcd.setCursor(0, 1);
   int tz;
@@ -1292,10 +1395,10 @@ void OpenSprinkler::lcd_print_option(int i) {
   case OPTION_HW_VERSION:
     lcd.print("v");
   case OPTION_FW_VERSION:
-    lcd_print_version(options[i].value);
+    lcd_print_version(options[i]);
     break;
   case OPTION_TIMEZONE: // if this is the time zone option, do some conversion
-    tz = (int)options[i].value-48;
+    tz = (int)options[i]-48;
     if (tz>=0) lcd_print_pgm(PSTR("+"));
     else {lcd_print_pgm(PSTR("-")); tz=-tz;}
     lcd.print(tz/4); // print integer portion
@@ -1305,24 +1408,23 @@ void OpenSprinkler::lcd_print_option(int i) {
     else {
       lcd.print(tz);  // print fractional portion
     }
-    lcd_print_pgm(PSTR(" GMT"));
     break;
   case OPTION_MASTER_ON_ADJ:
   case OPTION_MASTER_ON_ADJ_2:
     lcd_print_pgm(PSTR("+"));
-    lcd.print((int)options[i].value);
+    lcd.print((int)options[i]);
     break;
   case OPTION_MASTER_OFF_ADJ:
   case OPTION_MASTER_OFF_ADJ_2:
-    if(options[i].value>=60)  lcd_print_pgm(PSTR("+"));
-    lcd.print((int)options[i].value-60);
+    if(options[i]>=60)  lcd_print_pgm(PSTR("+"));
+    lcd.print((int)options[i]-60);
     break;
   case OPTION_HTTPPORT_0:
-    lcd.print((unsigned int)(options[i+1].value<<8)+options[i].value);
+    lcd.print((unsigned int)(options[i+1]<<8)+options[i]);
     break;
   case OPTION_PULSE_RATE_0:
     {
-    uint16_t fpr = (unsigned int)(options[i+1].value<<8)+options[i].value;
+    uint16_t fpr = (unsigned int)(options[i+1]<<8)+options[i];
     lcd.print(fpr/100);
     lcd_print_pgm(PSTR("."));
     lcd.print((fpr/10)%10);
@@ -1330,22 +1432,22 @@ void OpenSprinkler::lcd_print_option(int i) {
     }
     break;
   case OPTION_STATION_DELAY_TIME:
-    lcd.print(water_time_decode_signed(options[i].value));
+    lcd.print(water_time_decode_signed(options[i]));
     break;
   case OPTION_LCD_CONTRAST:
     lcd_set_contrast();
-    lcd.print((int)options[i].value);
+    lcd.print((int)options[i]);
     break;
   case OPTION_LCD_BACKLIGHT:
     lcd_set_brightness();
-    lcd.print((int)options[i].value);
+    lcd.print((int)options[i]);
     break;
   case OPTION_BOOST_TIME:
     #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
     if(hw_type==HW_TYPE_AC) {
       lcd.print('-');
     } else {
-      lcd.print((int)options[i].value*4);
+      lcd.print((int)options[i]*4);
       lcd_print_pgm(PSTR(" ms"));
     }
     #else
@@ -1354,14 +1456,14 @@ void OpenSprinkler::lcd_print_option(int i) {
     break;
   default:
     // if this is a boolean option
-    if (options[i].max==1)
-      lcd_print_pgm(options[i].value ? PSTR("Yes") : PSTR("No"));
+    if (pgm_read_byte(op_max+i)==1)
+      lcd_print_pgm(options[i] ? PSTR("Yes") : PSTR("No"));
     else
-      lcd.print((int)options[i].value);
+      lcd.print((int)options[i]);
     break;
   }
   if (i==OPTION_WATER_PERCENTAGE)  lcd_print_pgm(PSTR("%"));
-  else if (i==OPTION_MASTER_ON_ADJ || i==OPTION_MASTER_OFF_ADJ || i==OPTION_MASTER_ON_ADJ_2 || i==OPTION_MASTER_OFF_ADJ_2 || i==OPTION_STATION_DELAY_TIME)
+  else if (i==OPTION_MASTER_ON_ADJ || i==OPTION_MASTER_OFF_ADJ || i==OPTION_MASTER_ON_ADJ_2 || i==OPTION_MASTER_OFF_ADJ_2)
     lcd_print_pgm(PSTR(" sec"));
 }
 
@@ -1431,22 +1533,22 @@ void OpenSprinkler::ui_set_options(int oid)
       if (i==OPTION_FW_VERSION || i==OPTION_HW_VERSION || i==OPTION_FW_MINOR ||
           i==OPTION_HTTPPORT_0 || i==OPTION_HTTPPORT_1 ||
           i==OPTION_PULSE_RATE_0 || i==OPTION_PULSE_RATE_1) break; // ignore non-editable options
-      if (options[i].max != options[i].value) options[i].value ++;
+      if (pgm_read_byte(op_max+i) != options[i]) options[i] ++;
       break;
 
     case BUTTON_2:
       if (i==OPTION_FW_VERSION || i==OPTION_HW_VERSION || i==OPTION_FW_MINOR ||
           i==OPTION_HTTPPORT_0 || i==OPTION_HTTPPORT_1 ||
           i==OPTION_PULSE_RATE_0 || i==OPTION_PULSE_RATE_1) break; // ignore non-editable options
-      if (options[i].value != 0) options[i].value --;
+      if (options[i] != 0) options[i] --;
       break;
 
     case BUTTON_3:
       if (!(button & BUTTON_FLAG_DOWN)) break;
       if (button & BUTTON_FLAG_HOLD) {
         // if OPTION_RESET is set to nonzero, change it to reset condition value
-        if (options[OPTION_RESET].value) {
-          options[OPTION_RESET].value = 0xAA;
+        if (options[OPTION_RESET]) {
+          options[OPTION_RESET] = 0xAA;
         }
         // long press, save options
         options_save();
@@ -1454,16 +1556,16 @@ void OpenSprinkler::ui_set_options(int oid)
       }
       else {
         // click, move to the next option
-        if (i==OPTION_USE_DHCP && options[i].value) i += 9; // if use DHCP, skip static ip set
+        if (i==OPTION_USE_DHCP && options[i]) i += 9; // if use DHCP, skip static ip set
         else if(i==OPTION_HTTPPORT_0) i+=2; // skip OPTION_HTTPPORT_1
         else if(i==OPTION_PULSE_RATE_0) i+=2; // skip OPTION_PULSE_RATE_1
-        else if(i==OPTION_SENSOR_TYPE && options[i].value!=SENSOR_TYPE_RAIN) i+=2; // if not using rain sensor, skip rain sensor type
-        else if(i==OPTION_MASTER_STATION && options[i].value==0) i+=3; // if not using master station, skip master on/off adjust
-        else if(i==OPTION_MASTER_STATION_2&& options[i].value==0) i+=3; // if not using master2, skip master2 on/off adjust
+        else if(i==OPTION_SENSOR_TYPE && options[i]!=SENSOR_TYPE_RAIN) i+=2; // if not using rain sensor, skip rain sensor type
+        else if(i==OPTION_MASTER_STATION && options[i]==0) i+=3; // if not using master station, skip master on/off adjust
+        else if(i==OPTION_MASTER_STATION_2&& options[i]==0) i+=3; // if not using master2, skip master2 on/off adjust
         else  {
           i = (i+1) % NUM_OPTIONS;
         }
-        if(options[i].json_str==0) i++;
+        if(i==OPTION_SEQUENTIAL_RETIRED) i++;
       }
       break;
     }
@@ -1475,14 +1577,16 @@ void OpenSprinkler::ui_set_options(int oid)
   lcd.noBlink();
 }
 
+/** Set LCD contrast (using PWM) */
 void OpenSprinkler::lcd_set_contrast() {
   // set contrast is only valid for standard LCD
   if (lcd.type()==LCD_STD) {
     pinMode(PIN_LCD_CONTRAST, OUTPUT);
-    analogWrite(PIN_LCD_CONTRAST, options[OPTION_LCD_CONTRAST].value);
+    analogWrite(PIN_LCD_CONTRAST, options[OPTION_LCD_CONTRAST]);
   }
 }
 
+/** Set LCD brightness (using PWM) */
 void OpenSprinkler::lcd_set_brightness(byte value) {
   #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
   if (lcd.type()==LCD_I2C) {
@@ -1493,9 +1597,9 @@ void OpenSprinkler::lcd_set_brightness(byte value) {
   if (lcd.type()==LCD_STD) {
     pinMode(PIN_LCD_BACKLIGHT, OUTPUT);
     if (value) {
-      analogWrite(PIN_LCD_BACKLIGHT, 255-options[OPTION_LCD_BACKLIGHT].value);
+      analogWrite(PIN_LCD_BACKLIGHT, 255-options[OPTION_LCD_BACKLIGHT]);
     } else {
-      analogWrite(PIN_LCD_BACKLIGHT, 255-options[OPTION_LCD_DIMMING].value);
+      analogWrite(PIN_LCD_BACKLIGHT, 255-options[OPTION_LCD_DIMMING]);
     }
   }
 }
diff --git a/OpenSprinkler.h b/OpenSprinkler.h
index 60a1da8b..72a179e9 100644
--- a/OpenSprinkler.h
+++ b/OpenSprinkler.h
@@ -43,14 +43,6 @@
 #include "defines.h"
 #include "utils.h"
 
-/** Option data structure */
-struct OptionStruct{
-  byte value;     // each option value is stored as a byte
-  byte max;       // maximum value of the option
-  const char* str;      // full name
-  const char* json_str; // json name
-};
-
 /** Non-volatile data */
 struct NVConData {
   uint16_t sunrise_time;  // sunrise time (in minutes)
@@ -112,7 +104,7 @@ class OpenSprinkler {
   static byte nboards, nstations;
   static byte hw_type;           // hardware type
 
-  static OptionStruct options[];  // option values, max, name, and flag
+  static byte options[];  // option values, max, name, and flag
 
   static byte station_bits[];     // station activation bits. each byte corresponds to a board (8 stations)
                                   // first byte-> master controller, second byte-> ext. board 1, and so on
diff --git a/defines.h b/defines.h
index 00a60e61..26819608 100644
--- a/defines.h
+++ b/defines.h
@@ -114,8 +114,8 @@
 
 #else // NVM defines for RPI/BBB/LINUX
 
-  // These are kept the same as AVR for compatibility
-  // But these can be increased if needed
+  // These are kept the same as AVR for compatibility reasons
+  // But they can be increased if needed
   #define NVM_FILENAME        "nvm.dat" // for RPI/BBB, nvm data is stored in a file
 
   #define MAX_EXT_BOARDS    6  // maximum number of exp. boards (each expands 8 stations)
@@ -273,7 +273,7 @@ typedef enum {
   #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
     #define ETHER_BUFFER_SIZE   1500 // ATmega1284 has 16K RAM, so use a bigger buffer
   #else
-    #define ETHER_BUFFER_SIZE   850  // ATmega644 has 4K RAM, so use a smaller buffer
+    #define ETHER_BUFFER_SIZE   960  // ATmega644 has 4K RAM, so use a smaller buffer
   #endif
 
   #define 	wdt_reset()   __asm__ __volatile__ ("wdr")  // watchdog timer reset
@@ -380,7 +380,7 @@ typedef enum {
 
 #endif  // end of Hardawre defines
 
-#define TMP_BUFFER_SIZE     120  // scratch buffer size
+#define TMP_BUFFER_SIZE     128  // scratch buffer size
 
 /** Other defines */
 // button values
diff --git a/main.cpp b/main.cpp
index d67710df..50d4125c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -45,10 +45,8 @@ EthernetServer *m_server = 0;
 EthernetClient *m_client = 0;
 #endif
 
-// Some perturbations have been added to the timing values below
-// to avoid two events happening too clost to each other
-// This is because Arduino is not good at handling multiple
-// web requests at the same time
+// Small variations have been added to the timing values below
+// to minimize conflicting events
 #define NTP_SYNC_INTERVAL       86403L  // NYP sync interval, 24 hrs
 #define RTC_SYNC_INTERVAL       60      // RTC sync interval, 60 secs
 #define CHECK_NETWORK_INTERVAL  601     // Network checking timeout, 10 minutes
@@ -58,14 +56,13 @@ EthernetClient *m_client = 0;
 #define PING_TIMEOUT            200     // Ping test timeout: 200 ms
 
 extern char tmp_buffer[];       // scratch buffer
-BufferFiller bfill;                       // buffer filler
+BufferFiller bfill;             // buffer filler
 
 // ====== Object defines ======
 OpenSprinkler os; // OpenSprinkler object
 ProgramData pd;   // ProgramdData object
 
 #if defined(ARDUINO)
-
 // ====== UI defines ======
 static char ui_anim_chars[3] = {'.', 'o', 'O'};
 
@@ -182,7 +179,7 @@ void ui_state_machine() {
 }
 
 volatile ulong flow_count = 0;
-// Flow sensor interrupt service routine
+/** Flow sensor interrupt service routine */
 void flow_isr() {
   ulong curr = millis();
   if(curr-os.flowcount_time_ms < 50) return;  // debounce threshold: 50ms
@@ -207,7 +204,6 @@ void do_setup() {
   setSyncInterval(RTC_SYNC_INTERVAL);  // RTC sync interval
   // if rtc exists, sets it as time sync source
   setSyncProvider(RTC.get);
-  delay(500);
   os.lcd_print_time(os.now_tz());  // display time to LCD
 
   // enable WDT
@@ -220,8 +216,8 @@ void do_setup() {
   /* Enable the WD interrupt (note no reset). */
   WDTCSR |= _BV(WDIE);
 
-  // set up flow sensor
-  if (os.options[OPTION_SENSOR_TYPE].value==SENSOR_TYPE_FLOW) {
+  // Set up flow sensor ISR
+  if (os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW) {
     attachInterrupt(PIN_FLOWSENSOR_INT, flow_isr, FALLING);
   }
   if (os.start_network()) {  // initialize network
@@ -231,7 +227,6 @@ void do_setup() {
   }
   os.status.req_network = 0;
   os.status.req_ntpsync = 1;
-  delay(500);
 
   os.apply_all_station_bits(); // reset station bits
 
@@ -242,7 +237,7 @@ void do_setup() {
 void(* sysReset) (void) = 0;
 
 volatile byte wdt_timeout = 0;
-// WDT interrupt service routine
+/** WDT interrupt service routine */
 ISR(WDT_vect)
 {
   wdt_timeout += 1;
@@ -291,8 +286,8 @@ void do_loop()
   byte bid, sid, s, pid, qid, bitvalue;
   ProgramStruct prog;
 
-  os.status.mas = os.options[OPTION_MASTER_STATION].value;
-  os.status.mas2= os.options[OPTION_MASTER_STATION_2].value;
+  os.status.mas = os.options[OPTION_MASTER_STATION];
+  os.status.mas2= os.options[OPTION_MASTER_STATION_2];
   time_t curr_time = os.now_tz();
   // ====== Process Ethernet packets ======
 #if defined(ARDUINO)  // Process Ethernet packets for Arduino
@@ -359,8 +354,9 @@ void do_loop()
       }
       os.old_status.rain_delayed = os.status.rain_delayed;
     }
+
     // ====== Check rain sensor status ======
-    if (os.options[OPTION_SENSOR_TYPE].value == SENSOR_TYPE_RAIN) {
+    if (os.options[OPTION_SENSOR_TYPE] == SENSOR_TYPE_RAIN) { // if a rain sensor is connected
       os.rainsensor_status();
       if (os.old_status.rain_sensed != os.status.rain_sensed) {
         if (os.status.rain_sensed) {
@@ -404,7 +400,7 @@ void do_loop()
               ulong water_time = water_time_resolve(water_time_decode(prog.durations[sid]));
               // if the program is set to use weather scaling
               if (prog.use_weather) {
-                byte wl = os.options[OPTION_WATER_PERCENTAGE].value;
+                byte wl = os.options[OPTION_WATER_PERCENTAGE];
                 water_time = water_time * wl / 100;
                 if (wl < 20 && water_time < 10) // if water_percentage is less than 20% and water_time is less than 10 seconds
                                                 // do not water
@@ -433,6 +429,8 @@ void do_loop()
       // calculate start and end time
       if (match_found) {
         schedule_all_stations(curr_time);
+
+        // For debugging: print out queued elements
         DEBUG_PRINT("en:");
         for(q=pd.queue;q<pd.queue+pd.nqueue;q++) {
           DEBUG_PRINT("[");
@@ -511,7 +509,7 @@ void do_loop()
       // check through runtime queue, calculate the last stop time of sequential stations
       pd.last_seq_stop_time = 0;
       ulong sst;
-      byte slave=os.options[OPTION_REMOTE_EXT_MODE].value;
+      byte re=os.options[OPTION_REMOTE_EXT_MODE];
       q = pd.queue;
       for(;q<pd.queue+pd.nqueue;q++) {
         sid = q->sid;
@@ -522,7 +520,7 @@ void do_loop()
         sst = q->st + q->dur;
         if (sst>curr_time) {
           // only need to update last_seq_stop_time for sequential stations
-          if (os.station_attrib_bits_read(ADDR_NVM_STNSEQ+bid)&(1<<s) && !slave) {
+          if (os.station_attrib_bits_read(ADDR_NVM_STNSEQ+bid)&(1<<s) && !re) {
             pd.last_seq_stop_time = (sst>pd.last_seq_stop_time ) ? sst : pd.last_seq_stop_time;
           }
         }
@@ -538,19 +536,21 @@ void do_loop()
         pd.reset_runtime();
         // reset program busy bit
         os.status.program_busy = 0;
-        // log flow sensor reading
-        write_log(LOGDATA_FLOWSENSE, curr_time);
+        // log flow sensor reading if flow sensor is used
+        if(os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW) {
+          write_log(LOGDATA_FLOWSENSE, curr_time);
+        }
 
         // in case some options have changed while executing the program
-        os.status.mas = os.options[OPTION_MASTER_STATION].value; // update master station
-        os.status.mas2= os.options[OPTION_MASTER_STATION_2].value; // update master2 station
+        os.status.mas = os.options[OPTION_MASTER_STATION]; // update master station
+        os.status.mas2= os.options[OPTION_MASTER_STATION_2]; // update master2 station
       }
     }//if_some_program_is_running
 
     // handle master
     if (os.status.mas>0) {
-      byte mas_on_adj = os.options[OPTION_MASTER_ON_ADJ].value;
-      byte mas_off_adj= os.options[OPTION_MASTER_OFF_ADJ].value;
+      byte mas_on_adj = os.options[OPTION_MASTER_ON_ADJ];
+      byte mas_off_adj= os.options[OPTION_MASTER_OFF_ADJ];
       byte masbit = 0;
       os.station_attrib_bits_load(ADDR_NVM_MAS_OP, (byte*)tmp_buffer);  // tmp_buffer now stores masop_bits
       for(sid=0;sid<os.nstations;sid++) {
@@ -573,8 +573,8 @@ void do_loop()
     }
     // handle master2
     if (os.status.mas2>0) {
-      byte mas_on_adj_2 = os.options[OPTION_MASTER_ON_ADJ_2].value;
-      byte mas_off_adj_2= os.options[OPTION_MASTER_OFF_ADJ_2].value;
+      byte mas_on_adj_2 = os.options[OPTION_MASTER_ON_ADJ_2];
+      byte mas_off_adj_2= os.options[OPTION_MASTER_OFF_ADJ_2];
       byte masbit2 = 0;
       os.station_attrib_bits_load(ADDR_NVM_MAS_OP_2, (byte*)tmp_buffer);  // tmp_buffer now stores masop2_bits
       for(sid=0;sid<os.nstations;sid++) {
@@ -628,31 +628,29 @@ void do_loop()
 #endif
 
     // perform ntp sync
-    if (curr_time % NTP_SYNC_INTERVAL == 0)
-      os.status.req_ntpsync = 1;
+    if (curr_time % NTP_SYNC_INTERVAL == 0) os.status.req_ntpsync = 1;
     perform_ntp_sync();
 
     // check network connection
-    if (curr_time % CHECK_NETWORK_INTERVAL==0)
-      os.status.req_network = 1;
+    if (curr_time % CHECK_NETWORK_INTERVAL==0)  os.status.req_network = 1;
     check_network();
 
     // check weather
     check_weather();
-
   }
 
   #if !defined(ARDUINO)
-    usleep(1000);
+    usleep(1000); // For OSPI/OSBO/LINUX, sleep 1 ms to minimize CPU usage
   #endif
 }
 
+/** Make weather query */
 void check_weather() {
   // do not check weather if
   // - network check has failed, or
   // - a program is currently running
-  // - the controller is in slave mode
-  if (os.status.network_fails>0 || os.status.program_busy || os.options[OPTION_REMOTE_EXT_MODE].value) return;
+  // - the controller is in remote extension mode
+  if (os.status.network_fails>0 || os.status.program_busy || os.options[OPTION_REMOTE_EXT_MODE]) return;
 
   ulong ntz = os.now_tz();
   if (os.checkwt_success_lasttime && (ntz > os.checkwt_success_lasttime + CHECK_WEATHER_SUCCESS_TIMEOUT)) {
@@ -669,6 +667,10 @@ void check_weather() {
   }
 }
 
+/** Turn off a station
+ * This function turns off a scheduled station
+ * and writes log record
+ */
 void turn_off_station(byte sid, ulong curr_time) {
   os.set_station_bit(sid, 0);
 
@@ -687,17 +689,10 @@ void turn_off_station(byte sid, ulong curr_time) {
       pd.lastrun.program = q->pid;
       pd.lastrun.duration = curr_time - q->st;
       pd.lastrun.endtime = curr_time;
+
+      // log station run
       write_log(LOGDATA_STATION, curr_time);
     }
-
-    // upon turning off station, process RF station
-    // if the station is a RF station
-    /*byte bid = sid>>3;
-    byte s = sid&0x07;
-    if(os.station_attrib_bits_read(ADDR_NVM_STNSPE+bid)&(1<<s)) {
-      // turn off station
-      //fix me os.send_rfstation_signal(sid, false);
-    }*/
   }
 
   // dequeue the element
@@ -705,10 +700,14 @@ void turn_off_station(byte sid, ulong curr_time) {
   pd.station_qid[sid] = 0xFF;
 }
 
+/** Process dynamic events
+ * such as rain delay, rain sensing
+ * and turn off stations accordingly
+ */
 void process_dynamic_events(ulong curr_time) {
   // check if rain is detected
   bool rain = false;
-  if (os.status.rain_delayed || (os.status.rain_sensed && os.options[OPTION_SENSOR_TYPE].value == SENSOR_TYPE_RAIN)) {
+  if (os.status.rain_delayed || (os.status.rain_sensed && os.options[OPTION_SENSOR_TYPE] == SENSOR_TYPE_RAIN)) {
     rain = true;
   }
 
@@ -725,7 +724,7 @@ void process_dynamic_events(ulong curr_time) {
       // If this is a normal program (not a run-once or test program)
       // and either the controller is disabled, or
       // if raining and ignore rain bit is cleared
-      // fix me
+      // FIX ME
       /*
       if ((pd.scheduled_program_index[sid]<99) &&
           (!en || (rain && !(rbits&(1<<s)))) ) {
@@ -744,19 +743,23 @@ void process_dynamic_events(ulong curr_time) {
   }
 }
 
+/** Scheduler
+ * This function loops through the queue
+ * and schedules the start time of each station
+ */
 void schedule_all_stations(ulong curr_time) {
-  DEBUG_PRINTLN(curr_time);
+
   ulong con_start_time = curr_time + 1;   // concurrent start time
   ulong seq_start_time = con_start_time;  // sequential start time
 
-  int16_t station_delay = water_time_decode_signed(os.options[OPTION_STATION_DELAY_TIME].value);
+  int16_t station_delay = water_time_decode_signed(os.options[OPTION_STATION_DELAY_TIME]);
   // if the sequential queue has stations running
   if (pd.last_seq_stop_time > curr_time) {
     seq_start_time = pd.last_seq_stop_time + station_delay;
   }
 
   RuntimeQueueStruct *q = pd.queue;
-  byte slave = os.options[OPTION_REMOTE_EXT_MODE].value;
+  byte re = os.options[OPTION_REMOTE_EXT_MODE];
   // go through runtime queue and calculate start time of each station
   for(;q<pd.queue+pd.nqueue;q++) {
     if(q->st) continue; // if this queue element has already been scheduled, skip
@@ -765,9 +768,9 @@ void schedule_all_stations(ulong curr_time) {
     byte bid=sid>>3;
     byte s=sid&0x07;
 
-    // if this is a sequential station and the controller is not in slave mode
+    // if this is a sequential station and the controller is not in remote extension mode
     // use sequential scheduling. station delay time apples
-    if (os.station_attrib_bits_read(ADDR_NVM_STNSEQ+bid)&(1<<s) && !slave) {
+    if (os.station_attrib_bits_read(ADDR_NVM_STNSEQ+bid)&(1<<s) && !re) {
       // sequential scheduling
       q->st = seq_start_time;
       seq_start_time += q->dur;
@@ -789,21 +792,29 @@ void schedule_all_stations(ulong curr_time) {
     if (!os.status.program_busy) {
       os.status.program_busy = 1;  // set program busy bit
       // start flow count
-      if(os.options[OPTION_SENSOR_TYPE].value == SENSOR_TYPE_FLOW) {
+      if(os.options[OPTION_SENSOR_TYPE] == SENSOR_TYPE_FLOW) {  // if flow sensor is connected
         os.flowcount_start = flow_count;
         os.sensor_lasttime = curr_time;
       }
-      DEBUG_PRINTLN("flow count started");
     }
   }
 }
 
+/** Immediately reset all stations
+ * No log records will be written
+ */
 void reset_all_stations_immediate() {
   os.clear_all_station_bits();
   os.apply_all_station_bits();
   pd.reset_runtime();
 }
 
+/** Reset all stations
+ * This function sets the duration of
+ * every station to 0, which causes
+ * all stations to turn off in the next processing cycle.
+ * Stations will be logged
+ */
 void reset_all_stations() {
   RuntimeQueueStruct *q = pd.queue;
   // go through runtime queue and assign water time to 0
@@ -813,10 +824,11 @@ void reset_all_stations() {
 }
 
 
-// Manually start a program
-// If pid==0, this is a test program (1 minute per station)
-// If pid==255, this is a short test program (2 second per station)
-// If pid > 0. run program pid-1
+/** Manually start a program
+ * If pid==0, this is a test program (1 minute per station)
+ * If pid==255, this is a short test program (2 second per station)
+ * If pid > 0. run program pid-1
+ */
 void manual_start_program(byte pid) {
   boolean match_found = false;
   reset_all_stations_immediate();
@@ -850,13 +862,15 @@ void manual_start_program(byte pid) {
 // ================================
 // ====== LOGGING FUNCTIONS =======
 // ================================
-// Log files will be named /logs/xxxxx.txt
 #if defined(ARDUINO)
 char LOG_PREFIX[] = "/logs/";
 #else
 char LOG_PREFIX[] = "./logs/";
 #endif
 
+/** Generate log file name
+ * Log files will be named /logs/xxxxx.txt
+ */
 void make_logfile_name(char *name) {
 #if defined(ARDUINO)
   sd.chdir("/");
@@ -879,9 +893,9 @@ static prog_char log_type_names[] PROGMEM =
     "wl\0"
     "fl\0";
 
-// write run record to log on SD card
+/** write run record to log on SD card */
 void write_log(byte type, ulong curr_time) {
-  if (!os.options[OPTION_ENABLE_LOGGING].value) return;
+  if (!os.options[OPTION_ENABLE_LOGGING]) return;
 
   // file name will be logs/xxxxx.tx where xxxxx is the day in epoch time
   ultoa(curr_time / 86400, tmp_buffer, 10);
@@ -948,7 +962,7 @@ void write_log(byte type, ulong curr_time) {
         lvalue = (curr_time>os.raindelay_start_time)?(curr_time-os.raindelay_start_time):0;
         break;
       case LOGDATA_WATERLEVEL:
-        lvalue = os.options[OPTION_WATER_PERCENTAGE].value;
+        lvalue = os.options[OPTION_WATER_PERCENTAGE];
         break;
     }
     ultoa(lvalue, tmp_buffer+strlen(tmp_buffer), 10);
@@ -967,10 +981,11 @@ void write_log(byte type, ulong curr_time) {
 }
 
 
-// delete log file
-// if name is 'all', delete all logs
+/** Delete log file
+ * If name is 'all', delete all logs
+ */
 void delete_log(char *name) {
-  if (!os.options[OPTION_ENABLE_LOGGING].value) return;
+  if (!os.options[OPTION_ENABLE_LOGGING]) return;
 #if defined(ARDUINO)
   if (!os.status.has_sd) return;
 
@@ -1000,6 +1015,11 @@ void delete_log(char *name) {
 #endif
 }
 
+/** Perform network check
+ * This function pings the router
+ * to check if it's still online.
+ * If not, it re-initializes Ethernet controller.
+ */
 void check_network() {
 #if defined(ARDUINO)
   // do not perform network checking if the controller has just started, or if a program is running
@@ -1049,10 +1069,11 @@ void check_network() {
 #endif
 }
 
+/** Perform NTP sync */
 void perform_ntp_sync() {
 #if defined(ARDUINO)
   // do not perform sync if this option is disabled, or if network is not available, or if a program is running
-  if (!os.options[OPTION_USE_NTP].value || os.status.network_fails>0 || os.status.program_busy) return;
+  if (!os.options[OPTION_USE_NTP] || os.status.network_fails>0 || os.status.program_busy) return;
 
   if (os.status.req_ntpsync) {
     os.status.req_ntpsync = 0;
diff --git a/program.cpp b/program.cpp
index 40d9dba4..b398d647 100644
--- a/program.cpp
+++ b/program.cpp
@@ -49,7 +49,10 @@ void ProgramData::reset_runtime() {
   last_seq_stop_time = 0;
 }
 
-// this returns a pointer to the next available element in the queue
+/** Insert a new element to the queue
+ * This function returns pointer to the next available element in the queue
+ * and returns NULL if the queue is full
+ */
 RuntimeQueueStruct* ProgramData::enqueue() {
   if (nqueue < RUNTIME_QUEUE_SIZE) {
     nqueue ++;
@@ -59,6 +62,11 @@ RuntimeQueueStruct* ProgramData::enqueue() {
   }
 }
 
+/** Remove an element from the queue
+ * This function copies the last element of
+ * the queue to overwrite the requested
+ * element, therefore removing the requested element.
+ */
 // this removes an element from the queue
 void ProgramData::dequeue(byte qid) {
   if (qid>=nqueue)  return;
@@ -83,23 +91,23 @@ void ProgramData::dequeue(byte qid) {
   DEBUG_PRINTLN("");
 }
 
-// load program count from NVM
+/** Load program count from NVM */
 void ProgramData::load_count() {
   nprograms = nvm_read_byte((byte *) ADDR_PROGRAMCOUNTER);
 }
 
-// save program count to NVM
+/** Save program count to NVM */
 void ProgramData::save_count() {
   nvm_write_byte((byte *) ADDR_PROGRAMCOUNTER, nprograms);
 }
 
-// erase all program data
+/** Erase all program data */
 void ProgramData::eraseall() {
   nprograms = 0;
   save_count();
 }
 
-// read a program
+/** Read a program from NVM*/
 void ProgramData::read(byte pid, ProgramStruct *buf) {
   if (pid >= nprograms) return;
   if (0) {
@@ -110,7 +118,7 @@ void ProgramData::read(byte pid, ProgramStruct *buf) {
   }
 }
 
-// add a program
+/** Add a program */
 byte ProgramData::add(ProgramStruct *buf) {
   if (0) {
     // todo: handle SD card
@@ -124,7 +132,7 @@ byte ProgramData::add(ProgramStruct *buf) {
   return 1;
 }
 
-// move a program up (i.e. swap a program with the one above it)
+/** Move a program up (i.e. swap a program with the one above it) */
 void ProgramData::moveup(byte pid) {
   if(pid >= nprograms || pid == 0) return;
 
@@ -151,7 +159,7 @@ void ProgramData::moveup(byte pid) {
   }
 }
 
-// modify a program
+/** Modify a program */
 byte ProgramData::modify(byte pid, ProgramStruct *buf) {
   if (pid >= nprograms)  return 0;
   if (0) {
@@ -163,7 +171,7 @@ byte ProgramData::modify(byte pid, ProgramStruct *buf) {
   return 1;
 }
 
-// delete program(s)
+/** Delete program(s) */
 byte ProgramData::del(byte pid) {
   if (pid >= nprograms)  return 0;
   if (nprograms == 0) return 0;
@@ -183,7 +191,7 @@ byte ProgramData::del(byte pid) {
   return 1;
 }
 
-// decode a sunrise/sunset start time to actual start time
+/** Decode a sunrise/sunset start time to actual start time */
 int16_t ProgramStruct::starttime_decode(int16_t t) {
   if((t>>15)&1) return -1;
   int16_t offset = t&0x7ff;
@@ -198,7 +206,7 @@ int16_t ProgramStruct::starttime_decode(int16_t t) {
   return t;
 }
 
-// Check if a given time matches the program's start day
+/** Check if a given time matches the program's start day */
 byte ProgramStruct::check_day_match(time_t t) {
 
 #if defined(ARDUINO) // get current time from Arduino
diff --git a/program.h b/program.h
index f16e5bdd..7a77bc8e 100644
--- a/program.h
+++ b/program.h
@@ -140,9 +140,9 @@ class RuntimeQueueStruct {
 class ProgramData {
 public:  
   static RuntimeQueueStruct queue[];
-  static byte nqueue;
-  static byte station_qid[];
-  static byte nprograms;     // number of programs
+  static byte nqueue;         // number of queue elements
+  static byte station_qid[];  // this array stores the queue element index for each scheduled station
+  static byte nprograms;      // number of programs
   static LogStruct lastrun;
   static ulong last_seq_stop_time;  // the last stop time of a sequential station
   
diff --git a/server.cpp b/server.cpp
index ecb4cc7f..c357cb87 100644
--- a/server.cpp
+++ b/server.cpp
@@ -48,6 +48,8 @@ extern BufferFiller bfill;
 extern char tmp_buffer[];
 extern OpenSprinkler os;
 extern ProgramData pd;
+extern char op_json_names[];
+extern char op_max[];
 
 void write_log(byte type, ulong curr_time);
 void schedule_all_stations(ulong curr_time);
@@ -190,6 +192,7 @@ void send_packet(bool final=false) {
   }
 }
 
+/* Check available space (number of bytes) in the Ethernet buffer */
 int available_ether_buffer() {
   return ETHER_BUFFER_SIZE - (int)bfill.position();
 }
@@ -306,7 +309,7 @@ int available_ether_buffer() {
 }
 #endif
 
-// convert a single hex digit character to its integer value
+/** Convert a single hex digit character to its integer value */
 unsigned char h2int(char c)
 {
     if (c >= '0' && c <='9'){
@@ -321,7 +324,7 @@ unsigned char h2int(char c)
     return(0);
 }
 
-// decode a url string e.g "hello%20joe" or "hello+joe" becomes "hello joe"
+/** Decode a url string e.g "hello%20joe" or "hello+joe" becomes "hello joe" */
 void urlDecode (char *urlbuf)
 {
     char c;
@@ -341,7 +344,7 @@ void urlDecode (char *urlbuf)
 /** Check and verify password */
 boolean check_password(char *p)
 {
-  if (os.options[OPTION_IGNORE_PASSWORD].value)  return true;
+  if (os.options[OPTION_IGNORE_PASSWORD])  return true;
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("pw"), true)) {
     urlDecode(tmp_buffer);
     if (os.password_verify(tmp_buffer))
@@ -392,14 +395,14 @@ void server_json_stations_main()
   delay(1);
 }
 
-/** Output Stations */
+/** Output stations data */
 byte server_json_stations(char *p) {
   print_json_header();
   server_json_stations_main();
   return HTML_OK;
 }
 
-/** Output Station Special Attribute */
+/** Output station special attribute */
 byte server_json_station_special(char *p) {
 #if defined(ARDUINO)
   // if no sd card, return false
@@ -705,7 +708,7 @@ void server_json_options_main() {
         oid==OPTION_GATEWAY_IP1 || oid==OPTION_GATEWAY_IP2 || oid==OPTION_GATEWAY_IP3 || oid==OPTION_GATEWAY_IP4)
         continue;
     #endif
-    int32_t v=os.options[oid].value;
+    int32_t v=os.options[oid];
     if (oid==OPTION_MASTER_OFF_ADJ || oid==OPTION_MASTER_OFF_ADJ_2) {v-=60;}
     if (oid==OPTION_STATION_DELAY_TIME) {v=water_time_decode_signed(v);}
     #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
@@ -717,10 +720,12 @@ void server_json_options_main() {
     if (oid==OPTION_BOOST_TIME) continue;
     #endif
 
-    if (os.options[oid].json_str==0) continue;
+    if (oid==OPTION_SEQUENTIAL_RETIRED) continue;
     if (oid==OPTION_DEVICE_ID && os.status.has_hwmac) continue; // do not send DEVICE ID if hardware MAC exists
-    bfill.emit_p(PSTR("\"$F\":$D"),
-                 os.options[oid].json_str, v);
+    // each json name takes 5 characters
+    strncpy_P0(tmp_buffer, op_json_names+oid*5, 5);
+    bfill.emit_p(PSTR("\"$S\":$D"),
+                 tmp_buffer, v);
     if(oid!=NUM_OPTIONS-1)
       bfill.emit_p(PSTR(","));
   }
@@ -805,8 +810,8 @@ void server_json_controller_main() {
               os.status.rain_delayed,
               os.status.rain_sensed,
               os.nvdata.rd_stop_time,
-              (os.options[OPTION_SENSOR_TYPE].value==SENSOR_TYPE_FLOW)?os.flowcount_time_ms:0,
-              (os.options[OPTION_SENSOR_TYPE].value==SENSOR_TYPE_FLOW)?flow_count:0,
+              (os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW)?os.flowcount_time_ms:0,
+              (os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW)?flow_count:0,
               ADDR_NVM_LOCATION,
               ADDR_NVM_WEATHER_KEY,
               os.nvdata.sunrise_time,
@@ -868,7 +873,7 @@ byte server_home()
 
   // send server variables and javascript packets
   bfill.emit_p(PSTR("var ver=$D,ipas=$D;</script>\n"),
-               OS_FW_VERSION, os.options[OPTION_IGNORE_PASSWORD].value);
+               OS_FW_VERSION, os.options[OPTION_IGNORE_PASSWORD]);
   bfill.emit_p(PSTR("<script src=\"$E/home.js\"></script>\n</body>\n</html>"), ADDR_NVM_JAVASCRIPTURL);
   return HTML_OK;
 }
@@ -923,11 +928,11 @@ byte server_change_values(char *p)
   }
 
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("re"), true)) {
-    if (tmp_buffer[0]=='1' && !os.options[OPTION_REMOTE_EXT_MODE].value) {
-      os.options[OPTION_REMOTE_EXT_MODE].value = 1;
+    if (tmp_buffer[0]=='1' && !os.options[OPTION_REMOTE_EXT_MODE]) {
+      os.options[OPTION_REMOTE_EXT_MODE] = 1;
       os.options_save();
-    } else if(tmp_buffer[0]=='0' && os.options[OPTION_REMOTE_EXT_MODE].value) {
-      os.options[OPTION_REMOTE_EXT_MODE].value = 0;
+    } else if(tmp_buffer[0]=='0' && os.options[OPTION_REMOTE_EXT_MODE]) {
+      os.options[OPTION_REMOTE_EXT_MODE] = 0;
       os.options_save();
     }
   }
@@ -996,6 +1001,7 @@ byte server_change_options(char *p)
   // process option values
   byte err = 0;
   byte prev_value;
+  byte max_value;
   for (byte oid=0; oid<NUM_OPTIONS; oid++) {
     //if ((os.options[oid].flag&OPFLAG_WEB_EDIT)==0) continue;
 
@@ -1005,13 +1011,14 @@ byte server_change_options(char *p)
         oid==OPTION_FW_MINOR || oid==OPTION_SEQUENTIAL_RETIRED ||
         oid==OPTION_REMOTE_EXT_MODE)
       continue;
-    prev_value = os.options[oid].value;
-    if (os.options[oid].max==1)  os.options[oid].value = 0;  // set a bool variable to 0 first
+    prev_value = os.options[oid];
+    max_value = pgm_read_byte(op_max+oid);
+    if (max_value==1)  os.options[oid] = 0;  // set a bool variable to 0 first
     char tbuf2[5] = {'o', 0, 0, 0, 0};
     itoa(oid, tbuf2+1, 10);
     if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, tbuf2)) {
-      if (os.options[oid].max==1) {
-        os.options[oid].value = 1;  // if the bool variable is detected, set to 1
+      if (max_value==1) {
+        os.options[oid] = 1;  // if the bool variable is detected, set to 1
       } else {
 		    int32_t v = atol(tmp_buffer);
 		    if (oid==OPTION_MASTER_OFF_ADJ || oid==OPTION_MASTER_OFF_ADJ_2) {v+=60;} // master off time
@@ -1023,14 +1030,14 @@ byte server_change_options(char *p)
            v>>=2;
         }
         #endif
-		    if (v>=0 && v<=os.options[oid].max) {
-		      os.options[oid].value = v;
+        if (v>=0 && v<=max_value) {
+          os.options[oid] = v;
 		    } else {
 		      err = 1;
 		    }
 		  }
     }
-    if (os.options[oid].value != prev_value) {	// if value has changed
+    if (os.options[oid] != max_value) {	// if value has changed
     	if (oid==OPTION_TIMEZONE || oid==OPTION_USE_NTP)    time_change = true;
     	if (oid>=OPTION_NTP_IP1 && oid<=OPTION_NTP_IP4)     time_change = true;
     	if (oid>=OPTION_USE_DHCP && oid<=OPTION_HTTPPORT_1) network_change = true;
@@ -1060,7 +1067,7 @@ byte server_change_options(char *p)
     nvm_write_block(tmp_buffer, (void*)ADDR_NVM_WEATHER_KEY, strlen(tmp_buffer)+1);
   }
   // if not using NTP and manually setting time
-  if (!os.options[OPTION_USE_NTP].value && findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("ttt"), true)) {
+  if (!os.options[OPTION_USE_NTP] && findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("ttt"), true)) {
     unsigned long t;
     t = atol(tmp_buffer);
     // before chaging time, reset all stations to avoid messing up with timing
@@ -1464,7 +1471,7 @@ void handle_web_request(char *p)
           if(check_password(dat)==false) {
             print_json_header();
             bfill.emit_p(PSTR("\"$F\":$D}"),
-                   os.options[0].json_str, os.options[0].value);
+                   op_json_names+0, os.options[0]);
             ret = HTML_OK;
           } else {
             ret = (urls[i])(dat);
@@ -1504,14 +1511,14 @@ void handle_web_request(char *p)
 
 
 #if defined(ARDUINO)
-// NTP sync
+/** NTP sync request */
 unsigned long getNtpTime()
 {
   byte ntpip[4] = {
-    os.options[OPTION_NTP_IP1].value,
-    os.options[OPTION_NTP_IP2].value,
-    os.options[OPTION_NTP_IP3].value,
-    os.options[OPTION_NTP_IP4].value};
+    os.options[OPTION_NTP_IP1],
+    os.options[OPTION_NTP_IP2],
+    os.options[OPTION_NTP_IP3],
+    os.options[OPTION_NTP_IP4]};
   uint32_t time;
   byte tick=0;
   unsigned long expire;
diff --git a/utils.cpp b/utils.cpp
index 4af61c96..2434b585 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -219,6 +219,16 @@ unsigned int detect_rpi_rev() {
 
 #endif
 
+// copy n-character string from program memory with ending 0
+void strncpy_P0(char* dest, const char* src, int n) {
+  byte i;
+  for(i=0;i<n;i++) {
+    *dest=pgm_read_byte(src++);
+    dest++;
+  }
+  *dest=0;
+}
+
 // compare a string to nvm
 byte strcmp_to_nvm(const char* src, int _addr) {
   byte c1, c2;
diff --git a/utils.h b/utils.h
index 7fd03345..407cf967 100644
--- a/utils.h
+++ b/utils.h
@@ -32,6 +32,7 @@
 #endif
 #include "defines.h"
 
+void strncpy_P0(char* dest, const char* src, int n);
 byte strcmp_to_nvm(const char* src, int addr);
 byte water_time_encode(uint16_t i);
 uint16_t water_time_decode(byte i);
diff --git a/weather.cpp b/weather.cpp
index 4eb020c4..ce98372a 100644
--- a/weather.cpp
+++ b/weather.cpp
@@ -80,9 +80,9 @@ static void getweather_callback(byte status, uint16_t off, uint16_t len) {
 
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("scale"), true)) {
     v = atoi(tmp_buffer);
-    if (v>=0 && v<=250 && v != os.options[OPTION_WATER_PERCENTAGE].value) {
+    if (v>=0 && v<=250 && v != os.options[OPTION_WATER_PERCENTAGE]) {
       // only save if the value has changed
-      os.options[OPTION_WATER_PERCENTAGE].value = v;
+      os.options[OPTION_WATER_PERCENTAGE] = v;
       os.options_save();
     }
   }
@@ -90,9 +90,9 @@ static void getweather_callback(byte status, uint16_t off, uint16_t len) {
   if (findKeyVal(p, tmp_buffer, TMP_BUFFER_SIZE, PSTR("tz"), true)) {
     v = atoi(tmp_buffer);
     if (v>=0 && v<= 96) {
-      if (v != os.options[OPTION_TIMEZONE].value) {
+      if (v != os.options[OPTION_TIMEZONE]) {
         // if timezone changed, save change and force ntp sync
-        os.options[OPTION_TIMEZONE].value = v;
+        os.options[OPTION_TIMEZONE] = v;
         os.options_save();
       }
     }
@@ -122,10 +122,10 @@ void GetWeather() {
   read_from_file(wtopts_filename, tmp, 30);
   BufferFiller bf = (uint8_t*)tmp_buffer;
   bf.emit_p(PSTR("$D.py?loc=$E&key=$E&fwv=$D&wto=$S"),
-                (int) os.options[OPTION_USE_WEATHER].value,
+                (int) os.options[OPTION_USE_WEATHER],
                 ADDR_NVM_LOCATION,
                 ADDR_NVM_WEATHER_KEY,
-                (int)os.options[OPTION_FW_VERSION].value,
+                (int)os.options[OPTION_FW_VERSION],
                 tmp);
   // copy string to tmp_buffer, replacing all spaces with _
   char *src=tmp_buffer+strlen(tmp_buffer);
@@ -210,10 +210,10 @@ void GetWeather() {
   char tmp[100];
   read_from_file(wtopts_filename, tmp, 100);
   bf.emit_p(PSTR("$D.py?loc=$E&key=$E&fwv=$D&wto=$S"),
-                (int) os.options[OPTION_USE_WEATHER].value,
+                (int) os.options[OPTION_USE_WEATHER],
                 ADDR_NVM_LOCATION,
                 ADDR_NVM_WEATHER_KEY,
-                (int)os.options[OPTION_FW_VERSION].value,
+                (int)os.options[OPTION_FW_VERSION],
                 tmp);    
 
   char *src=tmp_buffer+strlen(tmp_buffer);

From db7d04500785254c6ed8f6ab204a32f8732c4cda Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Thu, 20 Aug 2015 00:18:55 -0400
Subject: [PATCH 30/39] add flow count real-time (flcrt) and flow window
 real-time (flwrt) variables to /jc

---
 OpenSprinkler.cpp |  3 ++-
 OpenSprinkler.h   |  3 ++-
 defines.h         |  2 ++
 main.cpp          | 14 ++++++++++++--
 server.cpp        |  6 +++---
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 7a93923f..9487adef 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -38,7 +38,8 @@ byte OpenSprinkler::engage_booster;
 #endif
 
 ulong OpenSprinkler::sensor_lasttime;
-ulong OpenSprinkler::flowcount_start;
+ulong OpenSprinkler::flowcount_log_start;
+ulong OpenSprinkler::flowcount_rt;
 ulong OpenSprinkler::flowcount_time_ms;
 ulong OpenSprinkler::raindelay_start_time;
 byte OpenSprinkler::button_timeout;
diff --git a/OpenSprinkler.h b/OpenSprinkler.h
index 72a179e9..f443b5bf 100644
--- a/OpenSprinkler.h
+++ b/OpenSprinkler.h
@@ -112,7 +112,8 @@ class OpenSprinkler {
   // variables for time keeping
   static ulong sensor_lasttime;  // time when the last sensor reading is recorded
   static ulong flowcount_time_ms;// time stamp when new flow sensor click is received (in milliseconds)
-  static ulong flowcount_start;  // starting flow count
+  static ulong flowcount_rt;     // flow count (for computing real-time flow rate)
+  static ulong flowcount_log_start; // starting flow count (for logging)
   static ulong raindelay_start_time;  // time when the most recent rain delay started
   static byte  button_timeout;        // button timeout
   static ulong checkwt_lasttime;      // time when weather was checked
diff --git a/defines.h b/defines.h
index 26819608..b15e3bad 100644
--- a/defines.h
+++ b/defines.h
@@ -47,6 +47,8 @@
 #define STATION_ATTR_FILENAME "stns.dat"      // station attributes data file
 #define STATION_SPECIAL_DATA_SIZE  23
 
+#define FLOWCOUNT_RT_WINDOW  300      // flow count window (for computing real-time flow rate), 5 minutes
+
 /** Station type macro defines */
 #define STN_TYPE_STANDARD    0x00
 #define STN_TYPE_RF          0x01
diff --git a/main.cpp b/main.cpp
index 50d4125c..a4ffc98a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -627,6 +627,15 @@ void do_loop()
     }
 #endif
 
+    // real-time flow rate
+    static ulong flowcount_rt_start = 0;
+    if (os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW) {
+      if (curr_time % FLOWCOUNT_RT_WINDOW == 0) {
+        os.flowcount_rt = (flow_count > flowcount_rt_start) ? flow_count - flowcount_rt_start: 0;
+        flowcount_rt_start = flow_count;
+      }
+    }
+
     // perform ntp sync
     if (curr_time % NTP_SYNC_INTERVAL == 0) os.status.req_ntpsync = 1;
     perform_ntp_sync();
@@ -637,6 +646,7 @@ void do_loop()
 
     // check weather
     check_weather();
+
   }
 
   #if !defined(ARDUINO)
@@ -793,7 +803,7 @@ void schedule_all_stations(ulong curr_time) {
       os.status.program_busy = 1;  // set program busy bit
       // start flow count
       if(os.options[OPTION_SENSOR_TYPE] == SENSOR_TYPE_FLOW) {  // if flow sensor is connected
-        os.flowcount_start = flow_count;
+        os.flowcount_log_start = flow_count;
         os.sensor_lasttime = curr_time;
       }
     }
@@ -944,7 +954,7 @@ void write_log(byte type, ulong curr_time) {
   } else {
     ulong lvalue;
     if(type==LOGDATA_FLOWSENSE) {
-      lvalue = (flow_count>os.flowcount_start)?(flow_count-os.flowcount_start):0;
+      lvalue = (flow_count>os.flowcount_log_start)?(flow_count-os.flowcount_log_start):0;
     } else {
       lvalue = 0;
     }
diff --git a/server.cpp b/server.cpp
index c357cb87..c1e43841 100644
--- a/server.cpp
+++ b/server.cpp
@@ -801,7 +801,7 @@ void server_json_controller_main() {
   byte bid, sid;
   ulong curr_time = os.now_tz();
   //os.nvm_string_get(ADDR_NVM_LOCATION, tmp_buffer);
-  bfill.emit_p(PSTR("\"devt\":$L,\"nbrd\":$D,\"en\":$D,\"rd\":$D,\"rs\":$D,\"rdst\":$L,\"flt\":$L,\"flc\":$L,"
+  bfill.emit_p(PSTR("\"devt\":$L,\"nbrd\":$D,\"en\":$D,\"rd\":$D,\"rs\":$D,\"rdst\":$L,\"flcrt\":$L,\"flwrt\":$D,"
                     "\"loc\":\"$E\",\"wtkey\":\"$E\",\"sunrise\":$D,\"sunset\":$D,\"eip\":$L,\"lwc\":$L,\"lswc\":$L,"
                     "\"lrun\":[$D,$D,$D,$L],\"sbits\":["),
               curr_time,
@@ -810,8 +810,8 @@ void server_json_controller_main() {
               os.status.rain_delayed,
               os.status.rain_sensed,
               os.nvdata.rd_stop_time,
-              (os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW)?os.flowcount_time_ms:0,
-              (os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW)?flow_count:0,
+              (os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW)?os.flowcount_rt:0,
+              FLOWCOUNT_RT_WINDOW,
               ADDR_NVM_LOCATION,
               ADDR_NVM_WEATHER_KEY,
               os.nvdata.sunrise_time,

From b3b47a483ca5e3da90a8e4779fe837701ba5fa5c Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Sun, 23 Aug 2015 12:40:46 -0400
Subject: [PATCH 31/39] initial implementation of flow sensor for OSPi/OSBo

---
 OpenSprinkler.cpp |   4 +-
 defines.h         |   1 -
 gpio.cpp          | 194 ++++++++++++++++++++++++++++++++++++++++------
 gpio.h            |   2 +
 main.cpp          |  30 ++++---
 utils.cpp         |  76 +++++++++++++++++-
 utils.h           |   8 ++
 7 files changed, 276 insertions(+), 39 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 9487adef..249202a9 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -921,9 +921,9 @@ void transmit_rfbit(ulong lenH, ulong lenL) {
   delayMicroseconds(lenL);
 #else
   digitalWrite(PIN_RF_DATA, 1);
-  usleep(lenH);
+  delayMicrosecondsHard(lenH);
   digitalWrite(PIN_RF_DATA, 0);
-  usleep(lenL);
+  delayMicrosecondsHard(lenL);
 #endif
 }
 
diff --git a/defines.h b/defines.h
index b15e3bad..a95ba8e8 100644
--- a/defines.h
+++ b/defines.h
@@ -364,7 +364,6 @@ typedef enum {
   inline void itoa(int v,char *s,int b)   {sprintf(s,"%d",v);}
   inline void ultoa(unsigned long v,char *s,int b) {sprintf(s,"%lu",v);}
   #define now()       time(0)
-  #define delay(x)    {}
 
   /** Re-define avr-specific (e.g. PGM) types to use standard types */
   #define pgm_read_byte(x) *(x)
diff --git a/gpio.cpp b/gpio.cpp
index c3d5b727..9d6cb78b 100644
--- a/gpio.cpp
+++ b/gpio.cpp
@@ -29,38 +29,92 @@
 
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/ioctl.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
+#include <poll.h>
+#include <pthread.h>
+#include <fcntl.h>
+
+#define BUFFER_MAX 64
+#define GPIO_MAX   64
+
+// GPIO file descriptors
+static int sysFds[GPIO_MAX] = {
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+} ;
+
+// Interrupt service routine functions
+static void (*isrFunctions [GPIO_MAX])(void);
 
+static volatile int    pinPass = -1 ;
+static pthread_mutex_t pinMutex ;
+
+/** Export gpio pin */
 static byte GPIOExport(int pin) {
-#define BUFFER_MAX 3
   char buffer[BUFFER_MAX];
-  ssize_t bytes_written;
-  int fd;
+  int fd, len;
 
   fd = open("/sys/class/gpio/export", O_WRONLY);
-  if (-1 == fd) {
+  if (fd < 0) {
     DEBUG_PRINTLN("failed to open export for writing");
     return 0;
   }
 
-  bytes_written = snprintf(buffer, BUFFER_MAX, "%d", pin);
-  write(fd, buffer, bytes_written);
+  len = snprintf(buffer, sizeof(buffer), "%d", pin);
+  write(fd, buffer, len);
+  close(fd);
+  return 1;
+}
+
+/** Unexport gpio pin */
+static byte GPIOUnexport(int pin) {
+  char buffer[BUFFER_MAX];
+  int fd, len;
+
+  fd = open("/sys/class/gpio/unexport", O_WRONLY);
+  if (fd < 0) {
+    DEBUG_PRINTLN("failed to open unexport for writing");
+    return 0;
+  }
+
+  len = snprintf(buffer, sizeof(buffer), "%d", pin);
+  write(fd, buffer, len);
   close(fd);
   return 1;
+}
+
+/** Set interrupt edge mode */
+static byte GPIOSetEdge(int pin, const char *edge) {
+  char path[BUFFER_MAX];
+  int fd, len;
 
+  snprintf(path, BUFFER_MAX, "/sys/class/gpio/gpio%d/edge", pin);
+
+  fd = open(path, O_WRONLY);
+  if (fd < 0) {
+    DEBUG_PRINTLN("failed to open gpio edge for writing");
+    return 0;
+  }
+  write(fd, edge, strlen(edge)+1);
+  close(fd);
+  return 1;
 }
 
+/** Set pin mode, in or out */
 void pinMode(int pin, byte mode) {
-  static const char s_directions_str[]  = "in\0out";
+  static const char dir_str[]  = "in\0out";
 
-#define DIRECTION_MAX 35
-  char path[DIRECTION_MAX];
+  char path[BUFFER_MAX];
   int fd;
 
-  snprintf(path, DIRECTION_MAX, "/sys/class/gpio/gpio%d/direction", pin);
+  snprintf(path, BUFFER_MAX, "/sys/class/gpio/gpio%d/direction", pin);
 
   struct stat st;
   if(stat(path, &st)) {
@@ -68,12 +122,12 @@ void pinMode(int pin, byte mode) {
   }
 
   fd = open(path, O_WRONLY);
-  if (-1 == fd) {
+  if (fd < 0) {
     DEBUG_PRINTLN("failed to open gpio direction for writing");
     return;
   }
 
-  if (-1 == write(fd, &s_directions_str[INPUT == mode ? 0 : 3], INPUT == mode ? 2 : 3)) {
+  if (-1 == write(fd, &dir_str[INPUT==mode?0:3], INPUT==mode?2:3)) {
     DEBUG_PRINTLN("failed to set direction");
     return;
   }
@@ -82,42 +136,43 @@ void pinMode(int pin, byte mode) {
   return;
 }
 
+/** Read digital value */
 byte digitalRead(int pin) {
-#define VALUE_MAX 30
-  char path[VALUE_MAX];
+  char path[BUFFER_MAX];
   char value_str[3];
   int fd;
 
-  snprintf(path, VALUE_MAX, "/sys/class/gpio/gpio%d/value", pin);
+  snprintf(path, BUFFER_MAX, "/sys/class/gpio/gpio%d/value", pin);
   fd = open(path, O_RDONLY);
-  if (-1 == fd) {
+  if (fd < 0) {
     DEBUG_PRINTLN("failed to open gpio value for reading");
     return 0;
   }
 
-  if (-1 == read(fd, value_str, 3)) {
+  if (read(fd, value_str, 3) < 0) {
     DEBUG_PRINTLN("failed to read value");
     return 0;
   }
 
   close(fd);
-  return(atoi(value_str));
+  return atoi(value_str);
 }
 
+/** Write digital value */
 void digitalWrite(int pin, byte value) {
-  static const char s_values_str[] = "01";
+  static const char value_str[] = "01";
 
-  char path[VALUE_MAX];
+  char path[BUFFER_MAX];
   int fd;
 
-  snprintf(path, VALUE_MAX, "/sys/class/gpio/gpio%d/value", pin);
+  snprintf(path, BUFFER_MAX, "/sys/class/gpio/gpio%d/value", pin);
   fd = open(path, O_WRONLY);
-  if (-1 == fd) {
+  if (fd < 0) {
     DEBUG_PRINTLN("failed to open gpio value for writing");
     return;
   }
 
-  if (1 != write(fd, &s_values_str[LOW == value ? 0 : 1], 1)) {
+  if (1 != write(fd, &value_str[LOW==value?0:1], 1)) {
     DEBUG_PRINTLN("failed to write value");
     DEBUG_PRINTLN(pin);
     return;
@@ -126,10 +181,103 @@ void digitalWrite(int pin, byte value) {
   close(fd);
 }
 
+static int HiPri (const int pri) {
+  struct sched_param sched ;
+
+  memset (&sched, 0, sizeof(sched)) ;
+
+  if (pri > sched_get_priority_max (SCHED_RR))
+    sched.sched_priority = sched_get_priority_max (SCHED_RR) ;
+  else
+    sched.sched_priority = pri ;
+
+  return sched_setscheduler (0, SCHED_RR, &sched) ;
+}
+
+static int waitForInterrupt (int pin, int mS)
+{
+  int fd, x ;
+  uint8_t c ;
+  struct pollfd polls ;
+
+  if((fd=sysFds[pin]) < 0)
+    return -2;
+
+  polls.fd     = fd ;
+  polls.events = POLLPRI ;      // Urgent data!
+
+  x = poll (&polls, 1, mS) ;
+// Do a dummy read to clear the interrupt
+//      A one character read appars to be enough.
+//      Followed by a seek to reset it.
+
+  (void)read (fd, &c, 1);
+  lseek (fd, 0, SEEK_SET);
+
+  return x ;
+}
+
+static void *interruptHandler (void *arg) {
+  int myPin ;
+
+  (void) HiPri (55) ;  // Only effective if we run as root
+
+  myPin   = pinPass ;
+  pinPass = -1 ;
+
+  for (;;)
+    if (waitForInterrupt (myPin, -1) > 0)
+      isrFunctions[myPin]() ;
+
+  return NULL ;
+}
+
+/** Attach an interrupt function to pin */
+void attachInterrupt(int pin, const char* mode, void (*isr)(void)) {
+  if((pin<0)||(pin>GPIO_MAX)) {
+    DEBUG_PRINTLN("pin out of range");
+    return;
+  }
+
+  // set pin to INPUT mode and set interrupt edge mode
+  pinMode(pin, INPUT);
+  GPIOSetEdge(pin, mode);
+
+  char path[BUFFER_MAX];
+  snprintf(path, BUFFER_MAX, "/sys/class/gpio/gpio%d/value", pin);
+  int fd;
+
+  // open gpio file
+  if(sysFds[pin]==-1) {
+    if((sysFds[pin]=open(path, O_RDWR))<0) {
+      DEBUG_PRINTLN("failed to open gpio value for reading");
+      return;
+    }
+  }
+
+  int count, i;
+  char c;
+  // clear any pending interrupts
+  ioctl (sysFds[pin], FIONREAD, &count) ;
+  for (i=0; i<count; i++)
+    read (sysFds[pin], &c, 1) ;
+
+  // record isr function
+  isrFunctions[pin] = isr;
+
+  pthread_t threadId ;
+  pthread_mutex_lock (&pinMutex) ;
+    pinPass = pin ;
+    pthread_create (&threadId, NULL, interruptHandler, NULL) ;
+    while (pinPass != -1)
+      delay(1) ;
+  pthread_mutex_unlock (&pinMutex) ;
+}
 #else
 
 void pinMode(int pin, byte mode) {}
 void digitalWrite(int pin, byte value) {}
 byte digitalRead(int pin) {return 0;}
+void attachInterrupt(int pin, const char* mode, void (*isr)(void)) {}
 
 #endif
diff --git a/gpio.h b/gpio.h
index 83efa7b5..d6151c5e 100644
--- a/gpio.h
+++ b/gpio.h
@@ -35,5 +35,7 @@
 void pinMode(int pin, byte mode);
 void digitalWrite(int pin, byte value);
 byte digitalRead(int pin);
+// mode can be any of 'rising', 'falling', 'both'
+void attachInterrupt(int pin, const char* mode, void (*isr)(void));
 
 #endif
diff --git a/main.cpp b/main.cpp
index a4ffc98a..ef9b7ca1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -40,6 +40,7 @@ void manual_start_program(byte pid);
 #include <sys/stat.h>
 #include "etherport.h"
 #include "server.h"
+#include "gpio.h"
 char ether_buffer[ETHER_BUFFER_SIZE];
 EthernetServer *m_server = 0;
 EthernetClient *m_client = 0;
@@ -62,6 +63,15 @@ BufferFiller bfill;             // buffer filler
 OpenSprinkler os; // OpenSprinkler object
 ProgramData pd;   // ProgramdData object
 
+volatile ulong flow_count = 0;
+/** Flow sensor interrupt service routine */
+void flow_isr() {
+  ulong curr = millis();
+  if(curr-os.flowcount_time_ms < 50) return;  // debounce threshold: 50ms
+  flow_count++;
+  os.flowcount_time_ms = curr;
+}
+
 #if defined(ARDUINO)
 // ====== UI defines ======
 static char ui_anim_chars[3] = {'.', 'o', 'O'};
@@ -178,15 +188,6 @@ void ui_state_machine() {
   }
 }
 
-volatile ulong flow_count = 0;
-/** Flow sensor interrupt service routine */
-void flow_isr() {
-  ulong curr = millis();
-  if(curr-os.flowcount_time_ms < 50) return;  // debounce threshold: 50ms
-  flow_count++;
-  os.flowcount_time_ms = curr;
-}
-
 // ======================
 // Setup Function
 // ======================
@@ -249,13 +250,18 @@ ISR(WDT_vect)
 }
 
 #else
-volatile ulong flow_count = 0;
 
 void do_setup() {
+  initialiseEpoch();   // initialize time reference for millis() and micros()
   os.begin();          // OpenSprinkler init
   os.options_setup();  // Setup options
 
   pd.init();            // ProgramData init
+
+  if (os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW) {
+    attachInterrupt(PIN_FLOWSENSOR, "falling", flow_isr);
+  }
+
   if (os.start_network()) {  // initialize network
     DEBUG_PRINTLN("network established.");
     os.status.network_fails = 0;
@@ -627,7 +633,7 @@ void do_loop()
     }
 #endif
 
-    // real-time flow rate
+    // real-time flow count
     static ulong flowcount_rt_start = 0;
     if (os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW) {
       if (curr_time % FLOWCOUNT_RT_WINDOW == 0) {
@@ -650,7 +656,7 @@ void do_loop()
   }
 
   #if !defined(ARDUINO)
-    usleep(1000); // For OSPI/OSBO/LINUX, sleep 1 ms to minimize CPU usage
+    delay(1); // For OSPI/OSBO/LINUX, sleep 1 ms to minimize CPU usage
   #endif
 }
 
diff --git a/utils.cpp b/utils.cpp
index 2434b585..488796d0 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -80,7 +80,6 @@ void remove_file(const char *name) {
 }
 
 #else // RPI/BBB/LINUX
-
 void nvm_read_block(void *dst, const void *src, int len) {
   FILE *fp = fopen(NVM_FILENAME, "rb");
   if(fp) {
@@ -217,6 +216,81 @@ unsigned int detect_rpi_rev() {
 }
 #endif
 
+void delay(ulong howLong)
+{
+  struct timespec sleeper, dummy ;
+
+  sleeper.tv_sec  = (time_t)(howLong / 1000) ;
+  sleeper.tv_nsec = (long)(howLong % 1000) * 1000000 ;
+
+  nanosleep (&sleeper, &dummy) ;
+}
+
+void delayMicrosecondsHard (ulong howLong)
+{
+  struct timeval tNow, tLong, tEnd ;
+
+  gettimeofday (&tNow, NULL) ;
+  tLong.tv_sec  = howLong / 1000000 ;
+  tLong.tv_usec = howLong % 1000000 ;
+  timeradd (&tNow, &tLong, &tEnd) ;
+
+  while (timercmp (&tNow, &tEnd, <))
+    gettimeofday (&tNow, NULL) ;
+}
+
+void delayMicroseconds (ulong howLong)
+{
+  struct timespec sleeper ;
+  unsigned int uSecs = howLong % 1000000 ;
+  unsigned int wSecs = howLong / 1000000 ;
+
+  /**/ if (howLong ==   0)
+    return ;
+  else if (howLong  < 100)
+    delayMicrosecondsHard (howLong) ;
+  else
+  {
+    sleeper.tv_sec  = wSecs ;
+    sleeper.tv_nsec = (long)(uSecs * 1000L) ;
+    nanosleep (&sleeper, NULL) ;
+  }
+}
+
+static uint64_t epochMilli, epochMicro ;
+
+void initialiseEpoch()
+{
+  struct timeval tv ;
+
+  gettimeofday (&tv, NULL) ;
+  epochMilli = (uint64_t)tv.tv_sec * (uint64_t)1000    + (uint64_t)(tv.tv_usec / 1000) ;
+  epochMicro = (uint64_t)tv.tv_sec * (uint64_t)1000000 + (uint64_t)(tv.tv_usec) ;
+}
+
+ulong millis (void)
+{
+  struct timeval tv ;
+  uint64_t now ;
+
+  gettimeofday (&tv, NULL) ;
+  now  = (uint64_t)tv.tv_sec * (uint64_t)1000 + (uint64_t)(tv.tv_usec / 1000) ;
+
+  return (uint32_t)(now - epochMilli) ;
+}
+
+ulong micros (void)
+{
+  struct timeval tv ;
+  uint64_t now ;
+
+  gettimeofday (&tv, NULL) ;
+  now  = (uint64_t)tv.tv_sec * (uint64_t)1000000 + (uint64_t)tv.tv_usec ;
+
+  return (uint32_t)(now - epochMicro) ;
+}
+
+
 #endif
 
 // copy n-character string from program memory with ending 0
diff --git a/utils.h b/utils.h
index 407cf967..8ac8d1e5 100644
--- a/utils.h
+++ b/utils.h
@@ -29,6 +29,8 @@
 #else // headers for RPI/BBB
   #include <stdio.h>
   #include <limits.h>
+  #include <sys/time.h>
+
 #endif
 #include "defines.h"
 
@@ -53,6 +55,12 @@ void remove_file(const char *name);
   byte nvm_read_byte(const byte *p);
   void nvm_write_byte(const byte *p, byte v);
   char* get_runtime_path();
+  void delay(ulong ms);
+  void delayMicroseconds(ulong us);
+  void delayMicrosecondsHard(ulong us);
+  ulong millis();
+  ulong micros();
+  void initialiseEpoch();
 #if defined(OSPI)
   unsigned int detect_rpi_rev();
 #endif

From 79ba8c95ce513618c9bbd14283fc1abbba64e600 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Sun, 23 Aug 2015 12:54:23 -0400
Subject: [PATCH 32/39] add -lpthread to build script

---
 build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index 1599c69e..9b0b8466 100755
--- a/build.sh
+++ b/build.sh
@@ -11,11 +11,11 @@ done
 echo "Building OpenSprinkler..."
 
 if [ "$1" == "demo" ]; then
-	g++ -o OpenSprinkler -DDEMO -m32 main.cpp OpenSprinkler.cpp program.cpp server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp
+	g++ -o OpenSprinkler -DDEMO -m32 main.cpp OpenSprinkler.cpp program.cpp server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp -lpthread
 elif [ "$1" == "osbo" ]; then
-	g++ -o OpenSprinkler -DOSBO main.cpp OpenSprinkler.cpp program.cpp server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp
+	g++ -o OpenSprinkler -DOSBO main.cpp OpenSprinkler.cpp program.cpp server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp -lpthread
 else
-	g++ -o OpenSprinkler -DOSPI main.cpp OpenSprinkler.cpp program.cpp server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp
+	g++ -o OpenSprinkler -DOSPI main.cpp OpenSprinkler.cpp program.cpp server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp -lpthread
 fi
 
 if [ ! "$SILENT" = true ] && [ -f OpenSprinkler.launch ] && [ ! -f /etc/init.d/OpenSprinkler.sh ]; then

From b6a80322a943f7995b9d06c4332b411673be86d7 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Fri, 28 Aug 2015 02:18:34 -0400
Subject: [PATCH 33/39] fix a bug where the run-time keeping code was not
 checking if station_qid == 255; change /jc to output real-time flow sensor
 variables only when sensor type if flow sensor; change flow count window to
 30 seconds to make the real-time flow rate updates quicker

---
 defines.h  |  2 +-
 main.cpp   |  1 +
 server.cpp | 22 +++++++++++++---------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/defines.h b/defines.h
index a95ba8e8..4e7782fd 100644
--- a/defines.h
+++ b/defines.h
@@ -47,7 +47,7 @@
 #define STATION_ATTR_FILENAME "stns.dat"      // station attributes data file
 #define STATION_SPECIAL_DATA_SIZE  23
 
-#define FLOWCOUNT_RT_WINDOW  300      // flow count window (for computing real-time flow rate), 5 minutes
+#define FLOWCOUNT_RT_WINDOW   30    // flow count window (for computing real-time flow rate), 30 seconds
 
 /** Station type macro defines */
 #define STN_TYPE_STANDARD    0x00
diff --git a/main.cpp b/main.cpp
index ef9b7ca1..b3295796 100644
--- a/main.cpp
+++ b/main.cpp
@@ -476,6 +476,7 @@ void do_loop()
           // skip master station
           if (os.status.mas == sid+1) continue;
           if (os.status.mas2== sid+1) continue;
+          if (pd.station_qid[sid]==255) continue;
 
           q = pd.queue + pd.station_qid[sid];
           // check if this station is scheduled, either running or waiting to run
diff --git a/server.cpp b/server.cpp
index c1e43841..50322f7b 100644
--- a/server.cpp
+++ b/server.cpp
@@ -801,17 +801,15 @@ void server_json_controller_main() {
   byte bid, sid;
   ulong curr_time = os.now_tz();
   //os.nvm_string_get(ADDR_NVM_LOCATION, tmp_buffer);
-  bfill.emit_p(PSTR("\"devt\":$L,\"nbrd\":$D,\"en\":$D,\"rd\":$D,\"rs\":$D,\"rdst\":$L,\"flcrt\":$L,\"flwrt\":$D,"
+  bfill.emit_p(PSTR("\"devt\":$L,\"nbrd\":$D,\"en\":$D,\"rd\":$D,\"rs\":$D,\"rdst\":$L,"
                     "\"loc\":\"$E\",\"wtkey\":\"$E\",\"sunrise\":$D,\"sunset\":$D,\"eip\":$L,\"lwc\":$L,\"lswc\":$L,"
-                    "\"lrun\":[$D,$D,$D,$L],\"sbits\":["),
+                    "\"lrun\":[$D,$D,$D,$L],"),
               curr_time,
               os.nboards,
               os.status.enabled,
               os.status.rain_delayed,
               os.status.rain_sensed,
               os.nvdata.rd_stop_time,
-              (os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW)?os.flowcount_rt:0,
-              FLOWCOUNT_RT_WINDOW,
               ADDR_NVM_LOCATION,
               ADDR_NVM_WEATHER_KEY,
               os.nvdata.sunrise_time,
@@ -823,6 +821,17 @@ void server_json_controller_main() {
               pd.lastrun.program,
               pd.lastrun.duration,
               pd.lastrun.endtime);
+
+#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
+  if(os.status.has_curr_sense) {
+    bfill.emit_p(PSTR("\"curr\":$D,"), os.read_current());
+  }
+#endif
+  if(os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW) {
+    bfill.emit_p(PSTR("\"flcrt\":$L,\"flwrt\":$D,"), os.flowcount_rt, FLOWCOUNT_RT_WINDOW);
+  }
+
+  bfill.emit_p(PSTR("\"sbits\":["));
   // print sbits
   for(bid=0;bid<os.nboards;bid++)
     bfill.emit_p(PSTR("$D,"), os.station_bits[bid]);
@@ -849,11 +858,6 @@ void server_json_controller_main() {
   if(read_from_file(wtopts_filename, tmp_buffer)) {
     bfill.emit_p(PSTR(",\"wto\":{$S}"), tmp_buffer);
   }
-#if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
-  if(os.status.has_curr_sense) {
-    bfill.emit_p(PSTR(",\"curr\":$D"), os.read_current());
-  }
-#endif
   bfill.emit_p(PSTR("}"));
   delay(1);
 }

From 452a64d615492dd5e45a73da78db5df0eddaf1fc Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Sat, 29 Aug 2015 01:25:41 -0400
Subject: [PATCH 34/39] fix process_dynamic_events function; optimize
 detect_exp function; add initial code to calibrate RF timing for RPi/BBB

---
 OpenSprinkler.cpp | 47 +++++++++++++++++++++++++++++++------------
 OpenSprinkler.h   |  3 +++
 gpio.cpp          | 51 ++++++++++++++++++++++++++++-------------------
 gpio.h            |  5 +++++
 main.cpp          | 25 +++++++++--------------
 5 files changed, 81 insertions(+), 50 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 249202a9..f46056ad 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -730,27 +730,27 @@ int OpenSprinkler::detect_exp() {
 #if defined(ARDUINO)
   unsigned int v = analogRead(PIN_EXP_SENSE);
   // OpenSprinkler uses voltage divider to detect expansion boards
-  // Master controller has a 1.5K pull-up;
+  // Master controller has a 1.6K pull-up;
   // each expansion board (8 stations) has 10K pull-down connected in parallel;
   // so the exact ADC value for n expansion boards is:
-  //    ADC = 1024 * 10 / (10 + 1.5 * n)
+  //    ADC = 1024 * 10 / (10 + 1.6 * n)
   // For  0,   1,   2,   3,   4,   5,  6 expansion boards, the ADC values are:
-  //   1024, 890, 787, 706, 640, 585, 539
+  //   1024, 882, 775, 691, 624, 568, 522
   // Actual threshold is taken as the midpoint between, to account for errors
   int n = -1;
-  if (v > 957) { // 0
+  if (v > 953) { // 0
     n = 0;
-  } else if (v > 838) { // 1
+  } else if (v > 828) { // 1
     n = 1;
-  } else if (v > 746) { // 2
+  } else if (v > 733) { // 2
     n = 2;
-  } else if (v > 673) { // 3
+  } else if (v > 657) { // 3
     n = 3;
-  } else if (v > 612) { // 4
+  } else if (v > 596) { // 4
     n = 4;
-  } else if (v > 562) { // 5
+  } else if (v > 545) { // 5
     n = 5;
-  } else if (v > 520) { // 6
+  } else if (v > 502) { // 6
     n = 6;
   } else {  // cannot determine
   }
@@ -912,6 +912,21 @@ void OpenSprinkler::clear_all_station_bits() {
   }
 }
 
+#if !defined(ARDUINO)
+int rf_gpio_fd = -1;
+void OpenSprinkler::calibrate_rf_timing() {
+  char code0[] = "0000000000000000";  // signal with 0 timing
+  char code1[] = "0000000000000100";  // signal with 0x100 timing
+  ulong start = micros();
+  switch_rfstation((byte*)code0, 0);
+  DEBUG_PRINTLN(micros()-start);
+  start = micros();
+  switch_rfstation((byte*)code1, 0);
+  DEBUG_PRINTLN(micros()-start);
+}
+
+#endif
+
 /** Transmit one RF signal bit */
 void transmit_rfbit(ulong lenH, ulong lenL) {
 #if defined(ARDUINO)
@@ -920,9 +935,9 @@ void transmit_rfbit(ulong lenH, ulong lenL) {
   PORT_RF &=~(1<<PINX_RF);
   delayMicroseconds(lenL);
 #else
-  digitalWrite(PIN_RF_DATA, 1);
+  gpio_write(rf_gpio_fd, 1);
   delayMicrosecondsHard(lenH);
-  digitalWrite(PIN_RF_DATA, 0);
+  gpio_write(rf_gpio_fd, 0);
   delayMicrosecondsHard(lenL);
 #endif
 }
@@ -957,10 +972,16 @@ void OpenSprinkler::switch_rfstation(byte *code, bool turnon) {
   uint16_t length = parse_rfstation_code(code, &on, &off);
 #if defined(ARDUINO)
   length = length - (length>>5);   // due to internal call delay, scale time down to 97%
+  send_rfsignal(turnon ? on : off, length);
 #else
   length = (length>>2)+(length>>3);   // on RPi and BBB, there is even more overhead, scale to 37.5%
-#endif
+  // pre-open gpio file to minimize overhead
+  int rf_gpio_fd = gpio_fd_open(PIN_RF_DATA);
   send_rfsignal(turnon ? on : off, length);
+  gpio_fd_close(rf_gpio_fd);
+  rf_gpio_fd = -1;
+#endif
+
 }
 
 /** Callback function for remote station calls */
diff --git a/OpenSprinkler.h b/OpenSprinkler.h
index f443b5bf..603c2556 100644
--- a/OpenSprinkler.h
+++ b/OpenSprinkler.h
@@ -131,6 +131,9 @@ class OpenSprinkler {
   // -- station names and attributes
   static void get_station_name(byte sid, char buf[]); // get station name
   static void set_station_name(byte sid, char buf[]); // set station name
+#if !defined(ARDUINO)
+  static void calibrate_rf_timing(); // for RPi/BBB, we calibrate the RF timing to account for pin switching overhead
+#endif
   static uint16_t parse_rfstation_code(byte *code, ulong *on, ulong *off); // parse rf code into on/off/time sections
   static void switch_rfstation(byte *code, bool turnon);  // switch rf station
   static void switch_remotestation(byte *code, bool turnon); // switch remote station
diff --git a/gpio.cpp b/gpio.cpp
index 9d6cb78b..3bcc63b5 100644
--- a/gpio.cpp
+++ b/gpio.cpp
@@ -27,7 +27,6 @@
 
 #elif defined(OSPI) || defined(OSBO)
 
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
@@ -37,7 +36,6 @@
 #include <string.h>
 #include <poll.h>
 #include <pthread.h>
-#include <fcntl.h>
 
 #define BUFFER_MAX 64
 #define GPIO_MAX   64
@@ -136,16 +134,31 @@ void pinMode(int pin, byte mode) {
   return;
 }
 
-/** Read digital value */
-byte digitalRead(int pin) {
+/** Open file for digital pin */
+int gpio_fd_open(int pin, int mode) {
   char path[BUFFER_MAX];
-  char value_str[3];
   int fd;
 
   snprintf(path, BUFFER_MAX, "/sys/class/gpio/gpio%d/value", pin);
-  fd = open(path, O_RDONLY);
+  fd = open(path, mode);
+  if (fd < 0) {
+    DEBUG_PRINTLN("failed to open gpio");
+    return -1;
+  }
+  return fd;
+}
+
+/** Close file */
+void gpio_fd_close(int fd) {
+  close(fd);
+}
+
+/** Read digital value */
+byte digitalRead(int pin) {
+  char value_str[3];
+
+  int fd = gpio_fd_open(pin, O_RDONLY);
   if (fd < 0) {
-    DEBUG_PRINTLN("failed to open gpio value for reading");
     return 0;
   }
 
@@ -158,26 +171,22 @@ byte digitalRead(int pin) {
   return atoi(value_str);
 }
 
-/** Write digital value */
-void digitalWrite(int pin, byte value) {
+/** Write digital value given file descriptor */
+void gpio_write(int fd, byte value) {
   static const char value_str[] = "01";
 
-  char path[BUFFER_MAX];
-  int fd;
-
-  snprintf(path, BUFFER_MAX, "/sys/class/gpio/gpio%d/value", pin);
-  fd = open(path, O_WRONLY);
-  if (fd < 0) {
-    DEBUG_PRINTLN("failed to open gpio value for writing");
-    return;
+  if (1 != write(fd, &value_str[LOW==value?0:1], 1)) {
+    DEBUG_PRINT("failed to write value on pin ");
   }
+}
 
-  if (1 != write(fd, &value_str[LOW==value?0:1], 1)) {
-    DEBUG_PRINTLN("failed to write value");
-    DEBUG_PRINTLN(pin);
+/** Write digital value */
+void digitalWrite(int pin, byte value) {
+  int fd = gpio_fd_open(pin);
+  if (fd < 0) {
     return;
   }
-
+  gpio_write(fd, value);
   close(fd);
 }
 
diff --git a/gpio.h b/gpio.h
index d6151c5e..db411fe3 100644
--- a/gpio.h
+++ b/gpio.h
@@ -27,6 +27,8 @@
 
 #else
 
+#include <sys/stat.h>
+#include <fcntl.h>
 #define OUTPUT 0
 #define INPUT  1
 #define HIGH   1
@@ -34,6 +36,9 @@
 
 void pinMode(int pin, byte mode);
 void digitalWrite(int pin, byte value);
+int gpio_fd_open(int pin, int mode = O_WRONLY);
+void gpio_fd_close(int fd);
+void gpio_write(int fd, byte value);
 byte digitalRead(int pin);
 // mode can be any of 'rising', 'falling', 'both'
 void attachInterrupt(int pin, const char* mode, void (*isr)(void));
diff --git a/main.cpp b/main.cpp
index b3295796..7f8053ea 100644
--- a/main.cpp
+++ b/main.cpp
@@ -724,14 +724,14 @@ void turn_off_station(byte sid, ulong curr_time) {
 void process_dynamic_events(ulong curr_time) {
   // check if rain is detected
   bool rain = false;
+  bool en = os.status.enabled ? true : false;
   if (os.status.rain_delayed || (os.status.rain_sensed && os.options[OPTION_SENSOR_TYPE] == SENSOR_TYPE_RAIN)) {
     rain = true;
   }
 
-  byte sid, s, bid, rbits, sbits;
+  byte sid, s, bid, qid, rbits;
   for(bid=0;bid<os.nboards;bid++) {
     rbits = os.station_attrib_bits_read(ADDR_NVM_IGNRAIN+bid);
-    sbits = os.station_bits[bid];
     for(s=0;s<8;s++) {
       sid=bid*8+s;
 
@@ -742,20 +742,13 @@ void process_dynamic_events(ulong curr_time) {
       // and either the controller is disabled, or
       // if raining and ignore rain bit is cleared
       // FIX ME
-      /*
-      if ((pd.scheduled_program_index[sid]<99) &&
-          (!en || (rain && !(rbits&(1<<s)))) ) {
-        if (sbits&(1<<s)) { // if station is currently running
-          turn_off_station(sid, curr_time);
-
-        } else if (pd.scheduled_program_index[sid] > 0) { // if station is currently not running but is waiting to run
-
-          // reset program data variables
-          pd.scheduled_start_time[sid] = 0;
-          pd.scheduled_stop_time[sid] = 0;
-          pd.scheduled_program_index[sid] = 0;
-        }
-      }*/
+      qid = pd.station_qid[sid];
+      if(qid==255) continue;
+      RuntimeQueueStruct *q = pd.queue + qid;
+
+      if ((q->pid<99) && (!en || (rain && !(rbits&(1<<s)))) ) {
+        turn_off_station(sid, curr_time);
+      }
     }
   }
 }

From 5318f92c9e41b98adc04181eda2f0874c1732fb1 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Sat, 29 Aug 2015 01:56:46 -0400
Subject: [PATCH 35/39] turns out no need for calibration: with pre-opening
 gpio file descriptor, the signal timing is quite good already

---
 OpenSprinkler.cpp | 15 ++-------------
 OpenSprinkler.h   |  3 ---
 utils.cpp         |  1 -
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index f46056ad..e7d53737 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -914,17 +914,6 @@ void OpenSprinkler::clear_all_station_bits() {
 
 #if !defined(ARDUINO)
 int rf_gpio_fd = -1;
-void OpenSprinkler::calibrate_rf_timing() {
-  char code0[] = "0000000000000000";  // signal with 0 timing
-  char code1[] = "0000000000000100";  // signal with 0x100 timing
-  ulong start = micros();
-  switch_rfstation((byte*)code0, 0);
-  DEBUG_PRINTLN(micros()-start);
-  start = micros();
-  switch_rfstation((byte*)code1, 0);
-  DEBUG_PRINTLN(micros()-start);
-}
-
 #endif
 
 /** Transmit one RF signal bit */
@@ -974,9 +963,9 @@ void OpenSprinkler::switch_rfstation(byte *code, bool turnon) {
   length = length - (length>>5);   // due to internal call delay, scale time down to 97%
   send_rfsignal(turnon ? on : off, length);
 #else
-  length = (length>>2)+(length>>3);   // on RPi and BBB, there is even more overhead, scale to 37.5%
+  //length = (length>>2)+(length>>3);   // on RPi and BBB, there is even more overhead, scale to 37.5%
   // pre-open gpio file to minimize overhead
-  int rf_gpio_fd = gpio_fd_open(PIN_RF_DATA);
+  rf_gpio_fd = gpio_fd_open(PIN_RF_DATA);
   send_rfsignal(turnon ? on : off, length);
   gpio_fd_close(rf_gpio_fd);
   rf_gpio_fd = -1;
diff --git a/OpenSprinkler.h b/OpenSprinkler.h
index 603c2556..f443b5bf 100644
--- a/OpenSprinkler.h
+++ b/OpenSprinkler.h
@@ -131,9 +131,6 @@ class OpenSprinkler {
   // -- station names and attributes
   static void get_station_name(byte sid, char buf[]); // get station name
   static void set_station_name(byte sid, char buf[]); // set station name
-#if !defined(ARDUINO)
-  static void calibrate_rf_timing(); // for RPi/BBB, we calibrate the RF timing to account for pin switching overhead
-#endif
   static uint16_t parse_rfstation_code(byte *code, ulong *on, ulong *off); // parse rf code into on/off/time sections
   static void switch_rfstation(byte *code, bool turnon);  // switch rf station
   static void switch_remotestation(byte *code, bool turnon); // switch remote station
diff --git a/utils.cpp b/utils.cpp
index 488796d0..8bc49d9b 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -74,7 +74,6 @@ void remove_file(const char *name) {
   char *fn = tmp_buffer+TMP_BUFFER_SIZE-12;
   strcpy_P(fn, name);
   sd.chdir("/");
-  DEBUG_PRINTLN(fn);
   if (!sd.exists(fn))  return;
   sd.remove(fn);
 }

From d1a4842b54ef7f2369d945e7d42f51d887e64762 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Tue, 1 Sep 2015 02:24:01 -0400
Subject: [PATCH 36/39] fix negative log duration time issue; better sensor
 initialization to allow changing sensor type on the fly; fix issue with /ja
 stalling on a large number of stations (missing delay(1) in
 json_programs_main()), add missing gpio defines for demo

---
 OpenSprinkler.cpp |  8 ++++++--
 gpio.cpp          |  3 +++
 main.cpp          | 12 +++---------
 server.cpp        |  7 +++++--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index e7d53737..1ea3fa97 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -458,6 +458,7 @@ void OpenSprinkler::lcd_start() {
 }
 #endif
 
+extern void flow_isr();
 /** Initialize pins, controller variables, LCD */
 void OpenSprinkler::begin() {
 
@@ -492,12 +493,17 @@ void OpenSprinkler::begin() {
   // Rain sensor port set up
   pinMode(PIN_RAINSENSOR, INPUT);
 
+  // Set up sensors
 #if defined(ARDUINO)
   digitalWrite(PIN_RAINSENSOR, HIGH); // enabled internal pullup on rain sensor
+  attachInterrupt(PIN_FLOWSENSOR_INT, flow_isr, FALLING);
 #else
   // OSPI and OSBO use external pullups
+  attachInterrupt(PIN_FLOWSENSOR, "falling", flow_isr);
 #endif
 
+
+
   // Default controller status variables
   // Static variables are assigned 0 by default
   // so only need to initialize non-zero ones
@@ -960,10 +966,8 @@ void OpenSprinkler::switch_rfstation(byte *code, bool turnon) {
   ulong on, off;
   uint16_t length = parse_rfstation_code(code, &on, &off);
 #if defined(ARDUINO)
-  length = length - (length>>5);   // due to internal call delay, scale time down to 97%
   send_rfsignal(turnon ? on : off, length);
 #else
-  //length = (length>>2)+(length>>3);   // on RPi and BBB, there is even more overhead, scale to 37.5%
   // pre-open gpio file to minimize overhead
   rf_gpio_fd = gpio_fd_open(PIN_RF_DATA);
   send_rfsignal(turnon ? on : off, length);
diff --git a/gpio.cpp b/gpio.cpp
index 3bcc63b5..bcab4824 100644
--- a/gpio.cpp
+++ b/gpio.cpp
@@ -288,5 +288,8 @@ void pinMode(int pin, byte mode) {}
 void digitalWrite(int pin, byte value) {}
 byte digitalRead(int pin) {return 0;}
 void attachInterrupt(int pin, const char* mode, void (*isr)(void)) {}
+int gpio_fd_open(int pin, int mode) {return 0;}
+void gpio_fd_close(int fd) {}
+void gpio_write(int fd, byte value) {}
 
 #endif
diff --git a/main.cpp b/main.cpp
index 7f8053ea..ad4047a1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -66,6 +66,7 @@ ProgramData pd;   // ProgramdData object
 volatile ulong flow_count = 0;
 /** Flow sensor interrupt service routine */
 void flow_isr() {
+  if(os.options[OPTION_SENSOR_TYPE]!=SENSOR_TYPE_FLOW) return;
   ulong curr = millis();
   if(curr-os.flowcount_time_ms < 50) return;  // debounce threshold: 50ms
   flow_count++;
@@ -217,10 +218,6 @@ void do_setup() {
   /* Enable the WD interrupt (note no reset). */
   WDTCSR |= _BV(WDIE);
 
-  // Set up flow sensor ISR
-  if (os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW) {
-    attachInterrupt(PIN_FLOWSENSOR_INT, flow_isr, FALLING);
-  }
   if (os.start_network()) {  // initialize network
     os.status.network_fails = 0;
   } else {
@@ -258,10 +255,6 @@ void do_setup() {
 
   pd.init();            // ProgramData init
 
-  if (os.options[OPTION_SENSOR_TYPE]==SENSOR_TYPE_FLOW) {
-    attachInterrupt(PIN_FLOWSENSOR, "falling", flow_isr);
-  }
-
   if (os.start_network()) {  // initialize network
     DEBUG_PRINTLN("network established.");
     os.status.network_fails = 0;
@@ -950,7 +943,8 @@ void write_log(byte type, ulong curr_time) {
     strcat_P(tmp_buffer, PSTR(","));
     itoa(pd.lastrun.station, tmp_buffer+strlen(tmp_buffer), 10);
     strcat_P(tmp_buffer, PSTR(","));
-    itoa(pd.lastrun.duration, tmp_buffer+strlen(tmp_buffer), 10);
+    // duration is unsigned integer
+    ultoa((ulong)pd.lastrun.duration, tmp_buffer+strlen(tmp_buffer), 10);
   } else {
     ulong lvalue;
     if(type==LOGDATA_FLOWSENSE) {
diff --git a/server.cpp b/server.cpp
index 50322f7b..0604a01e 100644
--- a/server.cpp
+++ b/server.cpp
@@ -780,6 +780,7 @@ void server_json_programs_main() {
     }
   }
   bfill.emit_p(PSTR("]}"));
+  delay(1);
 }
 
 /** Output program data */
@@ -1041,12 +1042,12 @@ byte server_change_options(char *p)
 		    }
 		  }
     }
-    if (os.options[oid] != max_value) {	// if value has changed
+    if (os.options[oid] != prev_value) {	// if value has changed
     	if (oid==OPTION_TIMEZONE || oid==OPTION_USE_NTP)    time_change = true;
     	if (oid>=OPTION_NTP_IP1 && oid<=OPTION_NTP_IP4)     time_change = true;
     	if (oid>=OPTION_USE_DHCP && oid<=OPTION_HTTPPORT_1) network_change = true;
     	if (oid==OPTION_DEVICE_ID)  network_change = true;
-    	if (oid==OPTION_USE_WEATHER)       weather_change = true;
+      if (oid==OPTION_USE_WEATHER) weather_change = true;
     }
   }
 
@@ -1106,6 +1107,7 @@ byte server_change_options(char *p)
     // network related options have changed
     // this would require a restart to take effect
   }
+
   return HTML_SUCCESS;
 }
 
@@ -1380,6 +1382,7 @@ byte server_json_all(char *p) {
   bfill.emit_p(PSTR(",\"stations\":{"));
   server_json_stations_main();
   bfill.emit_p(PSTR("}"));
+  delay(1);
   return HTML_OK;
 }
 

From e334008011baddc31c2e9d10c357a542cd315b5d Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Sun, 13 Sep 2015 15:39:29 -0400
Subject: [PATCH 37/39] modify the current sensing code to support future OS AC
 controllers that have current sensing ability

---
 OpenSprinkler.cpp | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index 1ea3fa97..dfdfc2f7 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -551,13 +551,13 @@ void OpenSprinkler::begin() {
 
       pinMode(PIN_BOOST_EN, OUTPUT);
       digitalWrite(PIN_BOOST_EN, LOW);
-
-      // detect if current sensing pin is present
-      pinMode(PIN_CURR_DIGITAL, INPUT);
-      digitalWrite(PIN_CURR_DIGITAL, HIGH); // enable internal pullup
-      status.has_curr_sense = digitalRead(PIN_CURR_DIGITAL) ? 0 : 1;
-      digitalWrite(PIN_CURR_DIGITAL, LOW);
     }
+
+    // detect if current sensing pin is present
+    pinMode(PIN_CURR_DIGITAL, INPUT);
+    digitalWrite(PIN_CURR_DIGITAL, HIGH); // enable internal pullup
+    status.has_curr_sense = digitalRead(PIN_CURR_DIGITAL) ? 0 : 1;
+    digitalWrite(PIN_CURR_DIGITAL, LOW);
   #endif
 
   lcd_start();
@@ -716,14 +716,21 @@ void OpenSprinkler::rainsensor_status() {
 }
 
 /** Read current sensing value
- * OpenSprinkler DC has a 0.2 ohm current sensing resistor.
+ * OpenSprinkler has a 0.2 ohm current sensing resistor.
  * Therefore the conversion from analog reading to milli-amp is:
  * (r/1024)*3.3*1000/0.2
+ * Newer AC controller has a 0.2 ohm curent sensing resistor
+ * with op-amp to sense the peak current. Therefore the actual
+ * current is discounted by 0.707
  */
 #if defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1284__)
 uint16_t OpenSprinkler::read_current() {
   if(status.has_curr_sense) {
-    return (uint16_t)(analogRead(PIN_CURR_SENSE) * 16.11);
+    if (hw_type == HW_TYPE_DC) {
+      return (uint16_t)(analogRead(PIN_CURR_SENSE) * 16.11);
+    } else {
+      return (uint16_t)(analogRead(PIN_CURR_SENSE) * 11.39);
+    }
   } else {
     return 0;
   }

From 7cb9528a88ef0ea0a753b1509d1cafdfa6156d56 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Sun, 13 Sep 2015 18:49:51 -0400
Subject: [PATCH 38/39] fixed a bug that causes write_log and read_from_file
 functions to corrupt the weather query buffer; optimize PWM frequency for LCD
 display

---
 OpenSprinkler.cpp | 8 +++-----
 main.cpp          | 1 -
 utils.cpp         | 7 +++----
 weather.cpp       | 9 ++++++---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/OpenSprinkler.cpp b/OpenSprinkler.cpp
index dfdfc2f7..5d908474 100644
--- a/OpenSprinkler.cpp
+++ b/OpenSprinkler.cpp
@@ -264,7 +264,7 @@ byte OpenSprinkler::options[] = {
   1,  // device enable
   0,  // 1: ignore password; 0: use password
   0,  // device id
-  140,// lcd contrast
+  150,// lcd contrast
   100,// lcd backlight
   15, // lcd dimming
   80, // boost time (only valid to DC and LATCH type)
@@ -442,12 +442,10 @@ void OpenSprinkler::lcd_start() {
   if (lcd.type() == LCD_STD) {
     // this is standard 16x2 LCD
     // set PWM frequency for adjustable LCD backlight and contrast
-#if OS_HW_VERSION==(OS_HW_VERSION_BASE+20)  // 8MHz
+#if OS_HW_VERSION==(OS_HW_VERSION_BASE+20) || OS_HW_VERSION==(OS_HW_VERSION_BASE+21)  // 8MHz and 12MHz
     TCCR1B = 0x01;
-#elif OS_HW_VERSION==(OS_HW_VERSION_BASE+21)  // 12MHz
-    TCCR1B = 0x02;  // increase division factor for faster clock
 #else // 16MHz
-    TCCR1B = 0x03;  // increase division factor for faster clock
+    TCCR1B = 0x02;  // increase division factor for faster clock
 #endif
     // turn on LCD backlight and contrast
     lcd_set_brightness();
diff --git a/main.cpp b/main.cpp
index ad4047a1..66a8527d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -673,7 +673,6 @@ void check_weather() {
   if (!os.checkwt_lasttime || (ntz > os.checkwt_lasttime + CHECK_WEATHER_TIMEOUT)) {
     os.checkwt_lasttime = ntz;
     GetWeather();
-    write_log(LOGDATA_WATERLEVEL, ntz);
   }
 }
 
diff --git a/utils.cpp b/utils.cpp
index 8bc49d9b..9ccbdd5d 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -24,7 +24,6 @@
 #include "utils.h"
 #include "OpenSprinkler.h"
 extern OpenSprinkler os;
-extern char tmp_buffer[];
 
 #if defined(ARDUINO)  // AVR
 #include <avr/eeprom.h>
@@ -34,7 +33,7 @@ extern SdFat sd;
 void write_to_file(const char *name, const char *data, int size, int pos, bool trunc) {
   if (!os.status.has_sd)  return;
 
-  char *fn = tmp_buffer+TMP_BUFFER_SIZE-12;
+  char fn[12];
   strcpy_P(fn, name);
   sd.chdir("/");
   SdFile file;
@@ -52,7 +51,7 @@ void write_to_file(const char *name, const char *data, int size, int pos, bool t
 bool read_from_file(const char *name, char *data, int maxsize, int pos) {
   if (!os.status.has_sd)  { data[0]=0; return false; }
 
-  char *fn = tmp_buffer+TMP_BUFFER_SIZE-12;
+  char fn[12];
   strcpy_P(fn, name);
   sd.chdir("/");
   SdFile file;
@@ -71,7 +70,7 @@ bool read_from_file(const char *name, char *data, int maxsize, int pos) {
 void remove_file(const char *name) {
   if (!os.status.has_sd)  return;
 
-  char *fn = tmp_buffer+TMP_BUFFER_SIZE-12;
+  char fn[12];
   strcpy_P(fn, name);
   sd.chdir("/");
   if (!sd.exists(fn))  return;
diff --git a/weather.cpp b/weather.cpp
index ce98372a..3e460181 100644
--- a/weather.cpp
+++ b/weather.cpp
@@ -40,6 +40,7 @@ extern const char wtopts_filename[];
 extern OpenSprinkler os; // OpenSprinkler object
 extern char tmp_buffer[];
 byte findKeyVal (const char *str,char *strbuf, uint8_t maxlen,const char *key,bool key_in_pgm=false,uint8_t *keyfound=NULL);
+void write_log(byte type, ulong curr_time);
 
 // The weather function calls getweather.py on remote server to retrieve weather data
 // the default script is WEATHER_SCRIPT_HOST/weather?.py
@@ -50,8 +51,8 @@ static void getweather_callback(byte status, uint16_t off, uint16_t len) {
   char *p = (char*)Ethernet::buffer + off;
 #else
   char *p = ether_buffer;
-  DEBUG_PRINTLN(p);
 #endif
+  DEBUG_PRINTLN(p);
   /* scan the buffer until the first & symbol */
   while(*p && *p!='&') {
     p++;
@@ -109,6 +110,7 @@ static void getweather_callback(byte status, uint16_t off, uint16_t len) {
   }
 
   os.checkwt_success_lasttime = os.now_tz();
+  write_log(LOGDATA_WATERLEVEL, os.checkwt_success_lasttime);
 }
 
 #if defined(ARDUINO)  // for AVR
@@ -129,7 +131,7 @@ void GetWeather() {
                 tmp);
   // copy string to tmp_buffer, replacing all spaces with _
   char *src=tmp_buffer+strlen(tmp_buffer);
-  char *dst=tmp_buffer+TMP_BUFFER_SIZE-1;
+  char *dst=tmp_buffer+TMP_BUFFER_SIZE-12;
   
   char c;
   // url encode. convert SPACE to %20
@@ -217,7 +219,7 @@ void GetWeather() {
                 tmp);    
 
   char *src=tmp_buffer+strlen(tmp_buffer);
-  char *dst=tmp_buffer+TMP_BUFFER_SIZE-1;
+  char *dst=tmp_buffer+TMP_BUFFER_SIZE-12;
   
   char c;
   // url encode. convert SPACE to %20
@@ -256,6 +258,7 @@ void GetWeather() {
     }
     peel_http_header();
     getweather_callback(0, 0, ETHER_BUFFER_SIZE);
+    break;
   }
   client.stop();
 }

From 560db55d3de406200c0adebe8268166342653730 Mon Sep 17 00:00:00 2001
From: Ray <rayshobbyshop@gmail.com>
Date: Tue, 15 Sep 2015 01:32:48 -0400
Subject: [PATCH 39/39] use runtime path for all file operations
 (OSPi/Bo/Linux)

---
 main.cpp   | 12 ++++++------
 server.cpp |  2 +-
 utils.cpp  | 50 +++++++++++++++++++++++++++++++-------------------
 utils.h    |  1 +
 4 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/main.cpp b/main.cpp
index 66a8527d..189f7ccb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -921,15 +921,15 @@ void write_log(byte type, ulong curr_time) {
   }
 #else // prepare log folder for RPI/BBB
   struct stat st;
-  if(stat(LOG_PREFIX, &st)) {
-    if(mkdir(LOG_PREFIX, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH)) {
+  if(stat(get_filename_fullpath(LOG_PREFIX), &st)) {
+    if(mkdir(get_filename_fullpath(LOG_PREFIX), S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH)) {
       return;
     }
   }
   FILE *file;
-  file = fopen(tmp_buffer, "rb+");
+  file = fopen(get_filename_fullpath(tmp_buffer), "rb+");
   if(!file) {
-    file = fopen(tmp_buffer, "wb");
+    file = fopen(get_filename_fullpath(tmp_buffer), "wb");
     if (!file)  return;
   }
   fseek(file, 0, SEEK_END);
@@ -1009,11 +1009,11 @@ void delete_log(char *name) {
 #else // delete_log implementation for RPI/BBB
   if (strncmp(name, "all", 3) == 0) {
     // delete the log folder
-    rmdir(LOG_PREFIX);
+    rmdir(get_filename_fullpath(LOG_PREFIX));
     return;
   } else {
     make_logfile_name(name);
-    remove(tmp_buffer);
+    remove(get_filename_fullpath(tmp_buffer));
   }
 #endif
 }
diff --git a/server.cpp b/server.cpp
index 0604a01e..a3551938 100644
--- a/server.cpp
+++ b/server.cpp
@@ -1289,7 +1289,7 @@ byte server_json_log(char *p) {
     file.open(tmp_buffer, O_READ);
 #else // prepare to open log file for RPI/BBB
     FILE *file;
-    file = fopen(tmp_buffer, "rb");
+    file = fopen(get_filename_fullpath(tmp_buffer), "rb");
     if(!file) continue;
 #endif // prepare to open log file
 
diff --git a/utils.cpp b/utils.cpp
index 9ccbdd5d..22786590 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -79,7 +79,7 @@ void remove_file(const char *name) {
 
 #else // RPI/BBB/LINUX
 void nvm_read_block(void *dst, const void *src, int len) {
-  FILE *fp = fopen(NVM_FILENAME, "rb");
+  FILE *fp = fopen(get_filename_fullpath(NVM_FILENAME), "rb");
   if(fp) {
     fseek(fp, (unsigned int)src, SEEK_SET);
     fread(dst, 1, len, fp);
@@ -88,9 +88,9 @@ void nvm_read_block(void *dst, const void *src, int len) {
 }
 
 void nvm_write_block(const void *src, void *dst, int len) {
-  FILE *fp = fopen(NVM_FILENAME, "rb+");
+  FILE *fp = fopen(get_filename_fullpath(NVM_FILENAME), "rb+");
   if(!fp) {
-    fp = fopen(NVM_FILENAME, "wb");
+    fp = fopen(get_filename_fullpath(NVM_FILENAME), "wb");
   }
   if(fp) {
     fseek(fp, (unsigned int)dst, SEEK_SET);
@@ -102,7 +102,7 @@ void nvm_write_block(const void *src, void *dst, int len) {
 }
 
 byte nvm_read_byte(const byte *p) {
-  FILE *fp = fopen(NVM_FILENAME, "rb");
+  FILE *fp = fopen(get_filename_fullpath(NVM_FILENAME), "rb");
   byte v = 0;
   if(fp) {
     fseek(fp, (unsigned int)p, SEEK_SET);
@@ -115,9 +115,9 @@ byte nvm_read_byte(const byte *p) {
 }
 
 void nvm_write_byte(const byte *p, byte v) {
-  FILE *fp = fopen(NVM_FILENAME, "rb+");
+  FILE *fp = fopen(get_filename_fullpath(NVM_FILENAME), "rb+");
   if(!fp) {
-    fp = fopen(NVM_FILENAME, "wb");
+    fp = fopen(get_filename_fullpath(NVM_FILENAME), "wb");
   }
   if(fp) {
     fseek(fp, (unsigned int)p, SEEK_SET);
@@ -131,11 +131,11 @@ void nvm_write_byte(const byte *p, byte v) {
 void write_to_file(const char *name, const char *data, int size, int pos, bool trunc) {
   FILE *file;
   if(trunc) {
-    file = fopen(name, "wb");
+    file = fopen(get_filename_fullpath(name), "wb");
   } else {
-    file = fopen(name, "r+b");
+    file = fopen(get_filename_fullpath(name), "r+b");
     if(!file) {
-        file = fopen(name, "wb");
+        file = fopen(get_filename_fullpath(name), "wb");
     }
   }
 
@@ -149,7 +149,7 @@ void write_to_file(const char *name, const char *data, int size, int pos, bool t
 bool read_from_file(const char *name, char *data, int maxsize, int pos) {
 
   FILE *file;
-  file = fopen(name, "rb");
+  file = fopen(get_filename_fullpath(name), "rb");
   if(!file) {
     data[0] = 0;
     return true;
@@ -172,23 +172,35 @@ bool read_from_file(const char *name, char *data, int maxsize, int pos) {
 }
 
 void remove_file(const char *name) {
-  remove(name);
+  remove(get_filename_fullpath(name));
 }
 
 char* get_runtime_path() {
   static char path[PATH_MAX];
-  if(readlink("/proc/self/exe", path, PATH_MAX ) <= 0) {
-    return NULL;
-  }
-  char* path_end = strrchr(path, '/');
-  if(path_end == NULL) {
-    return NULL;
+  static byte query = 1;
+
+  if(query) {
+    if(readlink("/proc/self/exe", path, PATH_MAX ) <= 0) {
+      return NULL;
+    }
+    char* path_end = strrchr(path, '/');
+    if(path_end == NULL) {
+      return NULL;
+    }
+    path_end++;
+    *path_end=0;
+    query = 0;
   }
-  path_end++;
-  *path_end=0;
   return path;
 }
 
+char* get_filename_fullpath(const char *filename) {
+  static char fullpath[PATH_MAX];
+  strcpy(fullpath, get_runtime_path());
+  strcat(fullpath, filename);
+  return fullpath;
+}
+
 #if defined(OSPI)
 unsigned int detect_rpi_rev() {
   FILE * filp;
diff --git a/utils.h b/utils.h
index 8ac8d1e5..74178fcf 100644
--- a/utils.h
+++ b/utils.h
@@ -55,6 +55,7 @@ void remove_file(const char *name);
   byte nvm_read_byte(const byte *p);
   void nvm_write_byte(const byte *p, byte v);
   char* get_runtime_path();
+  char* get_filename_fullpath(const char *filename);
   void delay(ulong ms);
   void delayMicroseconds(ulong us);
   void delayMicrosecondsHard(ulong us);