diff --git a/app_i2c_master_demo/.cproject b/app_i2c_master_demo/.cproject
index 44f1c2d..093ee7d 100644
--- a/app_i2c_master_demo/.cproject
+++ b/app_i2c_master_demo/.cproject
@@ -45,53 +45,208 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.24213215" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.include.paths.49729137" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
+	<option id = "com.xmos.c.compiler.option.defined.symbols.49729137" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
+									<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
+									<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__WCHAR_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__STDC_HOSTED__=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_YEAR=11"/>
+									<listOptionValue builtIn="false" value="__PTRDIFF_TYPE__=int"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MAJOR=1111"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MINOR=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MONTH=11"/>
+									<listOptionValue builtIn="false" value="__CHAR_UNSIGNED__=1"/>
+									<listOptionValue builtIn="false" value="__MCPP=2"/>
+									<listOptionValue builtIn="false" value="__XC__=1"/>
+									<listOptionValue builtIn="false" value="__XS1B__=1"/>
+									<listOptionValue builtIn="false" value="__INT_MAX__=2147483647"/>
+									<listOptionValue builtIn="false" value="__LONG_MAX__=2147483647L"/>
+									<listOptionValue builtIn="false" value="__STDC__=1"/>
+									<listOptionValue builtIn="false" value="__GNUC__=4"/>
+									<listOptionValue builtIn="false" value="__GNUC_MINOR__=2"/>
+									<listOptionValue builtIn="false" value="__GNUC_PATCHLEVEL__=1"/>
+									<listOptionValue builtIn="false" value="__llvm__=1"/>
+									<listOptionValue builtIn="false" value="__WINT_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__INTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__UINTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__GXX_ABI_VERSION=1002"/>
+									<listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__WCHAR_MAX__=255U"/>
+									<listOptionValue builtIn="false" value="__CHAR_BIT__=8"/>
+									<listOptionValue builtIn="false" value="__INTMAX_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__=0"/>
+									<listOptionValue builtIn="false" value="__DEC_EVAL_METHOD__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_RADIX__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_MANT_DIG__=24"/>
+									<listOptionValue builtIn="false" value="__FLT_DIG__=6"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_EXP__=(-125)"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_10_EXP__=(-37)"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_EXP__=128"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_10_EXP__=38"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX__=3.40282347e+38F"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN__=1.17549435e-38F"/>
+									<listOptionValue builtIn="false" value="__FLT_EPSILON__=1.19209290e-7F"/>
+									<listOptionValue builtIn="false" value="__FLT_DENORM_MIN__=1.40129846e-45F"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__DBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX__=1.7976931348623157e+308"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN__=2.2250738585072014e-308"/>
+									<listOptionValue builtIn="false" value="__DBL_EPSILON__=2.2204460492503131e-16"/>
+									<listOptionValue builtIn="false" value="__DBL_DENORM_MIN__=4.9406564584124654e-324"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__LDBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DECIMAL_DIG__=17"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX__=1.7976931348623157e+308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN__=2.2250738585072014e-308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_EPSILON__=2.2204460492503131e-16L"/>
+									<listOptionValue builtIn="false" value="__LDBL_DENORM_MIN__=4.9406564584124654e-324L"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DEC32_MANT_DIG__=7"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN_EXP__=(-95)"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX_EXP__=96"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN__=1E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX__=9.999999E96DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_EPSILON__=1E-6DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_DEN__=0.000001E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__=16"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN_EXP__=(-383)"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX_EXP__=384"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN__=1E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX__=9.999999999999999E384DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_EPSILON__=1E-15DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_DEN__=0.000000000000001E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC128_MANT_DIG__=34"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN_EXP__=(-6143)"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX_EXP__=6144"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN__=1E-6143DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX__=9.999999999999999999999999999999999E6144DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_EPSILON__=1E-33DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_DEN__=0.000000000000000000000000000000001E-6143DL"/>
+									<listOptionValue builtIn="false" value="__REGISTER_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__USER_LABEL_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__VERSION__=&quot;4.2.1"/>
+									<listOptionValue builtIn="false" value="__GNUC_GNU_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__BLOCKS__=1"/>
+									<listOptionValue builtIn="false" value="__NO_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__FINITE_MATH_ONLY__=0"/>
+									<listOptionValue builtIn="false" value="__ELF__=1"/>
+									<listOptionValue builtIn="false" value="__XCC_HAVE_FLOAT__=1"/>
+									<listOptionValue builtIn="false" value="__cplusplus=1"/>
+									<listOptionValue builtIn="false" value="__GNUG__=4"/>
+									<listOptionValue builtIn="false" value="__GXX_WEAK__=1"/>
+									<listOptionValue builtIn="false" value="__DEPRECATED=1"/>
+									<listOptionValue builtIn="false" value="__EXCEPTIONS=1"/>
+									<listOptionValue builtIn="false" value="__WCHAR_UNSIGNED__=1"/>
+								</option>
+
+                                <option id = "com.xmos.c.compiler.option.include.paths.87447207" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/gcc&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1/xcore-xmos-elf&quot;' />
-                                    
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
-                                <inputType id = "com.xmos.cdt.xc.compiler.input.87447207" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
-                                <option id = "gnu.c.compiler.option.include.paths.31961734" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                                <inputType id = "com.xmos.cdt.xc.compiler.input.31961734" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
+                                <option id = "gnu.c.compiler.option.include.paths.20280922" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.xc.compiler.base.20280922" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.87996994" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.xc.compiler.base.87996994" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.21474347" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.21474347" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.6515518" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.c.compiler.base.6515518" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.7610196" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.c.compiler.base.7610196" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.48986056" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.48986056" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.31908916" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.cpp.compiler.base.31908916" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.61975903" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.cpp.compiler.base.61975903" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.12228062" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.12228062" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.66385209" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.core.assembler.base.66385209" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.19938099" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.core.assembler.base.19938099" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.55784781" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.55784781" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.48786747" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_master_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
                             </tool>
 
                         </toolChain>
                     </folderInfo>
+                    <sourceEntries>
+                        <entry excluding=".build_*" flags="VALUE_WORKSPACE_PATH|RESOLVED"
+                    kind="sourcePath" name="" />
+                    </sourceEntries>
                 </configuration>
             </storageModule>
             <storageModule moduleId="scannerConfiguration">
@@ -184,6 +339,6 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
     </storageModule>
     <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-        <project id = "app_i2c_master_demo.null.48786747" name="app_i2c_master_demo" />
+        <project id = "app_i2c_master_demo.null.87600003" name="app_i2c_master_demo" />
     </storageModule>
 </cproject>
diff --git a/app_i2c_master_demo/.xproject b/app_i2c_master_demo/.xproject
index cb6adf6..87b587b 100644
--- a/app_i2c_master_demo/.xproject
+++ b/app_i2c_master_demo/.xproject
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-000072-SW</partnum></xproject>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-001898-SM</partnum></xproject>
\ No newline at end of file
diff --git a/app_i2c_simple_demo/.cproject b/app_i2c_simple_demo/.cproject
index c5bbee7..2579ef0 100644
--- a/app_i2c_simple_demo/.cproject
+++ b/app_i2c_simple_demo/.cproject
@@ -45,53 +45,208 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.59686427" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.include.paths.11642657" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
+	<option id = "com.xmos.c.compiler.option.defined.symbols.11642657" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
+									<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
+									<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__WCHAR_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__STDC_HOSTED__=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_YEAR=11"/>
+									<listOptionValue builtIn="false" value="__PTRDIFF_TYPE__=int"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MAJOR=1111"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MINOR=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MONTH=11"/>
+									<listOptionValue builtIn="false" value="__CHAR_UNSIGNED__=1"/>
+									<listOptionValue builtIn="false" value="__MCPP=2"/>
+									<listOptionValue builtIn="false" value="__XC__=1"/>
+									<listOptionValue builtIn="false" value="__XS1B__=1"/>
+									<listOptionValue builtIn="false" value="__INT_MAX__=2147483647"/>
+									<listOptionValue builtIn="false" value="__LONG_MAX__=2147483647L"/>
+									<listOptionValue builtIn="false" value="__STDC__=1"/>
+									<listOptionValue builtIn="false" value="__GNUC__=4"/>
+									<listOptionValue builtIn="false" value="__GNUC_MINOR__=2"/>
+									<listOptionValue builtIn="false" value="__GNUC_PATCHLEVEL__=1"/>
+									<listOptionValue builtIn="false" value="__llvm__=1"/>
+									<listOptionValue builtIn="false" value="__WINT_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__INTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__UINTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__GXX_ABI_VERSION=1002"/>
+									<listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__WCHAR_MAX__=255U"/>
+									<listOptionValue builtIn="false" value="__CHAR_BIT__=8"/>
+									<listOptionValue builtIn="false" value="__INTMAX_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__=0"/>
+									<listOptionValue builtIn="false" value="__DEC_EVAL_METHOD__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_RADIX__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_MANT_DIG__=24"/>
+									<listOptionValue builtIn="false" value="__FLT_DIG__=6"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_EXP__=(-125)"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_10_EXP__=(-37)"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_EXP__=128"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_10_EXP__=38"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX__=3.40282347e+38F"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN__=1.17549435e-38F"/>
+									<listOptionValue builtIn="false" value="__FLT_EPSILON__=1.19209290e-7F"/>
+									<listOptionValue builtIn="false" value="__FLT_DENORM_MIN__=1.40129846e-45F"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__DBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX__=1.7976931348623157e+308"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN__=2.2250738585072014e-308"/>
+									<listOptionValue builtIn="false" value="__DBL_EPSILON__=2.2204460492503131e-16"/>
+									<listOptionValue builtIn="false" value="__DBL_DENORM_MIN__=4.9406564584124654e-324"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__LDBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DECIMAL_DIG__=17"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX__=1.7976931348623157e+308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN__=2.2250738585072014e-308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_EPSILON__=2.2204460492503131e-16L"/>
+									<listOptionValue builtIn="false" value="__LDBL_DENORM_MIN__=4.9406564584124654e-324L"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DEC32_MANT_DIG__=7"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN_EXP__=(-95)"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX_EXP__=96"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN__=1E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX__=9.999999E96DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_EPSILON__=1E-6DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_DEN__=0.000001E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__=16"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN_EXP__=(-383)"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX_EXP__=384"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN__=1E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX__=9.999999999999999E384DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_EPSILON__=1E-15DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_DEN__=0.000000000000001E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC128_MANT_DIG__=34"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN_EXP__=(-6143)"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX_EXP__=6144"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN__=1E-6143DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX__=9.999999999999999999999999999999999E6144DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_EPSILON__=1E-33DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_DEN__=0.000000000000000000000000000000001E-6143DL"/>
+									<listOptionValue builtIn="false" value="__REGISTER_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__USER_LABEL_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__VERSION__=&quot;4.2.1"/>
+									<listOptionValue builtIn="false" value="__GNUC_GNU_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__BLOCKS__=1"/>
+									<listOptionValue builtIn="false" value="__NO_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__FINITE_MATH_ONLY__=0"/>
+									<listOptionValue builtIn="false" value="__ELF__=1"/>
+									<listOptionValue builtIn="false" value="__XCC_HAVE_FLOAT__=1"/>
+									<listOptionValue builtIn="false" value="__cplusplus=1"/>
+									<listOptionValue builtIn="false" value="__GNUG__=4"/>
+									<listOptionValue builtIn="false" value="__GXX_WEAK__=1"/>
+									<listOptionValue builtIn="false" value="__DEPRECATED=1"/>
+									<listOptionValue builtIn="false" value="__EXCEPTIONS=1"/>
+									<listOptionValue builtIn="false" value="__WCHAR_UNSIGNED__=1"/>
+								</option>
+
+                                <option id = "com.xmos.c.compiler.option.include.paths.6667009" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/gcc&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1/xcore-xmos-elf&quot;' />
-                                    
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
-                                <inputType id = "com.xmos.cdt.xc.compiler.input.6667009" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
-                                <option id = "gnu.c.compiler.option.include.paths.76694382" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                                <inputType id = "com.xmos.cdt.xc.compiler.input.76694382" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
+                                <option id = "gnu.c.compiler.option.include.paths.21653154" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.xc.compiler.base.21653154" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.77449852" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.xc.compiler.base.77449852" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.27203684" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.27203684" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.11734108" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.c.compiler.base.11734108" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.7242474" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.c.compiler.base.7242474" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.33040232" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.33040232" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.21778819" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.cpp.compiler.base.21778819" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.8311451" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.cpp.compiler.base.8311451" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.84368980" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.84368980" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.79311961" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.core.assembler.base.79311961" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.19250497" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.core.assembler.base.19250497" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.69758499" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.69758499" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.99744281" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_simple_demo}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
                             </tool>
 
                         </toolChain>
                     </folderInfo>
+                    <sourceEntries>
+                        <entry excluding=".build_*" flags="VALUE_WORKSPACE_PATH|RESOLVED"
+                    kind="sourcePath" name="" />
+                    </sourceEntries>
                 </configuration>
             </storageModule>
             <storageModule moduleId="scannerConfiguration">
@@ -184,6 +339,6 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
     </storageModule>
     <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-        <project id = "app_i2c_simple_demo.null.99744281" name="app_i2c_simple_demo" />
+        <project id = "app_i2c_simple_demo.null.21589597" name="app_i2c_simple_demo" />
     </storageModule>
 </cproject>
diff --git a/app_i2c_simple_demo/.xproject b/app_i2c_simple_demo/.xproject
index cb6adf6..87b587b 100644
--- a/app_i2c_simple_demo/.xproject
+++ b/app_i2c_simple_demo/.xproject
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-000072-SW</partnum></xproject>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-001898-SM</partnum></xproject>
\ No newline at end of file
diff --git a/app_i2c_single_port_demo/.cproject b/app_i2c_single_port_demo/.cproject
index 61e21b0..2b64016 100644
--- a/app_i2c_single_port_demo/.cproject
+++ b/app_i2c_single_port_demo/.cproject
@@ -45,53 +45,208 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.23943499" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.include.paths.75292562" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
+	<option id = "com.xmos.c.compiler.option.defined.symbols.75292562" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
+									<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
+									<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__WCHAR_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__STDC_HOSTED__=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_YEAR=11"/>
+									<listOptionValue builtIn="false" value="__PTRDIFF_TYPE__=int"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MAJOR=1111"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MINOR=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MONTH=11"/>
+									<listOptionValue builtIn="false" value="__CHAR_UNSIGNED__=1"/>
+									<listOptionValue builtIn="false" value="__MCPP=2"/>
+									<listOptionValue builtIn="false" value="__XC__=1"/>
+									<listOptionValue builtIn="false" value="__XS1B__=1"/>
+									<listOptionValue builtIn="false" value="__INT_MAX__=2147483647"/>
+									<listOptionValue builtIn="false" value="__LONG_MAX__=2147483647L"/>
+									<listOptionValue builtIn="false" value="__STDC__=1"/>
+									<listOptionValue builtIn="false" value="__GNUC__=4"/>
+									<listOptionValue builtIn="false" value="__GNUC_MINOR__=2"/>
+									<listOptionValue builtIn="false" value="__GNUC_PATCHLEVEL__=1"/>
+									<listOptionValue builtIn="false" value="__llvm__=1"/>
+									<listOptionValue builtIn="false" value="__WINT_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__INTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__UINTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__GXX_ABI_VERSION=1002"/>
+									<listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__WCHAR_MAX__=255U"/>
+									<listOptionValue builtIn="false" value="__CHAR_BIT__=8"/>
+									<listOptionValue builtIn="false" value="__INTMAX_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__=0"/>
+									<listOptionValue builtIn="false" value="__DEC_EVAL_METHOD__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_RADIX__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_MANT_DIG__=24"/>
+									<listOptionValue builtIn="false" value="__FLT_DIG__=6"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_EXP__=(-125)"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_10_EXP__=(-37)"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_EXP__=128"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_10_EXP__=38"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX__=3.40282347e+38F"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN__=1.17549435e-38F"/>
+									<listOptionValue builtIn="false" value="__FLT_EPSILON__=1.19209290e-7F"/>
+									<listOptionValue builtIn="false" value="__FLT_DENORM_MIN__=1.40129846e-45F"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__DBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX__=1.7976931348623157e+308"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN__=2.2250738585072014e-308"/>
+									<listOptionValue builtIn="false" value="__DBL_EPSILON__=2.2204460492503131e-16"/>
+									<listOptionValue builtIn="false" value="__DBL_DENORM_MIN__=4.9406564584124654e-324"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__LDBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DECIMAL_DIG__=17"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX__=1.7976931348623157e+308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN__=2.2250738585072014e-308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_EPSILON__=2.2204460492503131e-16L"/>
+									<listOptionValue builtIn="false" value="__LDBL_DENORM_MIN__=4.9406564584124654e-324L"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DEC32_MANT_DIG__=7"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN_EXP__=(-95)"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX_EXP__=96"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN__=1E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX__=9.999999E96DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_EPSILON__=1E-6DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_DEN__=0.000001E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__=16"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN_EXP__=(-383)"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX_EXP__=384"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN__=1E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX__=9.999999999999999E384DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_EPSILON__=1E-15DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_DEN__=0.000000000000001E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC128_MANT_DIG__=34"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN_EXP__=(-6143)"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX_EXP__=6144"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN__=1E-6143DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX__=9.999999999999999999999999999999999E6144DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_EPSILON__=1E-33DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_DEN__=0.000000000000000000000000000000001E-6143DL"/>
+									<listOptionValue builtIn="false" value="__REGISTER_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__USER_LABEL_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__VERSION__=&quot;4.2.1"/>
+									<listOptionValue builtIn="false" value="__GNUC_GNU_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__BLOCKS__=1"/>
+									<listOptionValue builtIn="false" value="__NO_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__FINITE_MATH_ONLY__=0"/>
+									<listOptionValue builtIn="false" value="__ELF__=1"/>
+									<listOptionValue builtIn="false" value="__XCC_HAVE_FLOAT__=1"/>
+									<listOptionValue builtIn="false" value="__cplusplus=1"/>
+									<listOptionValue builtIn="false" value="__GNUG__=4"/>
+									<listOptionValue builtIn="false" value="__GXX_WEAK__=1"/>
+									<listOptionValue builtIn="false" value="__DEPRECATED=1"/>
+									<listOptionValue builtIn="false" value="__EXCEPTIONS=1"/>
+									<listOptionValue builtIn="false" value="__WCHAR_UNSIGNED__=1"/>
+								</option>
+
+                                <option id = "com.xmos.c.compiler.option.include.paths.52843646" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/gcc&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1/xcore-xmos-elf&quot;' />
-                                    
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo}&quot;' />
+
                                 </option>
-                                <inputType id = "com.xmos.cdt.xc.compiler.input.52843646" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
-                                <option id = "gnu.c.compiler.option.include.paths.63693409" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                                <inputType id = "com.xmos.cdt.xc.compiler.input.63693409" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
+                                <option id = "gnu.c.compiler.option.include.paths.14206048" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.xc.compiler.base.14206048" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.77212271" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.xc.compiler.base.77212271" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.98075724" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.98075724" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.17360413" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.c.compiler.base.17360413" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.51198539" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.c.compiler.base.51198539" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.2159369" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.2159369" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.88722189" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.cpp.compiler.base.88722189" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.80227701" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.cpp.compiler.base.80227701" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.81069995" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.81069995" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.63902850" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.core.assembler.base.63902850" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.45770051" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.core.assembler.base.45770051" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.48516536" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.48516536" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.20601458" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_i2c_single_port_demo}&quot;' />
+
                                 </option>
                             </tool>
 
                         </toolChain>
                     </folderInfo>
+                    <sourceEntries>
+                        <entry excluding=".build_*" flags="VALUE_WORKSPACE_PATH|RESOLVED"
+                    kind="sourcePath" name="" />
+                    </sourceEntries>
                 </configuration>
             </storageModule>
             <storageModule moduleId="scannerConfiguration">
@@ -184,6 +339,6 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
     </storageModule>
     <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-        <project id = "app_i2c_single_port_demo.null.20601458" name="app_i2c_single_port_demo" />
+        <project id = "app_i2c_single_port_demo.null.32645726" name="app_i2c_single_port_demo" />
     </storageModule>
 </cproject>
diff --git a/app_i2c_single_port_demo/.xproject b/app_i2c_single_port_demo/.xproject
index cb6adf6..87b587b 100644
--- a/app_i2c_single_port_demo/.xproject
+++ b/app_i2c_single_port_demo/.xproject
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-000072-SW</partnum></xproject>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-001898-SM</partnum></xproject>
\ No newline at end of file
diff --git a/app_i2c_single_port_demo/README.rst b/app_i2c_single_port_demo/README.rst
new file mode 100644
index 0000000..3e0884f
--- /dev/null
+++ b/app_i2c_single_port_demo/README.rst
@@ -0,0 +1,9 @@
+<Add title here>
+================
+
+:scope: <Put one of Roadmap, Example, Early Development or General Use>
+:description: <Add one line here>
+:keywords: <Add comma separated list of keywords>
+:boards: <Add comma separated list of supported boards>
+
+<Add description of software block>
diff --git a/app_xdk_xai_i2c_test/.cproject b/app_xdk_xai_i2c_test/.cproject
index c2ee56e..c0431f9 100644
--- a/app_xdk_xai_i2c_test/.cproject
+++ b/app_xdk_xai_i2c_test/.cproject
@@ -45,53 +45,278 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.59457514" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.include.paths.97590734" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
+	<option id = "com.xmos.c.compiler.option.defined.symbols.97590734" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
+									<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
+									<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__WCHAR_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__STDC_HOSTED__=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_YEAR=11"/>
+									<listOptionValue builtIn="false" value="__PTRDIFF_TYPE__=int"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MAJOR=1111"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MINOR=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MONTH=11"/>
+									<listOptionValue builtIn="false" value="__CHAR_UNSIGNED__=1"/>
+									<listOptionValue builtIn="false" value="__MCPP=2"/>
+									<listOptionValue builtIn="false" value="__XC__=1"/>
+									<listOptionValue builtIn="false" value="__XS1B__=1"/>
+									<listOptionValue builtIn="false" value="__INT_MAX__=2147483647"/>
+									<listOptionValue builtIn="false" value="__LONG_MAX__=2147483647L"/>
+									<listOptionValue builtIn="false" value="__STDC__=1"/>
+									<listOptionValue builtIn="false" value="__GNUC__=4"/>
+									<listOptionValue builtIn="false" value="__GNUC_MINOR__=2"/>
+									<listOptionValue builtIn="false" value="__GNUC_PATCHLEVEL__=1"/>
+									<listOptionValue builtIn="false" value="__llvm__=1"/>
+									<listOptionValue builtIn="false" value="__WINT_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__INTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__UINTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__GXX_ABI_VERSION=1002"/>
+									<listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__WCHAR_MAX__=255U"/>
+									<listOptionValue builtIn="false" value="__CHAR_BIT__=8"/>
+									<listOptionValue builtIn="false" value="__INTMAX_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__=0"/>
+									<listOptionValue builtIn="false" value="__DEC_EVAL_METHOD__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_RADIX__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_MANT_DIG__=24"/>
+									<listOptionValue builtIn="false" value="__FLT_DIG__=6"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_EXP__=(-125)"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_10_EXP__=(-37)"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_EXP__=128"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_10_EXP__=38"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX__=3.40282347e+38F"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN__=1.17549435e-38F"/>
+									<listOptionValue builtIn="false" value="__FLT_EPSILON__=1.19209290e-7F"/>
+									<listOptionValue builtIn="false" value="__FLT_DENORM_MIN__=1.40129846e-45F"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__DBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX__=1.7976931348623157e+308"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN__=2.2250738585072014e-308"/>
+									<listOptionValue builtIn="false" value="__DBL_EPSILON__=2.2204460492503131e-16"/>
+									<listOptionValue builtIn="false" value="__DBL_DENORM_MIN__=4.9406564584124654e-324"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__LDBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DECIMAL_DIG__=17"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX__=1.7976931348623157e+308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN__=2.2250738585072014e-308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_EPSILON__=2.2204460492503131e-16L"/>
+									<listOptionValue builtIn="false" value="__LDBL_DENORM_MIN__=4.9406564584124654e-324L"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DEC32_MANT_DIG__=7"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN_EXP__=(-95)"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX_EXP__=96"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN__=1E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX__=9.999999E96DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_EPSILON__=1E-6DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_DEN__=0.000001E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__=16"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN_EXP__=(-383)"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX_EXP__=384"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN__=1E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX__=9.999999999999999E384DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_EPSILON__=1E-15DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_DEN__=0.000000000000001E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC128_MANT_DIG__=34"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN_EXP__=(-6143)"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX_EXP__=6144"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN__=1E-6143DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX__=9.999999999999999999999999999999999E6144DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_EPSILON__=1E-33DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_DEN__=0.000000000000000000000000000000001E-6143DL"/>
+									<listOptionValue builtIn="false" value="__REGISTER_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__USER_LABEL_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__VERSION__=&quot;4.2.1"/>
+									<listOptionValue builtIn="false" value="__GNUC_GNU_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__BLOCKS__=1"/>
+									<listOptionValue builtIn="false" value="__NO_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__FINITE_MATH_ONLY__=0"/>
+									<listOptionValue builtIn="false" value="__ELF__=1"/>
+									<listOptionValue builtIn="false" value="__XCC_HAVE_FLOAT__=1"/>
+									<listOptionValue builtIn="false" value="__cplusplus=1"/>
+									<listOptionValue builtIn="false" value="__GNUG__=4"/>
+									<listOptionValue builtIn="false" value="__GXX_WEAK__=1"/>
+									<listOptionValue builtIn="false" value="__DEPRECATED=1"/>
+									<listOptionValue builtIn="false" value="__EXCEPTIONS=1"/>
+									<listOptionValue builtIn="false" value="__WCHAR_UNSIGNED__=1"/>
+								</option>
+
+                                <option id = "com.xmos.c.compiler.option.include.paths.55160201" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/gcc&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1/xcore-xmos-elf&quot;' />
-                                    
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/bin}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/fake_inc}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
-                                <inputType id = "com.xmos.cdt.xc.compiler.input.55160201" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
-                                <option id = "gnu.c.compiler.option.include.paths.55422767" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                                <inputType id = "com.xmos.cdt.xc.compiler.input.55422767" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
+                                <option id = "gnu.c.compiler.option.include.paths.61093803" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/bin}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/fake_inc}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.xc.compiler.base.61093803" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.53380591" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.xc.compiler.base.53380591" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.78073927" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/bin}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/fake_inc}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.78073927" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.84493335" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/bin}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/fake_inc}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.c.compiler.base.84493335" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.39387384" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.c.compiler.base.39387384" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.62942135" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/bin}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/fake_inc}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.62942135" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.11113741" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/bin}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/fake_inc}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.cpp.compiler.base.11113741" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.72754514" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.cpp.compiler.base.72754514" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.28287365" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/bin}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/fake_inc}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.28287365" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.3177697" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/bin}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/fake_inc}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.core.assembler.base.3177697" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.28447923" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.core.assembler.base.28447923" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.7619410" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/bin}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/fake_inc}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.7619410" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.51110658" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/bin}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/fake_inc}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/app_xdk_xai_i2c_test/.build/sc_i2c/module_i2c}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
                             </tool>
 
                         </toolChain>
                     </folderInfo>
+                    <sourceEntries>
+                        <entry excluding=".build_*" flags="VALUE_WORKSPACE_PATH|RESOLVED"
+                    kind="sourcePath" name="" />
+                    </sourceEntries>
                 </configuration>
             </storageModule>
             <storageModule moduleId="scannerConfiguration">
@@ -184,6 +409,6 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
     </storageModule>
     <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-        <project id = "app_xdk_xai_i2c_test.null.51110658" name="app_xdk_xai_i2c_test" />
+        <project id = "app_xdk_xai_i2c_test.null.20615359" name="app_xdk_xai_i2c_test" />
     </storageModule>
 </cproject>
diff --git a/app_xdk_xai_i2c_test/.xproject b/app_xdk_xai_i2c_test/.xproject
index cb6adf6..87b587b 100644
--- a/app_xdk_xai_i2c_test/.xproject
+++ b/app_xdk_xai_i2c_test/.xproject
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-000072-SW</partnum></xproject>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-001898-SM</partnum></xproject>
\ No newline at end of file
diff --git a/module_i2c/.cproject b/module_i2c/.cproject
index 8ed7f23..494dee8 100644
--- a/module_i2c/.cproject
+++ b/module_i2c/.cproject
@@ -45,53 +45,188 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.58931170" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.include.paths.93527159" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
+	<option id = "com.xmos.c.compiler.option.defined.symbols.93527159" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
+									<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
+									<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__WCHAR_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__STDC_HOSTED__=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_YEAR=11"/>
+									<listOptionValue builtIn="false" value="__PTRDIFF_TYPE__=int"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MAJOR=1111"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MINOR=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MONTH=11"/>
+									<listOptionValue builtIn="false" value="__CHAR_UNSIGNED__=1"/>
+									<listOptionValue builtIn="false" value="__MCPP=2"/>
+									<listOptionValue builtIn="false" value="__XC__=1"/>
+									<listOptionValue builtIn="false" value="__XS1B__=1"/>
+									<listOptionValue builtIn="false" value="__INT_MAX__=2147483647"/>
+									<listOptionValue builtIn="false" value="__LONG_MAX__=2147483647L"/>
+									<listOptionValue builtIn="false" value="__STDC__=1"/>
+									<listOptionValue builtIn="false" value="__GNUC__=4"/>
+									<listOptionValue builtIn="false" value="__GNUC_MINOR__=2"/>
+									<listOptionValue builtIn="false" value="__GNUC_PATCHLEVEL__=1"/>
+									<listOptionValue builtIn="false" value="__llvm__=1"/>
+									<listOptionValue builtIn="false" value="__WINT_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__INTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__UINTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__GXX_ABI_VERSION=1002"/>
+									<listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__WCHAR_MAX__=255U"/>
+									<listOptionValue builtIn="false" value="__CHAR_BIT__=8"/>
+									<listOptionValue builtIn="false" value="__INTMAX_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__=0"/>
+									<listOptionValue builtIn="false" value="__DEC_EVAL_METHOD__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_RADIX__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_MANT_DIG__=24"/>
+									<listOptionValue builtIn="false" value="__FLT_DIG__=6"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_EXP__=(-125)"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_10_EXP__=(-37)"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_EXP__=128"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_10_EXP__=38"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX__=3.40282347e+38F"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN__=1.17549435e-38F"/>
+									<listOptionValue builtIn="false" value="__FLT_EPSILON__=1.19209290e-7F"/>
+									<listOptionValue builtIn="false" value="__FLT_DENORM_MIN__=1.40129846e-45F"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__DBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX__=1.7976931348623157e+308"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN__=2.2250738585072014e-308"/>
+									<listOptionValue builtIn="false" value="__DBL_EPSILON__=2.2204460492503131e-16"/>
+									<listOptionValue builtIn="false" value="__DBL_DENORM_MIN__=4.9406564584124654e-324"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__LDBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DECIMAL_DIG__=17"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX__=1.7976931348623157e+308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN__=2.2250738585072014e-308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_EPSILON__=2.2204460492503131e-16L"/>
+									<listOptionValue builtIn="false" value="__LDBL_DENORM_MIN__=4.9406564584124654e-324L"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DEC32_MANT_DIG__=7"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN_EXP__=(-95)"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX_EXP__=96"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN__=1E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX__=9.999999E96DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_EPSILON__=1E-6DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_DEN__=0.000001E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__=16"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN_EXP__=(-383)"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX_EXP__=384"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN__=1E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX__=9.999999999999999E384DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_EPSILON__=1E-15DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_DEN__=0.000000000000001E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC128_MANT_DIG__=34"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN_EXP__=(-6143)"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX_EXP__=6144"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN__=1E-6143DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX__=9.999999999999999999999999999999999E6144DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_EPSILON__=1E-33DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_DEN__=0.000000000000000000000000000000001E-6143DL"/>
+									<listOptionValue builtIn="false" value="__REGISTER_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__USER_LABEL_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__VERSION__=&quot;4.2.1"/>
+									<listOptionValue builtIn="false" value="__GNUC_GNU_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__BLOCKS__=1"/>
+									<listOptionValue builtIn="false" value="__NO_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__FINITE_MATH_ONLY__=0"/>
+									<listOptionValue builtIn="false" value="__ELF__=1"/>
+									<listOptionValue builtIn="false" value="__XCC_HAVE_FLOAT__=1"/>
+									<listOptionValue builtIn="false" value="__cplusplus=1"/>
+									<listOptionValue builtIn="false" value="__GNUG__=4"/>
+									<listOptionValue builtIn="false" value="__GXX_WEAK__=1"/>
+									<listOptionValue builtIn="false" value="__DEPRECATED=1"/>
+									<listOptionValue builtIn="false" value="__EXCEPTIONS=1"/>
+									<listOptionValue builtIn="false" value="__WCHAR_UNSIGNED__=1"/>
+								</option>
+
+                                <option id = "com.xmos.c.compiler.option.include.paths.84187337" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/gcc&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1/xcore-xmos-elf&quot;' />
-                                    
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
-                                <inputType id = "com.xmos.cdt.xc.compiler.input.84187337" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
-                                <option id = "gnu.c.compiler.option.include.paths.16311384" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                                <inputType id = "com.xmos.cdt.xc.compiler.input.16311384" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
+                                <option id = "gnu.c.compiler.option.include.paths.12348790" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.xc.compiler.base.12348790" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.63924034" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.xc.compiler.base.63924034" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.98399269" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.98399269" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.92597579" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.c.compiler.base.92597579" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.33121402" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.c.compiler.base.33121402" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.94605970" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.94605970" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.95450246" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.cpp.compiler.base.95450246" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.37999323" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.cpp.compiler.base.37999323" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.24469169" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.24469169" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.24433230" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.core.assembler.base.24433230" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.67222440" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.core.assembler.base.67222440" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.35951135" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.35951135" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.93600106" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c}&quot;' />
+
                                 </option>
                             </tool>
 
                         </toolChain>
                     </folderInfo>
+                    <sourceEntries>
+                        <entry excluding=".build_*" flags="VALUE_WORKSPACE_PATH|RESOLVED"
+                    kind="sourcePath" name="" />
+                    </sourceEntries>
                 </configuration>
             </storageModule>
             <storageModule moduleId="scannerConfiguration">
@@ -184,6 +319,6 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
     </storageModule>
     <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-        <project id = "module_i2c.null.93600106" name="module_i2c" />
+        <project id = "module_i2c.null.66673222" name="module_i2c" />
     </storageModule>
 </cproject>
diff --git a/module_i2c/.xproject b/module_i2c/.xproject
index cb6adf6..87b587b 100644
--- a/module_i2c/.xproject
+++ b/module_i2c/.xproject
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-000072-SW</partnum></xproject>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-001898-SM</partnum></xproject>
\ No newline at end of file
diff --git a/module_i2c_master/.cproject b/module_i2c_master/.cproject
index aa3b124..79a3da2 100644
--- a/module_i2c_master/.cproject
+++ b/module_i2c_master/.cproject
@@ -45,53 +45,188 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.94253100" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.include.paths.34287665" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
+	<option id = "com.xmos.c.compiler.option.defined.symbols.34287665" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
+									<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
+									<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__WCHAR_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__STDC_HOSTED__=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_YEAR=11"/>
+									<listOptionValue builtIn="false" value="__PTRDIFF_TYPE__=int"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MAJOR=1111"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MINOR=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MONTH=11"/>
+									<listOptionValue builtIn="false" value="__CHAR_UNSIGNED__=1"/>
+									<listOptionValue builtIn="false" value="__MCPP=2"/>
+									<listOptionValue builtIn="false" value="__XC__=1"/>
+									<listOptionValue builtIn="false" value="__XS1B__=1"/>
+									<listOptionValue builtIn="false" value="__INT_MAX__=2147483647"/>
+									<listOptionValue builtIn="false" value="__LONG_MAX__=2147483647L"/>
+									<listOptionValue builtIn="false" value="__STDC__=1"/>
+									<listOptionValue builtIn="false" value="__GNUC__=4"/>
+									<listOptionValue builtIn="false" value="__GNUC_MINOR__=2"/>
+									<listOptionValue builtIn="false" value="__GNUC_PATCHLEVEL__=1"/>
+									<listOptionValue builtIn="false" value="__llvm__=1"/>
+									<listOptionValue builtIn="false" value="__WINT_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__INTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__UINTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__GXX_ABI_VERSION=1002"/>
+									<listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__WCHAR_MAX__=255U"/>
+									<listOptionValue builtIn="false" value="__CHAR_BIT__=8"/>
+									<listOptionValue builtIn="false" value="__INTMAX_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__=0"/>
+									<listOptionValue builtIn="false" value="__DEC_EVAL_METHOD__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_RADIX__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_MANT_DIG__=24"/>
+									<listOptionValue builtIn="false" value="__FLT_DIG__=6"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_EXP__=(-125)"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_10_EXP__=(-37)"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_EXP__=128"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_10_EXP__=38"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX__=3.40282347e+38F"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN__=1.17549435e-38F"/>
+									<listOptionValue builtIn="false" value="__FLT_EPSILON__=1.19209290e-7F"/>
+									<listOptionValue builtIn="false" value="__FLT_DENORM_MIN__=1.40129846e-45F"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__DBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX__=1.7976931348623157e+308"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN__=2.2250738585072014e-308"/>
+									<listOptionValue builtIn="false" value="__DBL_EPSILON__=2.2204460492503131e-16"/>
+									<listOptionValue builtIn="false" value="__DBL_DENORM_MIN__=4.9406564584124654e-324"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__LDBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DECIMAL_DIG__=17"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX__=1.7976931348623157e+308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN__=2.2250738585072014e-308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_EPSILON__=2.2204460492503131e-16L"/>
+									<listOptionValue builtIn="false" value="__LDBL_DENORM_MIN__=4.9406564584124654e-324L"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DEC32_MANT_DIG__=7"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN_EXP__=(-95)"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX_EXP__=96"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN__=1E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX__=9.999999E96DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_EPSILON__=1E-6DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_DEN__=0.000001E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__=16"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN_EXP__=(-383)"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX_EXP__=384"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN__=1E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX__=9.999999999999999E384DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_EPSILON__=1E-15DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_DEN__=0.000000000000001E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC128_MANT_DIG__=34"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN_EXP__=(-6143)"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX_EXP__=6144"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN__=1E-6143DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX__=9.999999999999999999999999999999999E6144DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_EPSILON__=1E-33DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_DEN__=0.000000000000000000000000000000001E-6143DL"/>
+									<listOptionValue builtIn="false" value="__REGISTER_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__USER_LABEL_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__VERSION__=&quot;4.2.1"/>
+									<listOptionValue builtIn="false" value="__GNUC_GNU_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__BLOCKS__=1"/>
+									<listOptionValue builtIn="false" value="__NO_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__FINITE_MATH_ONLY__=0"/>
+									<listOptionValue builtIn="false" value="__ELF__=1"/>
+									<listOptionValue builtIn="false" value="__XCC_HAVE_FLOAT__=1"/>
+									<listOptionValue builtIn="false" value="__cplusplus=1"/>
+									<listOptionValue builtIn="false" value="__GNUG__=4"/>
+									<listOptionValue builtIn="false" value="__GXX_WEAK__=1"/>
+									<listOptionValue builtIn="false" value="__DEPRECATED=1"/>
+									<listOptionValue builtIn="false" value="__EXCEPTIONS=1"/>
+									<listOptionValue builtIn="false" value="__WCHAR_UNSIGNED__=1"/>
+								</option>
+
+                                <option id = "com.xmos.c.compiler.option.include.paths.81053981" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/gcc&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1/xcore-xmos-elf&quot;' />
-                                    
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
-                                <inputType id = "com.xmos.cdt.xc.compiler.input.81053981" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
-                                <option id = "gnu.c.compiler.option.include.paths.12069228" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                                <inputType id = "com.xmos.cdt.xc.compiler.input.12069228" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
+                                <option id = "gnu.c.compiler.option.include.paths.79551909" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.xc.compiler.base.79551909" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.29343524" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.xc.compiler.base.29343524" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.99372866" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.99372866" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.35140421" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.c.compiler.base.35140421" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.96120021" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.c.compiler.base.96120021" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.9333269" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.9333269" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.22903255" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.cpp.compiler.base.22903255" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.11820143" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.cpp.compiler.base.11820143" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.23567270" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.23567270" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.11622989" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.core.assembler.base.11622989" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.90441492" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.core.assembler.base.90441492" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.18314741" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.18314741" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.34943764" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_master}&quot;' />
+
                                 </option>
                             </tool>
 
                         </toolChain>
                     </folderInfo>
+                    <sourceEntries>
+                        <entry excluding=".build_*" flags="VALUE_WORKSPACE_PATH|RESOLVED"
+                    kind="sourcePath" name="" />
+                    </sourceEntries>
                 </configuration>
             </storageModule>
             <storageModule moduleId="scannerConfiguration">
@@ -184,6 +319,6 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
     </storageModule>
     <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-        <project id = "module_i2c_master.null.34943764" name="module_i2c_master" />
+        <project id = "module_i2c_master.null.11162195" name="module_i2c_master" />
     </storageModule>
 </cproject>
diff --git a/module_i2c_master/.xproject b/module_i2c_master/.xproject
index cb6adf6..87b587b 100644
--- a/module_i2c_master/.xproject
+++ b/module_i2c_master/.xproject
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-000072-SW</partnum></xproject>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-001898-SM</partnum></xproject>
\ No newline at end of file
diff --git a/module_i2c_simple/.cproject b/module_i2c_simple/.cproject
index e710123..db3df42 100644
--- a/module_i2c_simple/.cproject
+++ b/module_i2c_simple/.cproject
@@ -45,53 +45,188 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.74598775" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.include.paths.18327223" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
+	<option id = "com.xmos.c.compiler.option.defined.symbols.18327223" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
+									<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
+									<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__WCHAR_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__STDC_HOSTED__=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_YEAR=11"/>
+									<listOptionValue builtIn="false" value="__PTRDIFF_TYPE__=int"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MAJOR=1111"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MINOR=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MONTH=11"/>
+									<listOptionValue builtIn="false" value="__CHAR_UNSIGNED__=1"/>
+									<listOptionValue builtIn="false" value="__MCPP=2"/>
+									<listOptionValue builtIn="false" value="__XC__=1"/>
+									<listOptionValue builtIn="false" value="__XS1B__=1"/>
+									<listOptionValue builtIn="false" value="__INT_MAX__=2147483647"/>
+									<listOptionValue builtIn="false" value="__LONG_MAX__=2147483647L"/>
+									<listOptionValue builtIn="false" value="__STDC__=1"/>
+									<listOptionValue builtIn="false" value="__GNUC__=4"/>
+									<listOptionValue builtIn="false" value="__GNUC_MINOR__=2"/>
+									<listOptionValue builtIn="false" value="__GNUC_PATCHLEVEL__=1"/>
+									<listOptionValue builtIn="false" value="__llvm__=1"/>
+									<listOptionValue builtIn="false" value="__WINT_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__INTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__UINTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__GXX_ABI_VERSION=1002"/>
+									<listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__WCHAR_MAX__=255U"/>
+									<listOptionValue builtIn="false" value="__CHAR_BIT__=8"/>
+									<listOptionValue builtIn="false" value="__INTMAX_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__=0"/>
+									<listOptionValue builtIn="false" value="__DEC_EVAL_METHOD__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_RADIX__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_MANT_DIG__=24"/>
+									<listOptionValue builtIn="false" value="__FLT_DIG__=6"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_EXP__=(-125)"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_10_EXP__=(-37)"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_EXP__=128"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_10_EXP__=38"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX__=3.40282347e+38F"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN__=1.17549435e-38F"/>
+									<listOptionValue builtIn="false" value="__FLT_EPSILON__=1.19209290e-7F"/>
+									<listOptionValue builtIn="false" value="__FLT_DENORM_MIN__=1.40129846e-45F"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__DBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX__=1.7976931348623157e+308"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN__=2.2250738585072014e-308"/>
+									<listOptionValue builtIn="false" value="__DBL_EPSILON__=2.2204460492503131e-16"/>
+									<listOptionValue builtIn="false" value="__DBL_DENORM_MIN__=4.9406564584124654e-324"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__LDBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DECIMAL_DIG__=17"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX__=1.7976931348623157e+308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN__=2.2250738585072014e-308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_EPSILON__=2.2204460492503131e-16L"/>
+									<listOptionValue builtIn="false" value="__LDBL_DENORM_MIN__=4.9406564584124654e-324L"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DEC32_MANT_DIG__=7"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN_EXP__=(-95)"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX_EXP__=96"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN__=1E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX__=9.999999E96DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_EPSILON__=1E-6DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_DEN__=0.000001E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__=16"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN_EXP__=(-383)"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX_EXP__=384"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN__=1E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX__=9.999999999999999E384DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_EPSILON__=1E-15DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_DEN__=0.000000000000001E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC128_MANT_DIG__=34"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN_EXP__=(-6143)"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX_EXP__=6144"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN__=1E-6143DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX__=9.999999999999999999999999999999999E6144DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_EPSILON__=1E-33DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_DEN__=0.000000000000000000000000000000001E-6143DL"/>
+									<listOptionValue builtIn="false" value="__REGISTER_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__USER_LABEL_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__VERSION__=&quot;4.2.1"/>
+									<listOptionValue builtIn="false" value="__GNUC_GNU_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__BLOCKS__=1"/>
+									<listOptionValue builtIn="false" value="__NO_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__FINITE_MATH_ONLY__=0"/>
+									<listOptionValue builtIn="false" value="__ELF__=1"/>
+									<listOptionValue builtIn="false" value="__XCC_HAVE_FLOAT__=1"/>
+									<listOptionValue builtIn="false" value="__cplusplus=1"/>
+									<listOptionValue builtIn="false" value="__GNUG__=4"/>
+									<listOptionValue builtIn="false" value="__GXX_WEAK__=1"/>
+									<listOptionValue builtIn="false" value="__DEPRECATED=1"/>
+									<listOptionValue builtIn="false" value="__EXCEPTIONS=1"/>
+									<listOptionValue builtIn="false" value="__WCHAR_UNSIGNED__=1"/>
+								</option>
+
+                                <option id = "com.xmos.c.compiler.option.include.paths.95666984" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/gcc&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1/xcore-xmos-elf&quot;' />
-                                    
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
-                                <inputType id = "com.xmos.cdt.xc.compiler.input.95666984" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
-                                <option id = "gnu.c.compiler.option.include.paths.67796448" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                                <inputType id = "com.xmos.cdt.xc.compiler.input.67796448" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
+                                <option id = "gnu.c.compiler.option.include.paths.17330606" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.xc.compiler.base.17330606" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.34257134" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.xc.compiler.base.34257134" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.55466874" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.55466874" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.48660622" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.c.compiler.base.48660622" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.61154035" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.c.compiler.base.61154035" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.87524991" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.87524991" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.63250866" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.cpp.compiler.base.63250866" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.82690133" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.cpp.compiler.base.82690133" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.52119087" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.52119087" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.8865247" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.core.assembler.base.8865247" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.43320940" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.core.assembler.base.43320940" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.13642216" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.13642216" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.11547715" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple/src}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_simple}&quot;' />
+
                                 </option>
                             </tool>
 
                         </toolChain>
                     </folderInfo>
+                    <sourceEntries>
+                        <entry excluding=".build_*" flags="VALUE_WORKSPACE_PATH|RESOLVED"
+                    kind="sourcePath" name="" />
+                    </sourceEntries>
                 </configuration>
             </storageModule>
             <storageModule moduleId="scannerConfiguration">
@@ -184,6 +319,6 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
     </storageModule>
     <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-        <project id = "module_i2c_simple.null.11547715" name="module_i2c_simple" />
+        <project id = "module_i2c_simple.null.26809722" name="module_i2c_simple" />
     </storageModule>
 </cproject>
diff --git a/module_i2c_simple/.xproject b/module_i2c_simple/.xproject
index cb6adf6..87b587b 100644
--- a/module_i2c_simple/.xproject
+++ b/module_i2c_simple/.xproject
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-000072-SW</partnum></xproject>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-001898-SM</partnum></xproject>
\ No newline at end of file
diff --git a/module_i2c_single_port/.cproject b/module_i2c_single_port/.cproject
index db3a221..8137b58 100644
--- a/module_i2c_single_port/.cproject
+++ b/module_i2c_single_port/.cproject
@@ -45,53 +45,188 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.76008167" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.include.paths.60233757" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
+	<option id = "com.xmos.c.compiler.option.defined.symbols.60233757" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
+									<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
+									<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__WCHAR_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__STDC_HOSTED__=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_YEAR=11"/>
+									<listOptionValue builtIn="false" value="__PTRDIFF_TYPE__=int"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MAJOR=1111"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MINOR=1"/>
+									<listOptionValue builtIn="false" value="XCC_VERSION_MONTH=11"/>
+									<listOptionValue builtIn="false" value="__CHAR_UNSIGNED__=1"/>
+									<listOptionValue builtIn="false" value="__MCPP=2"/>
+									<listOptionValue builtIn="false" value="__XC__=1"/>
+									<listOptionValue builtIn="false" value="__XS1B__=1"/>
+									<listOptionValue builtIn="false" value="__INT_MAX__=2147483647"/>
+									<listOptionValue builtIn="false" value="__LONG_MAX__=2147483647L"/>
+									<listOptionValue builtIn="false" value="__STDC__=1"/>
+									<listOptionValue builtIn="false" value="__GNUC__=4"/>
+									<listOptionValue builtIn="false" value="__GNUC_MINOR__=2"/>
+									<listOptionValue builtIn="false" value="__GNUC_PATCHLEVEL__=1"/>
+									<listOptionValue builtIn="false" value="__llvm__=1"/>
+									<listOptionValue builtIn="false" value="__WINT_TYPE__=unsigned"/>
+									<listOptionValue builtIn="false" value="__INTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__UINTMAX_TYPE__=long"/>
+									<listOptionValue builtIn="false" value="__GXX_ABI_VERSION=1002"/>
+									<listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__WCHAR_MAX__=255U"/>
+									<listOptionValue builtIn="false" value="__CHAR_BIT__=8"/>
+									<listOptionValue builtIn="false" value="__INTMAX_MAX__=9223372036854775807LL"/>
+									<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__=0"/>
+									<listOptionValue builtIn="false" value="__DEC_EVAL_METHOD__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_RADIX__=2"/>
+									<listOptionValue builtIn="false" value="__FLT_MANT_DIG__=24"/>
+									<listOptionValue builtIn="false" value="__FLT_DIG__=6"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_EXP__=(-125)"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN_10_EXP__=(-37)"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_EXP__=128"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX_10_EXP__=38"/>
+									<listOptionValue builtIn="false" value="__FLT_MAX__=3.40282347e+38F"/>
+									<listOptionValue builtIn="false" value="__FLT_MIN__=1.17549435e-38F"/>
+									<listOptionValue builtIn="false" value="__FLT_EPSILON__=1.19209290e-7F"/>
+									<listOptionValue builtIn="false" value="__FLT_DENORM_MIN__=1.40129846e-45F"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__FLT_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__DBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DBL_MAX__=1.7976931348623157e+308"/>
+									<listOptionValue builtIn="false" value="__DBL_MIN__=2.2250738585072014e-308"/>
+									<listOptionValue builtIn="false" value="__DBL_EPSILON__=2.2204460492503131e-16"/>
+									<listOptionValue builtIn="false" value="__DBL_DENORM_MIN__=4.9406564584124654e-324"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__DBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_MANT_DIG__=53"/>
+									<listOptionValue builtIn="false" value="__LDBL_DIG__=15"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_EXP__=(-1021)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN_10_EXP__=(-307)"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_EXP__=1024"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX_10_EXP__=308"/>
+									<listOptionValue builtIn="false" value="__DECIMAL_DIG__=17"/>
+									<listOptionValue builtIn="false" value="__LDBL_MAX__=1.7976931348623157e+308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_MIN__=2.2250738585072014e-308L"/>
+									<listOptionValue builtIn="false" value="__LDBL_EPSILON__=2.2204460492503131e-16L"/>
+									<listOptionValue builtIn="false" value="__LDBL_DENORM_MIN__=4.9406564584124654e-324L"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_DENORM__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_INFINITY__=1"/>
+									<listOptionValue builtIn="false" value="__LDBL_HAS_QUIET_NAN__=1"/>
+									<listOptionValue builtIn="false" value="__DEC32_MANT_DIG__=7"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN_EXP__=(-95)"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX_EXP__=96"/>
+									<listOptionValue builtIn="false" value="__DEC32_MIN__=1E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_MAX__=9.999999E96DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_EPSILON__=1E-6DF"/>
+									<listOptionValue builtIn="false" value="__DEC32_DEN__=0.000001E-95DF"/>
+									<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__=16"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN_EXP__=(-383)"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX_EXP__=384"/>
+									<listOptionValue builtIn="false" value="__DEC64_MIN__=1E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_MAX__=9.999999999999999E384DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_EPSILON__=1E-15DD"/>
+									<listOptionValue builtIn="false" value="__DEC64_DEN__=0.000000000000001E-383DD"/>
+									<listOptionValue builtIn="false" value="__DEC128_MANT_DIG__=34"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN_EXP__=(-6143)"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX_EXP__=6144"/>
+									<listOptionValue builtIn="false" value="__DEC128_MIN__=1E-6143DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_MAX__=9.999999999999999999999999999999999E6144DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_EPSILON__=1E-33DL"/>
+									<listOptionValue builtIn="false" value="__DEC128_DEN__=0.000000000000000000000000000000001E-6143DL"/>
+									<listOptionValue builtIn="false" value="__REGISTER_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__USER_LABEL_PREFIX__"/>
+									<listOptionValue builtIn="false" value="__VERSION__=&quot;4.2.1"/>
+									<listOptionValue builtIn="false" value="__GNUC_GNU_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__BLOCKS__=1"/>
+									<listOptionValue builtIn="false" value="__NO_INLINE__=1"/>
+									<listOptionValue builtIn="false" value="__FINITE_MATH_ONLY__=0"/>
+									<listOptionValue builtIn="false" value="__ELF__=1"/>
+									<listOptionValue builtIn="false" value="__XCC_HAVE_FLOAT__=1"/>
+									<listOptionValue builtIn="false" value="__cplusplus=1"/>
+									<listOptionValue builtIn="false" value="__GNUG__=4"/>
+									<listOptionValue builtIn="false" value="__GXX_WEAK__=1"/>
+									<listOptionValue builtIn="false" value="__DEPRECATED=1"/>
+									<listOptionValue builtIn="false" value="__EXCEPTIONS=1"/>
+									<listOptionValue builtIn="false" value="__WCHAR_UNSIGNED__=1"/>
+								</option>
+
+                                <option id = "com.xmos.c.compiler.option.include.paths.30938034" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/gcc&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${XMOS_DOC_PATH}/../target/include/c++/4.2.1/xcore-xmos-elf&quot;' />
-                                    
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+
                                 </option>
-                                <inputType id = "com.xmos.cdt.xc.compiler.input.30938034" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
-                                <option id = "gnu.c.compiler.option.include.paths.4204648" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                                <inputType id = "com.xmos.cdt.xc.compiler.input.4204648" name="XC Sources" superClass="com.xmos.cdt.xc.compiler.input" />
+                                <option id = "gnu.c.compiler.option.include.paths.51999221" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.xc.compiler.base.51999221" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.79359645" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.xc.compiler.base.79359645" name="com.xmos.cdt.xc.compiler.base" superClass="com.xmos.cdt.xc.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.82481501" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.82481501" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.67138450" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.c.compiler.base.67138450" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.18197183" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.c.compiler.base.18197183" name="com.xmos.cdt.c.compiler.base" superClass="com.xmos.cdt.c.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.33654178" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.33654178" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.92972358" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.cpp.compiler.base.92972358" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.88114204" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.cpp.compiler.base.88114204" name="com.xmos.cdt.cpp.compiler.base" superClass="com.xmos.cdt.cpp.compiler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.9106216" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.9106216" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.79654211" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+
                                 </option>
                             </tool>
-                            <tool id = "com.xmos.cdt.core.assembler.base.79654211" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
-                                <option id = "gnu.c.compiler.option.include.paths.7926039" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
-                                    
+                            <tool id = "com.xmos.cdt.core.assembler.base.7926039" name="com.xmos.cdt.core.assembler.base" superClass="com.xmos.cdt.core.assembler.base">
+                                <option id = "gnu.c.compiler.option.include.paths.17637736" valueType="includePath" superClass="gnu.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+
                                 </option>
-                                <option id = "com.xmos.c.compiler.option.include.paths.17637736" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
-                                    
+                                <option id = "com.xmos.c.compiler.option.include.paths.31666949" valueType="includePath" superClass="com.xmos.c.compiler.option.include.paths">
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_i2c_single_port/src}&quot;' />
+
                                 </option>
                             </tool>
 
                         </toolChain>
                     </folderInfo>
+                    <sourceEntries>
+                        <entry excluding=".build_*" flags="VALUE_WORKSPACE_PATH|RESOLVED"
+                    kind="sourcePath" name="" />
+                    </sourceEntries>
                 </configuration>
             </storageModule>
             <storageModule moduleId="scannerConfiguration">
@@ -184,6 +319,6 @@ targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
     </storageModule>
     <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-        <project id = "module_i2c_single_port.null.31666949" name="module_i2c_single_port" />
+        <project id = "module_i2c_single_port.null.43336439" name="module_i2c_single_port" />
     </storageModule>
 </cproject>
diff --git a/module_i2c_single_port/.xproject b/module_i2c_single_port/.xproject
index cb6adf6..87b587b 100644
--- a/module_i2c_single_port/.xproject
+++ b/module_i2c_single_port/.xproject
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-000072-SW</partnum></xproject>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_i2c</repository><partnum>XM-001898-SM</partnum></xproject>
\ No newline at end of file
diff --git a/module_i2c_single_port/README.rst b/module_i2c_single_port/README.rst
new file mode 100644
index 0000000..89991f1
--- /dev/null
+++ b/module_i2c_single_port/README.rst
@@ -0,0 +1,19 @@
+I2C Master (Multi Bit Port) Function Library
+==============================================
+
+:scope: General Use
+:description: Function Library implementing basic multi master I2C read and write functionality, designed for use with  a multi bit port
+:keywords: I2C
+:boards: XA-SK-AUDIO
+
+I2C is the Philips 2 wire interface, used to configure many digital chips, typically offered with the following options
+
+   * Whether the unit is a *master* or a *slave*. 
+   * The speed supported. Normal speeds are 100 Kb/s and 400 Kb/s. 
+   * Whether there is a single master or multiple masters.
+   * Whether clock stretching is supported.
+
+Features
+--------
+
+This module does not support clock stretching or multi master functions. Its intended use is for configuring single slave devices via I2C when 1-bi ports are at a premium.
diff --git a/xpd.xml b/xpd.xml
index e44d9b3..6b1edcd 100644
--- a/xpd.xml
+++ b/xpd.xml
@@ -10,7 +10,6 @@
     <docdir>module_i2c_master/doc</docdir>
     <exclude_dir>app_i2c_master_demo</exclude_dir>
     <exclude_dir>app_i2c_simple_demo</exclude_dir>
-    <exclude_dir>app_i2c_single_port_demo</exclude_dir>
     <exclude_dir>app_xdk_xai_i2c_test</exclude_dir>
     <exclude_dir>module_i2c</exclude_dir>
     <exclude_dir>module_i2c_simple</exclude_dir>
@@ -25,7 +24,7 @@
     <release parenthash = "459b3f4fe52124960c2d42b1932f204c3161d425" version = "2.0.0rc1" githash = "b89c5045029d8e8d7ef4a4ce6f94eb6791ea2735"></release>
     <release parenthash = "d8dff135311c6732ac3fa4a0081319fd5f4cebb2" version = "2.0.0rc2" githash = "3c44407c1a443919992568c0380e1661ffb9c3be"></release>
     <release parenthash = "ef93cc1de5143be8f5dc92e399c340c735a23cec" version = "2.0.0rc3" githash = "86cb497a5ee519fbc0c4bb597adeeb135d3e97e1"></release>
-    <release parenthash = "c8d766c249d1b13cdbf7a8140d613a143e62504e" version = "2.1.0alpha0"></release>
+    <release parenthash = "c8d766c249d1b13cdbf7a8140d613a143e62504e" version = "2.1.0alpha0" githash = "2109b9294da0af5872e8c596c80f8bba3d539559"></release>
     <subpartnumber>XM-001898-SM</subpartnumber>
     <vendor>XMOS</vendor>
     <xcore_repo>sc_i2c</xcore_repo>