tm3d
/
owSlave2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Many changes from 2018
[owSlave2.git]
/
DS18B20_Thermocouble_DS2438_SHT
/
DS18B20_Thermocouble_DS2438_SHT.cproj
diff --git
a/DS18B20_Thermocouble_DS2438_SHT/DS18B20_Thermocouble_DS2438_SHT.cproj
b/DS18B20_Thermocouble_DS2438_SHT/DS18B20_Thermocouble_DS2438_SHT.cproj
index
738bf15
..
752c526
100644
(file)
--- a/
DS18B20_Thermocouble_DS2438_SHT/DS18B20_Thermocouble_DS2438_SHT.cproj
+++ b/
DS18B20_Thermocouble_DS2438_SHT/DS18B20_Thermocouble_DS2438_SHT.cproj
@@
-34,7
+34,7
@@
<documentation help="" />
\r
<offline-documentation help="" />
\r
<dependencies>
\r
<documentation help="" />
\r
<offline-documentation help="" />
\r
<dependencies>
\r
- <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.
28
.1" />
\r
+ <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.
34
.1" />
\r
</dependencies>
\r
</framework-data>
\r
</AsfFrameworkConfig>
\r
</dependencies>
\r
</framework-data>
\r
</AsfFrameworkConfig>
\r
@@
-63,6
+63,8
@@
<ToolName>Simulator</ToolName>
\r
</com_atmel_avrdbg_tool_simulator>
\r
<ExternalProgrammingToolCommand />
\r
<ToolName>Simulator</ToolName>
\r
</com_atmel_avrdbg_tool_simulator>
\r
<ExternalProgrammingToolCommand />
\r
+ <ResetRule>0</ResetRule>
\r
+ <EraseKey />
\r
</PropertyGroup>
\r
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
\r
<ToolchainSettings>
\r
</PropertyGroup>
\r
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
\r
<ToolchainSettings>
\r
@@
-135,9
+137,9
@@
</ToolchainSettings>
\r
</PropertyGroup>
\r
<ItemGroup>
\r
</ToolchainSettings>
\r
</PropertyGroup>
\r
<ItemGroup>
\r
- <Compile Include="..\common\I2C\SHT2x.c">
\r
+ <Compile Include="..\common\I2C\SHT2x
V2
.c">
\r
<SubType>compile</SubType>
\r
<SubType>compile</SubType>
\r
- <Link>SHT2x.c</Link>
\r
+ <Link>SHT2x
V2
.c</Link>
\r
</Compile>
\r
<Compile Include="..\common\I2C\USI_TWI_Master.c">
\r
<SubType>compile</SubType>
\r
</Compile>
\r
<Compile Include="..\common\I2C\USI_TWI_Master.c">
\r
<SubType>compile</SubType>
\r