From 46e8aa7a77067b84d8a3dbdfe429990dbd1eb679 Mon Sep 17 00:00:00 2001
From: Roland Jax <roland.jax@liwest.at>
Date: Mon, 17 Nov 2014 20:47:10 +0100
Subject: [PATCH] README adapted.

---
 README                 | 50 +++++++++++++++++++-----------------------
 src/ebusd/baseloop.cpp | 26 +++++++++++-----------
 2 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/README b/README
index c4bb56c2..dfc45852 100644
--- a/README
+++ b/README
@@ -13,6 +13,7 @@ Features
  * collect data of cycle messages
  * poll messages and collect received data
  * write raw data into dump files (for debugging purpose)
+ * scan ebus to identifies bus participants
 
  * available daemon commands:
    - get            fetch data from ebus participant
@@ -20,6 +21,10 @@ Features
    - cyc            fetch data from collected cycle messages
    - hex            send given hex value to ebus (ZZPBSBNNDx)
 
+   - scan           scan kown slave addresses (collected)
+   - scan full      scan all possible slave addresses
+   - scan result    show scanning results
+
    - log areas      change log areas
    - log level      change log level
 
@@ -29,12 +34,29 @@ Features
    - reload         reload ebus configuration
 
    - stop           stop daemon
-
    - quit           close connection
 
    - help           print help page
 
 
+vendor specific configuration files for ebusd
+---------------------------------------------
+
+See https://github.com/yuhu-/ebus-configuration
+
+
+
+ebusctl - client program for ebusd
+----------------------------------
+
+server commands:
+ * connect to ebusd (socket) and execute server commands (commands see above)
+
+local commands:
+ * 'feed' ebusd with raw data from dump files (or telnet) to ebusd
+
+
+
 Build
 -----
 
@@ -43,32 +65,6 @@ $ make
 $ make install
 
 
-Daemon Configuration
---------------------
-
-See ./ebusd -h
-
-
-Vendor specific configuration files
------------------------------------
-
-See https://github.com/yuhu-/ebus-configuration
-
-
-Tools
------
-
-ebusctl  - client program for ebusd.
-
-local commands:
- * 'feed' ebusd with raw data from dump files (or telnet) to ebusd
- * 'scan' ebus and identifies the participants
-
-remote commands:
- * connect to ebusd (socket) and execute server commands (see above)
-
-See ./ebusctl -h
-
 
 For usage and further information take a look on help page.
 
diff --git a/src/ebusd/baseloop.cpp b/src/ebusd/baseloop.cpp
index 2e778124..962c7193 100644
--- a/src/ebusd/baseloop.cpp
+++ b/src/ebusd/baseloop.cpp
@@ -292,16 +292,9 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 		break;
 
 	case scan:
-		if (cmd.size() < 1 || cmd.size() > 2) {
-			result << "usage: 'scan'" << std::endl
-			       << "       'scan full'" << std::endl
-			       << "       'scan result'";
-			break;
-		}
-
-		if (strcasecmp(cmd[1].c_str(), "RESULT") == 0) {
-			//~ m_ebusloop->scan(true);
-			result << "TODO show result";
+		if (cmd.size() == 1) {
+			m_ebusloop->scan();
+			result << "done";
 			break;
 		}
 
@@ -311,8 +304,15 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 			break;
 		}
 
-		m_ebusloop->scan();
-		result << "done";
+		if (strcasecmp(cmd[1].c_str(), "RESULT") == 0) {
+			//~ m_ebusloop->scan(true);
+			result << "TODO show result";
+			break;
+		}
+
+		result << "usage: 'scan'" << std::endl
+		       << "       'scan full'" << std::endl
+		       << "       'scan result'";
 		break;
 
 	case log:
@@ -390,7 +390,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 		       << " hex       - send given hex value        'hex type value'         (value: ZZPBSBNNDx)" << std::endl << std::endl
 		       << " scan      - scan ebus kown addresses    'scan'" << std::endl
 		       << "           - scan ebus all addresses     'scan full'" << std::endl
-		       << "           - scan show results           'scan result'" << std::endl << std::endl
+		       << "           - show results                'scan result'" << std::endl << std::endl
  		       << " log       - change log areas            'log areas area,area,..' (areas: bas|net|bus|cyc|all)" << std::endl
 		       << "           - change log level            'log level level'        (level: error|event|trace|debug)" << std::endl << std::endl
 		       << " raw       - toggle log raw data         'raw'" << std::endl