rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'fd4bb1eb1c40feb32a4b07223fd398529c6af514' 

Conflicts:
	src/rxmsp.c
This commit is contained in:
Dominic Clifton 2014-05-03 21:58:44 +01:00
parent 1750bfbc2b fd4bb1eb1c
commit 0a441a9bb6
1 changed files with 16 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
baseflight.uvproj
View File

@ -169,7 +169,7 @@
<Capability>1</Capability>
<DriverSelection>4096</DriverSelection>
</Flash1>
<bUseTDR>0</bUseTDR>
<bUseTDR>1</bUseTDR>
<Flash2>BIN\UL2CM3.DLL</Flash2>
<Flash3>"" ()</Flash3>
<Flash4></Flash4>
@ -355,8 +355,6 @@
<wLevel>2</wLevel>
<uThumb>0</uThumb>
<uSurpInc>0</uSurpInc>
<uC99>0</uC99>
<useXO>0</useXO>
<VariousControls>
<MiscControls>--c99 --gnu</MiscControls>
<Define>STM32F10X_MD,USE_STDPERIPH_DRIVER</Define>
@ -373,7 +371,6 @@
<SwStkChk>0</SwStkChk>
<NoWarn>0</NoWarn>
<uSurpInc>0</uSurpInc>
<useXO>0</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -390,7 +387,6 @@
<useFile>0</useFile>
<TextAddressRange>0x08000000</TextAddressRange>
<DataAddressRange>0x20000000</DataAddressRange>
<pXoBase></pXoBase>
<ScatterFile></ScatterFile>
<IncludeLibs></IncludeLibs>
<IncludeLibsPath></IncludeLibsPath>
@ -499,6 +495,11 @@
<FileType>1</FileType>
<FilePath>.\src\telemetry_hott.c</FilePath>
</File>
<File>
<FileName>rxmsp.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\rxmsp.c</FilePath>
</File>
</Files>
</Group>
<Group>
@ -595,8 +596,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -643,8 +642,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -746,8 +743,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -764,7 +759,6 @@
<SwStkChk>2</SwStkChk>
<NoWarn>2</NoWarn>
<uSurpInc>2</uSurpInc>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -866,7 +860,6 @@
<SwStkChk>2</SwStkChk>
<NoWarn>2</NoWarn>
<uSurpInc>2</uSurpInc>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -1024,8 +1017,6 @@
<RestoreFunctions>0</RestoreFunctions>
<RestoreToolbox>1</RestoreToolbox>
<RestoreTracepoints>0</RestoreTracepoints>
<RestoreTracepoints>1</RestoreTracepoints>
<RestoreTracepoints>1</RestoreTracepoints>
</Target>
<RunDebugAfterBuild>0</RunDebugAfterBuild>
<TargetSelection>1</TargetSelection>
@ -1240,8 +1231,6 @@
<wLevel>2</wLevel>
<uThumb>0</uThumb>
<uSurpInc>0</uSurpInc>
<uC99>0</uC99>
<useXO>0</useXO>
<VariousControls>
<MiscControls>--c99 --gnu</MiscControls>
<Define>STM32F10X_MD,USE_STDPERIPH_DRIVER</Define>
@ -1258,7 +1247,6 @@
<SwStkChk>0</SwStkChk>
<NoWarn>0</NoWarn>
<uSurpInc>0</uSurpInc>
<useXO>0</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -1275,7 +1263,6 @@
<useFile>0</useFile>
<TextAddressRange>0x08000000</TextAddressRange>
<DataAddressRange>0x20000000</DataAddressRange>
<pXoBase></pXoBase>
<ScatterFile></ScatterFile>
<IncludeLibs></IncludeLibs>
<IncludeLibsPath></IncludeLibsPath>
@ -1384,6 +1371,11 @@
<FileType>1</FileType>
<FilePath>.\src\telemetry_hott.c</FilePath>
</File>
<File>
<FileName>rxmsp.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\rxmsp.c</FilePath>
</File>
</Files>
</Group>
<Group>
@ -1480,8 +1472,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -1528,8 +1518,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -1691,7 +1679,6 @@
<SwStkChk>2</SwStkChk>
<NoWarn>2</NoWarn>
<uSurpInc>2</uSurpInc>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -1849,8 +1836,6 @@
<RestoreFunctions>0</RestoreFunctions>
<RestoreToolbox>1</RestoreToolbox>
<RestoreTracepoints>0</RestoreTracepoints>
<RestoreTracepoints>1</RestoreTracepoints>
<RestoreTracepoints>1</RestoreTracepoints>
</Target>
<RunDebugAfterBuild>0</RunDebugAfterBuild>
<TargetSelection>1</TargetSelection>
@ -2065,8 +2050,6 @@
<wLevel>0</wLevel>
<uThumb>0</uThumb>
<uSurpInc>0</uSurpInc>
<uC99>0</uC99>
<useXO>0</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define>STM32F10X_MD,USE_STDPERIPH_DRIVER,FY90Q</Define>
@ -2083,7 +2066,6 @@
<SwStkChk>0</SwStkChk>
<NoWarn>0</NoWarn>
<uSurpInc>0</uSurpInc>
<useXO>0</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -2100,7 +2082,6 @@
<useFile>0</useFile>
<TextAddressRange>0x08000000</TextAddressRange>
<DataAddressRange>0x20000000</DataAddressRange>
<pXoBase></pXoBase>
<ScatterFile></ScatterFile>
<IncludeLibs></IncludeLibs>
<IncludeLibsPath></IncludeLibsPath>
@ -2209,6 +2190,11 @@
<FileType>1</FileType>
<FilePath>.\src\telemetry_hott.c</FilePath>
</File>
<File>
<FileName>rxmsp.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\rxmsp.c</FilePath>
</File>
</Files>
</Group>
<Group>
@ -2250,8 +2236,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -2298,8 +2282,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -2346,8 +2328,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -2394,8 +2374,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -2447,8 +2425,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -2495,8 +2471,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -2553,8 +2527,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -2601,8 +2573,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -2714,8 +2684,6 @@
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -2732,7 +2700,6 @@
<SwStkChk>2</SwStkChk>
<NoWarn>2</NoWarn>
<uSurpInc>2</uSurpInc>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -2829,7 +2796,6 @@
<SwStkChk>2</SwStkChk>
<NoWarn>2</NoWarn>
<uSurpInc>2</uSurpInc>
<useXO>2</useXO>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>