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]
/
DS2438_SHT2X
/
DS2438_SHT2X.cproj
diff --git
a/DS2438_SHT2X/DS2438_SHT2X.cproj
b/DS2438_SHT2X/DS2438_SHT2X.cproj
index
0bdb091
..
34d756a
100644
(file)
--- a/
DS2438_SHT2X/DS2438_SHT2X.cproj
+++ b/
DS2438_SHT2X/DS2438_SHT2X.cproj
@@
-27,14
+27,14
@@
<BootSegment>2</BootSegment>
\r
<eraseonlaunchrule>1</eraseonlaunchrule>
\r
<AsfFrameworkConfig>
\r
<BootSegment>2</BootSegment>
\r
<eraseonlaunchrule>1</eraseonlaunchrule>
\r
<AsfFrameworkConfig>
\r
- <framework-data
xmlns=""
>
\r
+ <framework-data>
\r
<options />
\r
<configurations />
\r
<files />
\r
<documentation help="" />
\r
<offline-documentation help="" />
\r
<dependencies>
\r
<options />
\r
<configurations />
\r
<files />
\r
<documentation help="" />
\r
<offline-documentation help="" />
\r
<dependencies>
\r
- <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.2
6.0
" />
\r
+ <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.2
8.1
" />
\r
</dependencies>
\r
</framework-data>
\r
</AsfFrameworkConfig>
\r
</dependencies>
\r
</framework-data>
\r
</AsfFrameworkConfig>
\r
@@
-46,11
+46,13
@@
<InterfaceName>debugWIRE</InterfaceName>
\r
</ToolOptions>
\r
<ToolType>com.atmel.avrdbg.tool.atmelice</ToolType>
\r
<InterfaceName>debugWIRE</InterfaceName>
\r
</ToolOptions>
\r
<ToolType>com.atmel.avrdbg.tool.atmelice</ToolType>
\r
- <ToolNumber>J418000007
7
9</ToolNumber>
\r
+ <ToolNumber>J418000007
8
9</ToolNumber>
\r
<ToolName>Atmel-ICE</ToolName>
\r
</com_atmel_avrdbg_tool_atmelice>
\r
<avrtoolinterface>debugWIRE</avrtoolinterface>
\r
<ExternalProgrammingToolCommand />
\r
<ToolName>Atmel-ICE</ToolName>
\r
</com_atmel_avrdbg_tool_atmelice>
\r
<avrtoolinterface>debugWIRE</avrtoolinterface>
\r
<ExternalProgrammingToolCommand />
\r
+ <avrtoolserialnumber>J41800000789</avrtoolserialnumber>
\r
+ <avrdeviceexpectedsignature>0x1E930C</avrdeviceexpectedsignature>
\r
</PropertyGroup>
\r
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
\r
<ToolchainSettings>
\r
</PropertyGroup>
\r
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
\r
<ToolchainSettings>
\r
@@
-123,15
+125,19
@@
</ToolchainSettings>
\r
</PropertyGroup>
\r
<ItemGroup>
\r
</ToolchainSettings>
\r
</PropertyGroup>
\r
<ItemGroup>
\r
- <Compile Include="
D:\oc\dev\owSlave2\common\I2C\SHT2x
.c">
\r
+ <Compile Include="
..\common\calibr
.c">
\r
<SubType>compile</SubType>
\r
<SubType>compile</SubType>
\r
- <Link>
SHT2x
.c</Link>
\r
+ <Link>
calibr
.c</Link>
\r
</Compile>
\r
</Compile>
\r
- <Compile Include="D:\oc\dev\owSlave2\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\USI_TWI_Master.c">
\r
<SubType>compile</SubType>
\r
<Link>USI_TWI_Master.c</Link>
\r
</Compile>
\r
<SubType>compile</SubType>
\r
<Link>USI_TWI_Master.c</Link>
\r
</Compile>
\r
- <Compile Include="
D:\oc\dev\owSlave2
\common\OWDS2438.S">
\r
+ <Compile Include="
..
\common\OWDS2438.S">
\r
<SubType>compile</SubType>
\r
<Link>OWDS2438.S</Link>
\r
</Compile>
\r
<SubType>compile</SubType>
\r
<Link>OWDS2438.S</Link>
\r
</Compile>
\r