'Release: 1.0.1beta0'

xcore · Oct 30, 2013 · cf88e55 · cf88e55
1 parent f88c9c8
commit cf88e55
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 39 deletions.
diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
 Modbus TCP Repository
 .....................
 
-:Latest release: 1.0.0rc1
+:Latest release: 1.0.1beta0
 :Maintainer: XMOS
 :Description: Modbus TCP (Slave) component
 
@@ -29,8 +29,9 @@ Required software (dependencies)
 ================================
 
   * sc_xtcp (https://github.com/xcore/sc_xtcp.git)
-  * sc_ethernet (https://github.com/xcore/sc_ethernet.git)
+  * sc_ethernet (git@github.com:xcore/sc_ethernet.git)
   * sc_i2c (https://github.com/xcore/sc_i2c.git)
-  * sc_otp (https://github.com/xcore/sc_otp.git)
-  * sc_util (git://github.com/xcore/sc_util.git)
+  * sc_slicekit_support (origin)
+  * sc_otp (git@github.com:xcore/sc_otp)
+  * sc_util (git@github.com:xcore/sc_util)
 
diff --git a/app_modbus_tcp/.xproject b/app_modbus_tcp/.xproject
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_modbus_tcp</repository><partnum>XM-002917-SM</partnum><version>1.0.0rc1</version></xproject>
+<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_modbus_tcp</repository><partnum>XM-002917-SM</partnum></xproject>
diff --git a/module_modbus_tcp/.xproject b/module_modbus_tcp/.xproject
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_modbus_tcp</repository><partnum>XM-002917-SM</partnum><version>1.0.0rc1</version></xproject>
+<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_modbus_tcp</repository><partnum>XM-002917-SM</partnum></xproject>
diff --git a/module_modbus_tcp/src/mb_codes.h b/module_modbus_tcp/src/mb_codes.h
@@ -6,7 +6,7 @@
 /*===========================================================================
  Info
  ----
- 
+
  ===========================================================================*/
 
 #ifndef __mb_codes_h__
@@ -58,7 +58,7 @@ enum modbus_error
 /*---------------------------------------------------------------------------
  extern variables
  ---------------------------------------------------------------------------*/
- 
+
 /*---------------------------------------------------------------------------
  prototypes
  ---------------------------------------------------------------------------*/

diff --git a/module_modbus_tcp/src/mb_util.h b/module_modbus_tcp/src/mb_util.h
@@ -6,7 +6,7 @@
 /*===========================================================================
  Info
  ----
- 
+
  ===========================================================================*/
 
 #ifndef __mb_util_h__
@@ -31,7 +31,7 @@
 /*---------------------------------------------------------------------------
  extern variables
  ---------------------------------------------------------------------------*/
- 
+
 /*---------------------------------------------------------------------------
  prototypes
  ---------------------------------------------------------------------------*/

diff --git a/module_modbus_tcp/src/mbtcp.h b/module_modbus_tcp/src/mbtcp.h
@@ -6,7 +6,7 @@
 /*===========================================================================
  Info
  ----
- 
+
  ===========================================================================*/
 
 #ifndef __mbtcp_h__
@@ -33,7 +33,7 @@
 /*---------------------------------------------------------------------------
  extern variables
  ---------------------------------------------------------------------------*/
- 
+
 /*---------------------------------------------------------------------------
  prototypes
  ---------------------------------------------------------------------------*/

diff --git a/module_modbus_tcp/src/mbtcp_parser.c b/module_modbus_tcp/src/mbtcp_parser.c
@@ -13,7 +13,7 @@
  4. After getting the data from application, a Modbus TCP response replaces the
  contents of ``data`` (the TCP data).
  5. ``modbus_tcp_parse_request()`` exits. The TCP layer can now send ``data``.
- 
+
  ===========================================================================*/
 
 /*---------------------------------------------------------------------------

diff --git a/module_modbus_tcp/src/mbtcp_parser.h b/module_modbus_tcp/src/mbtcp_parser.h
@@ -6,7 +6,7 @@
 /*===========================================================================
  Info
  ----
- 
+
  ===========================================================================*/
 
 #ifndef __mbtcp_parser_h__
@@ -32,7 +32,7 @@
 /*---------------------------------------------------------------------------
  extern variables
  ---------------------------------------------------------------------------*/
- 
+
 /*---------------------------------------------------------------------------
  prototypes
  ---------------------------------------------------------------------------*/

diff --git a/module_modbus_tcp/src/modbus_tcp.h b/module_modbus_tcp/src/modbus_tcp.h
@@ -42,23 +42,23 @@
 
 /*==========================================================================*/
 /**
- *  Modbus TCP Server. This Modbus Slave task must be called from the main 
- *  user application. It instantiates Ethernet and TCP server components to 
- *  receive Modbus TCP commands (from a Modbus Master - a TCP client) over 
+ *  Modbus TCP Server. This Modbus Slave task must be called from the main
+ *  user application. It instantiates Ethernet and TCP server components to
+ *  receive Modbus TCP commands (from a Modbus Master - a TCP client) over
  *  the TCP layer.
  *
  *  It processes Modbus commands and requests user application for data. These
- *  requests to user are made over ``c_modbus``. The data in c_modbus is of 
+ *  requests to user are made over ``c_modbus``. The data in c_modbus is of
  *  the following format:
- *  
+ *
  *  It sends:
  *  unsigned char: Modbus command
  *  unsigned short: Address to read/write
  *  unsigned short: Value to write (sent always. on read command, this is 0)
  *
  *  And expects:
- *  unsigned short: value (for Read) or status (for write) 
- *  
+ *  unsigned short: value (for Read) or status (for write)
+ *
  *  After receiving request data from user application, it sends the response
  *  back to Modbus master over TCP layer.
  *

diff --git a/xpd.xml b/xpd.xml
@@ -1,41 +1,44 @@
 <?xml version="1.0" ?>
 <xpd>
     <components>
-        <component description = "Demonstrates Modbus slave with GPIO sliceCARD" type = "demoCode" scope = "Example" path = "app_modbus_tcp" local = "false" id = "app_modbus_tcp" name = "Modbus TCP Demo Application">
+        <component name = "Modbus TCP Server (Slave) Component" type = "component" buildresults_path = "module_modbus_tcp/.module_modbus_tcp.buildinfo" scope = "Early Development" path = "module_modbus_tcp" metainfo_path = "module_modbus_tcp/module_modbus_tcp.metainfo" local = "false" id = "module_modbus_tcp" description = "Modbus TCP Server (Slave) component">
             <board>XA-SK-E100</board>
-            <board>XA-SK-GPIO</board>
-            <componentDependency repo = "git://github.com/davelxmos/sc_xtcp" version = "3.1.4">module_xtcp</componentDependency>
             <componentDependency repo = "git://github.com/xcore/sc_otp" version = "1.0.0">module_otp_board_info</componentDependency>
+            <componentDependency repo = "git://github.com/davelxmos/sc_xtcp" version = "3.1.4">module_xtcp</componentDependency>
+            <componentDependency version = "2.2.5">module_ethernet_smi</componentDependency>
+            <componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.5">module_ethernet</componentDependency>
             <componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.3">module_locks</componentDependency>
-            <componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.6">module_ethernet_board_support</componentDependency>
-            <componentDependency version = "1.0.0">module_modbus_tcp</componentDependency>
-            <componentDependency repo = "git://github.com/xcore/sc_i2c" version = "2.2.0">module_i2c_master</componentDependency>
-            <componentDependency version = "2.2.6">module_ethernet_smi</componentDependency>
-            <componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.6">module_ethernet</componentDependency>
+            <componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.5">module_ethernet_board_support</componentDependency>
             <keyword>ModbusTCP</keyword>
         </component>
-        <component name = "Modbus TCP Server (Slave) Component" type = "component" buildresults_path = "module_modbus_tcp/.module_modbus_tcp.buildinfo" scope = "Early Development" path = "module_modbus_tcp" metainfo_path = "module_modbus_tcp/module_modbus_tcp.metainfo" local = "false" id = "module_modbus_tcp" description = "Modbus TCP Server (Slave) component">
+        <component description = "Demonstrates Modbus slave with GPIO sliceCARD" type = "demoCode" scope = "Example" path = "app_modbus_tcp" local = "false" id = "app_modbus_tcp" name = "Modbus TCP Demo Application">
             <board>XA-SK-E100</board>
-            <componentDependency repo = "git://github.com/davelxmos/sc_xtcp" version = "3.1.4">module_xtcp</componentDependency>
-            <componentDependency repo = "git://github.com/xcore/sc_otp" version = "1.0.0">module_otp_board_info</componentDependency>
-            <componentDependency version = "2.2.6">module_ethernet_smi</componentDependency>
+            <board>XA-SK-GPIO</board>
+            <componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.5">module_ethernet_board_support</componentDependency>
+            <componentDependency repo = "git://github.com/xcore/sc_i2c" version = "2.2.0">module_i2c_master</componentDependency>
+            <componentDependency version = "2.2.5">module_ethernet_smi</componentDependency>
             <componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.3">module_locks</componentDependency>
-            <componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.6">module_ethernet_board_support</componentDependency>
-            <componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.6">module_ethernet</componentDependency>
+            <componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.5">module_ethernet</componentDependency>
+            <componentDependency repo = "git://github.com/xcore/sc_otp" version = "1.0.0">module_otp_board_info</componentDependency>
+            <componentDependency version = "1.0.0">module_modbus_tcp</componentDependency>
+            <componentDependency repo = "git://github.com/davelxmos/sc_xtcp" version = "3.1.4">module_xtcp</componentDependency>
             <keyword>ModbusTCP</keyword>
         </component>
     </components>
     <dependency repo = "sc_i2c">
-        <githash>09a3ca1367ad8771f09fc944dafe630d0cdaf931</githash>
+        <githash>53349e8bd6493701b1ec462187b14c9e74bdc6bd</githash>
         <uri>https://github.com/xcore/sc_i2c.git</uri>
+        <version>2.2.0rc0</version>
     </dependency>
     <dependency repo = "sc_xtcp">
-        <githash>5dc0a754fb43057611956d13b163a2bb74e3473c</githash>
+        <githash>b57f63aa0bf64834b17bd695fdc78c6c4b8f0fbf</githash>
         <uri>https://github.com/xcore/sc_xtcp.git</uri>
+        <version>3.1.4rc0</version>
     </dependency>
     <dependency repo = "sc_ethernet">
-        <githash>1ab3378f3f6da6ba44ffd89e7fc57bb0006c3ae2</githash>
+        <githash>d4288863b8258d525d0ee421cab4f8c177080855</githash>
         <uri>https://github.com/xcore/sc_ethernet.git</uri>
+        <version>2.2.5rc2</version>
     </dependency>
     <description>Modbus TCP (Slave) component</description>
     <docdir>module_modbus_tcp/doc</docdir>
@@ -52,6 +55,7 @@
     <release parenthash = "6c0643809371ab88eca72615c8e9df263418655a" version = "0.0.1beta5" githash = "048fd5980911bb9b6267877c32c15b9cdcff7857"></release>
     <release parenthash = "dadb84e6af2b7a72b19dd6111f950aa394393112" version = "1.0.0rc0" githash = "1a95b4318190e6d3e79da4ee348e8e7d3e206209"></release>
     <release parenthash = "9127cc6ebcebd69520395b3414874f9104b05071" version = "1.0.0rc1" githash = "26940be64876020c5c13f30726af9821fe1c0cb0"></release>
+    <release parenthash = "f88c9c8256940eab1918030a72d94dde30c5fac9" version = "1.0.1beta0"></release>
     <subpartnumber>XM-002917-SM</subpartnumber>
     <vendor>XMOS</vendor>
     <version_defines></version_defines>