Many changes from 2018

[owSlave2.git] / DS18B20_BMP280_DS2438_SHT / DS18B20_BMP280_DS2438_SHT.cproj

diff --git a/DS18B20_BMP280_DS2438_SHT/DS18B20_BMP280_DS2438_SHT.cproj b/DS18B20_BMP280_DS2438_SHT/DS18B20_BMP280_DS2438_SHT.cproj
index 2594168..005cf10 100644 (file)
--- a/DS18B20_BMP280_DS2438_SHT/DS18B20_BMP280_DS2438_SHT.cproj
+++ b/DS18B20_BMP280_DS2438_SHT/DS18B20_BMP280_DS2438_SHT.cproj
@@ -34,11 +34,11 @@
         <documentation help="" />\r
         <offline-documentation help="" />\r
         <dependencies>\r
-          <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.22.0" />\r
+          <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.28.1" />\r
         </dependencies>\r
       </framework-data>\r
     </AsfFrameworkConfig>\r
-    <avrtool>custom</avrtool>\r
+    <avrtool>com.atmel.avrdbg.tool.atmelice</avrtool>\r
     <com_atmel_avrdbg_tool_atmelice>\r
       <ToolOptions>\r
         <InterfaceProperties>\r
@@ -62,8 +62,7 @@
       <ToolName>Simulator</ToolName>\r
     </com_atmel_avrdbg_tool_simulator>\r
     <ExternalProgrammingToolCommand />\r
-    <avrtoolserialnumber>\r
-    </avrtoolserialnumber>\r
+    <avrtoolserialnumber>J41800000789</avrtoolserialnumber>\r
     <avrdeviceexpectedsignature>0x1E930C</avrdeviceexpectedsignature>\r
     <custom>\r
       <ToolOptions xmlns="">\r
@@ -76,6 +75,8 @@
       </ToolNumber>\r
       <ToolName xmlns="">Custom Programming Tool</ToolName>\r
     </custom>\r
+    <ResetRule>0</ResetRule>\r
+    <EraseKey />\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">\r
     <ToolchainSettings>\r
@@ -148,10 +149,6 @@
     </ToolchainSettings>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-    <Compile Include="..\common\I2C\SHT2x.c">\r
-      <SubType>compile</SubType>\r
-      <Link>SHT2x.c</Link>\r
-    </Compile>\r
     <Compile Include="..\common\calibr.c">\r
       <SubType>compile</SubType>\r
       <Link>calibr.c</Link>\r
@@ -160,9 +157,13 @@
       <SubType>compile</SubType>\r
       <Link>BMP280.c</Link>\r
     </Compile>\r
-    <Compile Include="..\common\I2C\USI_TWI_Master.c">\r
+    <Compile Include="..\common\I2C\SHT2xV2.c">\r
+      <SubType>compile</SubType>\r
+      <Link>SHT2xV2.c</Link>\r
+    </Compile>\r
+    <Compile Include="..\common\I2C\TWI_Master.c">\r
       <SubType>compile</SubType>\r
-      <Link>USI_TWI_Master.c</Link>\r
+      <Link>TWI_Master.c</Link>\r
     </Compile>\r
     <Compile Include="..\common\OWDS18B20_DS2438.S">\r
       <SubType>compile</SubType>\r
@@ -173,4 +174,4 @@
     </Compile>\r
   </ItemGroup>\r
   <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />\r
-</Project>\r
+</Project>
\ No newline at end of file