Revision 34:32299b819067, committed 2015-01-31

Comitter:

olympux

Date:

Sat Jan 31 08:45:04 2015 +0000

Parent:

33:c906ccc220ba

Child:

35:f5c98e2d6aad

Commit message:

Improvements

Changed in this revision

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README.md	Sat Jan 31 08:45:04 2015 +0000
@@ -0,0 +1,33 @@
+Features
+================
+
+    + NNIO module with NNIO protocol v2.0.
+    + Support RPC control commands using TCP/UDP server. No support RPC with TCP client.
+
+Release notes
+================
+
+v0.1 (29/12/2014)
+---------------
+
+    + Imported F103_NNIO rev27:22f289beceb8
+    + Modified: process_control_command() with return value.
+      0 if NNIO protocol or RPC protocol without reply; length of RPC outbut buffer; or -1 if RPC failed.
+    + Modified: TCP server now checks to return data to client.
+    + Modified: use device description instead of device config code in Discovery command.
+    + Tested: working with ConfigurationTool v2.0 and AlarmMonitoring v1.1.
+    
+v1.0 (06/01/2014)
+------------------
+
+    + Added: RPC command replies as following object_name:reply_value
+    + Modified: clean code in my_eeprom_funcs and main.cpp
+    
+v1.1 (24/01/2015)
+-----------------
+
+    + Modified: control command is able to be processed by both TCP and UDP.
+      Only one network output buffer is used for RPC-style and NNIO protocols.
+    + Modified: process RPC-style command in tcp client, similar to TCP/UDP server.
+    + Updated: automatically reset after setting network configuration or setting TCP server for auto update mode.
+    + Updated: RPC object name is 16 max.
\ No newline at end of file

--- a/main.cpp	Sun Jan 25 14:04:04 2015 +0000
+++ b/main.cpp	Sat Jan 31 08:45:04 2015 +0000
@@ -617,8 +617,8 @@
     inbuf[len+1] = '\n';
     inbuf[len+2] = '\0'; // add CR-LF
     if ((len > 0) && (inbuf[0] == '/')) {
-        char obj_name[32];
-        bool result;
+        char obj_name[16];
+        bool ok;
 
         rpc_style = true;
         // find RPC object name
@@ -634,8 +634,8 @@
         /*
          * execute RPC command, return reply length and reply in rpc_outbuf
          */
-        result = RPC::call(inbuf, network_output_buffer);
-        if (result) {
+        ok = RPC::call(inbuf, network_output_buffer);
+        if (ok) {
             // re-arrange output buffer as following: object_name:output_value
             strcpy(inbuf, network_output_buffer); // use inbuf as temp
             strcpy(network_output_buffer, obj_name); // rpc object name

--- a/readme.txt	Sun Jan 25 14:04:04 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-Features
-    + NNIO module with NNIO protocol v2.0.
-    + Support RPC control commands using TCP/UDP server. No support RPC with TCP client.
-
-v0.1 (29/12/2014)
-    + Imported F103_NNIO rev27:22f289beceb8
-    + Modified: process_control_command() with return value.
-      0 if NNIO protocol or RPC protocol without reply; length of RPC outbut buffer; or -1 if RPC failed.
-    + Modified: TCP server now checks to return data to client.
-    + Modified: use device description instead of device config code in Discovery command.
-    + Tested: working with ConfigurationTool v2.0 and AlarmMonitoring v1.1.
-    
-v1.0 (06/01/2014)
-    + Added: RPC command replies as following object_name:reply_value
-    + Modified: clean code in my_eeprom_funcs and main.cpp
-    
-v1.1 (24/01/2015)
-    + Modified: control command is able to be processed by both TCP and UDP.
-      Only one network output buffer is used for RPC-style and NNIO protocols.
-    + Modified: process RPC-style command in tcp client, similar to TCP/UDP server.
-      Start auto_update_timer_thread() only if auto transmit is enabled.
-    + Updated: automatically reset after setting network configuration or setting TCP server for auto update mode.
\ No newline at end of file