[Powerguru-commit] [SCM] powerguru branch, master, updated. aff020a87dbf46258e6b7f718cb98c759101e85a

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "powerguru".

The branch, master has been updated
       via  aff020a87dbf46258e6b7f718cb98c759101e85a (commit)
       via  49a3e5538482759a7234c2b9d608702d27df2f1d (commit)
      from  5fe21378b4975071215e64943b0f79436d9f04ca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/powerguru.git/commit/?id=aff020a87dbf46258e6b7f718cb98c759101e85a


commit aff020a87dbf46258e6b7f718cb98c759101e85a
Author: Rob Savoye <address@hidden>
Date:   Sun Dec 11 14:00:05 2011 -0700

    add data structure for xanbus commands

diff --git a/lib/xanbus.cc b/lib/xanbus.cc
index a4644a2..f9fe43b 100644
--- a/lib/xanbus.cc
+++ b/lib/xanbus.cc
@@ -36,6 +36,103 @@ static char buffy[100];
 
 extern LogFile dbglogfile;
 
+const XanbusUI::cmd_data_t xanbus[] = {
+    { XanbusUI::XanbusUI::XACCESS, "ACCESS", false },
+    { XanbusUI::XanbusUI::BACKLIGHT, "BACKLIGHT", false },
+    { XanbusUI::CONT, "CONT", false },
+    { XanbusUI::CUSTOM11_QUERY, "CUSTOM11?", true },
+    { XanbusUI::CUSTOM12_QUERY, "CUSTOM12?", true },
+    { XanbusUI::CUSTOM11ERASE, "CUSTOM11ERASE", false },
+    { XanbusUI::CUSTOM12ERASE, "CUSTOM12ERASE", false },
+    { XanbusUI::CUSTOM21, "", true },
+    { XanbusUI::CUSTOM22, "", true },
+    { XanbusUI::CUSTOM21_QUERY, "", true },
+    { XanbusUI::CUSTOM22_QUERY, "", true },
+    { XanbusUI::CUSTOM21ERASE, "", true },
+    { XanbusUI::CUSTOM22ERASE, "", true },
+    { XanbusUI::DCCOMPLEV_QUERY, "", true },
+    { XanbusUI::DCDC_QUERY, "", true },
+    { XanbusUI::DERATELIMIT_QUERY, "", true },
+    { XanbusUI::ERR_QUERY, "", true },
+    { XanbusUI::FAULTACTIVE_QUERY, "", true },
+    { XanbusUI::FAULTGND_QUERY, "", true },
+    { XanbusUI::FAULTLAST_QUERY, "", true },
+    { XanbusUI::FAULTLOG_QUERY, "", true },
+    { XanbusUI::FREQ_QUERY, "", true },
+    { XanbusUI::FWHW_QUERY, "", true },
+    { XanbusUI::IDN_QUERY, "", true },
+    { XanbusUI::IIN_QUERY, "", true },
+    { XanbusUI::INV_QUERY, "", true },
+    { XanbusUI::IOUT_QUERY, "", true },
+    { XanbusUI::KNOCK, "", true },
+    { XanbusUI::KWHLIFE_QUERY, "", true },
+    { XanbusUI::KWHLIFESYS_QUERY, "", true },
+    { XanbusUI::KWHTODAY_QUERY, "", true },
+    { XanbusUI::KWHTODAYSYS_QUERY, "", true },
+    { XanbusUI::XKWHTODAY_QUERY, "", true },
+    { XanbusUI::MEASENGY_QUERY, "", true },
+    { XanbusUI::MEASENGYSYS_QUERY, "", true },
+    { XanbusUI::MEASICMM_QUERY, "", true },
+    { XanbusUI::MEASIN_QUERY, "", true },
+    { XanbusUI::MEASOUT_QUERY, "", true },
+    { XanbusUI::MEASRAW_QUERY, "", true },
+    { XanbusUI::MEASTEMP_QUERY, "", true },
+    { XanbusUI::MEMFREE_QUERY, "", true },
+    { XanbusUI::MODELID_QUERY, "", true },
+    { XanbusUI::MODELSTR_QUERY, "", true },
+    { XanbusUI::MONPARAM_QUERY, "", true },
+    { XanbusUI::MONALL_QUERY, "", true },
+    { XanbusUI::MONAUXPARAM_QUERY, "", true },
+    { XanbusUI::MONENS_QUERY, "", true },
+    { XanbusUI::MONENSPARAM_QUERY, "", true },
+    { XanbusUI::MONEXT_QUERY, "", true },
+    { XanbusUI::MONEXTPARAM_QUERY, "", true },
+    { XanbusUI::MONFB_QUERY, "", true },
+    { XanbusUI::MONFBPARAM_QUERY, "", true },
+    { XanbusUI::MONGND_QUERY, "", true },
+    { XanbusUI::MONGNDPARAM_QUERY, "", true },
+    { XanbusUI::MONGRID_QUERY, "", true },
+    { XanbusUI::MONGRIDPARAM_QUERY, "", true },
+    { XanbusUI::MONTEMP_QUERY, "", true },
+    { XanbusUI::MONTEMPPARAM_QUERY, "", true },
+    { XanbusUI::MONOVPARAM_QUERY, "", true },
+    { XanbusUI::MONUVPARAM_QUERY, "", true },
+    { XanbusUI::MONVIN_QUERY, "", true },
+    { XanbusUI::MPPT_QUERY, "", true },
+    { XanbusUI::MPPTDBG_QUERY, "", true },
+    { XanbusUI::MPPTLEV_QUERY, "", true },
+    { XanbusUI::MPPTLEVM_QUERY, "", true },
+    { XanbusUI::MPPTOFFSET_QUERY, "", true },
+    { XanbusUI::MPPTSTAT_QUERY, "", true },
+    { XanbusUI::NVMEMSPACE_QUERY, "", true },
+    { XanbusUI::OFFSET_QUERY, "", true },
+    { XanbusUI::OLDERLIM_QUERY, "", true },
+    { XanbusUI::PDCMPPT_QUERY, "", true },
+    { XanbusUI::PIN_QUERY, "", true },
+    { XanbusUI::POUT_QUERY, "", true },
+    { XanbusUI::POUTSYS_QUERY, "", true },
+    { XanbusUI::PROD_QUERY, "", true },
+    { XanbusUI::POWLIMIT_QUERY, "", true },
+    { XanbusUI::POWSEQ_QUERY, "", true },
+    { XanbusUI::POWSEQCLR, "", true },
+    { XanbusUI::QUEUED_QUERY, "", true },
+    { XanbusUI::RECTIME_QUERY, "", true },
+    { XanbusUI::RELAY_QUERY, "", true },
+    { XanbusUI::RIPCOMP_QUERY, "", true },
+    { XanbusUI::ROM_QUERY, "", true },
+    { XanbusUI::SCALE_QUERY, "", true },
+    { XanbusUI::SCID_QUERY, "", true },
+    { XanbusUI::SCROLL, "", true },
+    { XanbusUI::STANDBY, "", true },
+    { XanbusUI::STANDBY_QUERY, "", true },
+    { XanbusUI::TEMPLIMIT_QUERY, "", true },
+    { XanbusUI::TEMPLIMITSTEP_QUERY, "", true },
+    { XanbusUI::TIME_QUERY, "", true },
+    { XanbusUI::VDCREF_QUERY, "", true },
+    { XanbusUI::VIN_QUERY, "", true },
+    { XanbusUI::XBADX_QUERY, "", true }
+};
+
 XanbusUI::XanbusUI(void)
 {
     SetDefaultValues();  
diff --git a/lib/xanbus.h b/lib/xanbus.h
index e236ce4..a743866 100644
--- a/lib/xanbus.h
+++ b/lib/xanbus.h
@@ -33,11 +33,51 @@
 class XanbusUI : public Serial
 {
 public:
+
+
+    
     typedef enum {USERMENU, SETUPMENU} menu_e;
     enum inverter_e {OFF, SRCH, ON, CHG};
     enum invertsetup_e {FLOAT, SELL, SLT, LBX};
     enum battery_e {NICAD, LEADACID, GEL};
     enum genauto_e {UNINITIALIZED, RUNNING, IDLE};
+
+    typedef enum { XACCESS, ACCESS_QUERY, BACKLIGHT, CONT, CONT_QUERY,
+                   CUSTOM11_QUERY, CUSTOM12_QUERY, CUSTOM11ERASE,
+                   CUSTOM12ERASE, CUSTOM21, CUSTOM22, CUSTOM21_QUERY,
+                   CUSTOM22_QUERY, CUSTOM21ERASE, CUSTOM22ERASE,
+                   DCCOMPLEV_QUERY, DCDC_QUERY, DERATELIMIT_QUERY,
+                   ERR_QUERY, FAULTACTIVE_QUERY, FAULTGND_QUERY,
+                   FAULTLAST_QUERY, FAULTLOG_QUERY, FREQ_QUERY,
+                   FWHW_QUERY, IDN_QUERY, IIN_QUERY, INV_QUERY,
+                   IOUT_QUERY, KNOCK, KWHLIFE_QUERY, KWHLIFESYS_QUERY,
+                   KWHTODAY_QUERY, KWHTODAYSYS_QUERY, XKWHTODAY_QUERY,
+                   MEASENGY_QUERY, MEASENGYSYS_QUERY, MEASICMM_QUERY,
+                   MEASIN_QUERY, MEASOUT_QUERY, MEASRAW_QUERY, MEASTEMP_QUERY,
+                   MEMFREE_QUERY, MODELID_QUERY, MODELSTR_QUERY, 
MONPARAM_QUERY,
+                   MONALL_QUERY, MONAUXPARAM_QUERY, MONENS_QUERY,
+                   MONENSPARAM_QUERY, MONEXT_QUERY, MONEXTPARAM_QUERY,
+                   MONFB_QUERY, MONFBPARAM_QUERY, MONGND_QUERY,
+                   MONGNDPARAM_QUERY, MONGRID_QUERY, MONGRIDPARAM_QUERY,
+                   MONTEMP_QUERY, MONTEMPPARAM_QUERY, MONOVPARAM_QUERY,
+                   MONUVPARAM_QUERY, MONVIN_QUERY, MPPT_QUERY,
+                   MPPTDBG_QUERY, MPPTLEV_QUERY, MPPTLEVM_QUERY,
+                   MPPTOFFSET_QUERY, MPPTSTAT_QUERY, NVMEMSPACE_QUERY,
+                   OFFSET_QUERY, OLDERLIM_QUERY, PDCMPPT_QUERY, PIN_QUERY,
+                   POUT_QUERY, POUTSYS_QUERY, PROD_QUERY, POWLIMIT_QUERY,
+                   POWSEQ_QUERY, POWSEQCLR, QUEUED_QUERY, RECTIME_QUERY,
+                   RELAY_QUERY, RIPCOMP_QUERY, ROM_QUERY, SCALE_QUERY,
+                   SCID_QUERY, SCROLL, STANDBY, STANDBY_QUERY, TEMPLIMIT_QUERY,
+                   TEMPLIMITSTEP_QUERY, TIME_QUERY, VDCREF_QUERY, VIN_QUERY,
+                   XBADX_QUERY
+    } xanbus_command_e;
+
+
+    typedef struct {
+        xanbus_command_e type;
+        std::string      command;
+        bool             query;
+    } cmd_data_t;
     
     XanbusUI(void);
     ~XanbusUI(void);
@@ -155,3 +195,4 @@ extern "C" {
 // mode: C++
 // indent-tabs-mode: nil
 // End:
+

http://git.savannah.gnu.org/cgit/powerguru.git/commit/?id=49a3e5538482759a7234c2b9d608702d27df2f1d


commit 49a3e5538482759a7234c2b9d608702d27df2f1d
Author: Rob Savoye <address@hidden>
Date:   Sun Dec 11 13:59:41 2011 -0700

    fix minor typo

diff --git a/daemon/main.cc b/daemon/main.cc
index 1b8f97f..a3e46bf 100644
--- a/daemon/main.cc
+++ b/daemon/main.cc
@@ -266,9 +266,6 @@ main(int argc, char *argv[])
     }
 #endif
 
-    //
-
-        
     // Talk to an Outback Power Systems device
     if (outbackmode) {
         Console con;
@@ -365,7 +362,7 @@ main(int argc, char *argv[])
     
     // Network daemon/client mode. Normally we're a network daemon that
     // responses to requests by a remote client. Many house networks
-    // are behind a firewall,so the daemon can also connect to a
+    // are behind a firewall, so the daemon can also connect to a
     // publically accessible host to establish the connection the
     // other direction.
     if (daemon || client) {

-----------------------------------------------------------------------

Summary of changes:
 daemon/main.cc |    5 +--
 lib/xanbus.cc  |   97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/xanbus.h   |   41 +++++++++++++++++++++++
 3 files changed, 139 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
powerguru