Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

APM Planner 1.1.96 

Fix camera stab reverse boxs
add better param data duplicate handling
add rfd900a
tweak terminal settings
This commit is contained in:
Michael Oborne 2012-07-06 07:27:42 +08:00
parent bc4beb2345
commit b3fab35b44
14 changed files with 323 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tools/ArdupilotMegaPlanner/3DRRadio/ChangeLog.txt
View File

@ -1,4 +1,5 @@
0.8 - fix settings saving. 0.9 - added rfd900a
0.8 - fix settings saving.
0.7 - fix typos - log rssi screen to log as well 0.7 - fix typos - log rssi screen to log as well
0.6 - add terminal logging to file, fix remote radio config 0.6 - add terminal logging to file, fix remote radio config
0.5 - add terminal 0.5 - add terminal

1
Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
View File

@ -245,6 +245,7 @@
</Compile> </Compile>
<Compile Include="Comms\CommsTCPSerial.cs" /> <Compile Include="Comms\CommsTCPSerial.cs" />
<Compile Include="Comms\CommsUdpSerial.cs" /> <Compile Include="Comms\CommsUdpSerial.cs" />
<Compile Include="Delta.cs" />
<Compile Include="Presenter\ConfigCameraStabPresenter.cs" /> <Compile Include="Presenter\ConfigCameraStabPresenter.cs" />
<Compile Include="Controls\HSI.cs"> <Compile Include="Controls\HSI.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>

107
Tools/ArdupilotMegaPlanner/ChangeLog.txt
View File

@ -1,6 +1,14 @@
 * APM Planner 1.1.95
##### 1.1.94 fix config panel value change detection
add loiter_ to AC config screen
Add praram name to Friendly param, and exception ignoring.
fix param file note line
intergrate andrews gimbal config.
fix any possible log appending issues
remove old cli planner on connect
modify speech to not crash on windows mono
* APM Planner 1.1.94
Fix Issue 668 - typo Fix Issue 668 - typo
Fix issue 666 - now defaults to mav 1.0 planner Fix issue 666 - now defaults to mav 1.0 planner
Fix Issue 665 - mavlink 1.0 is now default Fix Issue 665 - mavlink 1.0 is now default
@ -18,3 +26,98 @@ Fix NOTE param file line
Add APMRover hidden firmware upload (control-R) on firmware screen. Add APMRover hidden firmware upload (control-R) on firmware screen.
fix possible speach engine exception fix possible speach engine exception
add dataflashlog for apmrover add dataflashlog for apmrover
* APM Planner 1.1.93
fix armed/disarmed message
* APM Planner 1.1.92
add dump -1 option to log dump
fix terminal issue with logs
fix mavlink 1.0 manual/stablaize Mode
fix config screen showing incorrect tab
* APM Planner 1.1.91
fix datasource binding exception.
* APM Planner 1.1.90
3drradio save settings fix
fix mavlink10 hil scaling
fix some exceptions
* APM Planner 1.1.89
add mjpeg video source
add 16x9 hud
conform to http/1.1 specs for mjpeg
* APM Planner 1.1.88
fix updater
* APM Planner 1.1.87
add popouts in config/setup
add more text to hud heading nw,ne,sw,se
add 5 m filter to antenna tracker
add refresh param buttons
remove the word old, as people still want it.
modify telem playback interface with slider bars
add posible fix to bad grid spacing
move mavlink code.
* APM Planner 1.1.86
add ArduRover
simplify connect
modify hardware screen
fix mono terminal issue
modify 3drradio screen
modify updater
* APM Planner 1.1.85
work on opengltest
fix last missing param
fix com port selection on connecting to bad comport
add convert to csv. entire log
add log caching to image georef. for tlog and logs
add srtm data caching
* APM Planner 1.1.84
3dr radio fix's + rfd900
other misc fixs
* APM Planner 1.1.83
fix null exception. if connect and not view the link stats, an exception is thrown on disconnect.
* APM Planner 1.1.82
modify 3dr radio packet size 64 > 32
add andrews link status Mod - thanks
add hw voltage to status
add generic logbrowse pid class "pid-*" > "pid-1"
* APM Planner 1.1.81
mavlink 1.0 fixs
simulation hil fix for lorenz
modify default att rate to 10 hz
* APM Planner 1.1.80
hazy's lang mod
more hud mods - shorten lines
msi work + uploader
* APM Planner 1.1.79
modify hud
modify apm1 vs apm2 detector
* APM Planner 1.1.78
recommit
* APM Planner 1.1.77
fix param xml namespace issue
prevent sending unchanged params
* APM Planner 1.1.76
Modify Hud center
add 3dr snr's and snr based distance estimate
display current frame type
fix disapearing window
add base xml level to param xml (xml standard)
add georef kml refrence
this includes adams new dynamic params

39
Tools/ArdupilotMegaPlanner/Delta.cs Normal file
View File

@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace ArdupilotMega
{
class Delta
{
public static void
delta_encode(ref char[] buffer)
{
int length = buffer.Length;
char delta = (char)0;
char original;
uint i;
for (i = 0; i < length; ++i)
{
original = buffer[i];
buffer[i] = (char)(byte)(buffer[i] - delta);
delta = original;
}
}
public static void
delta_decode(ref char[] buffer)
{
int length = buffer.Length;
char delta = (char)0;
uint i;
for (i = 0; i < length; ++i)
{
buffer[i] = (char)(byte)(buffer[i] + delta);
delta = buffer[i];
}
}
}
}

8
Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs
View File

@ -230,7 +230,7 @@ namespace ArdupilotMega.GCSViews
comPort_DataReceived((object)null, (SerialDataReceivedEventArgs)null); comPort_DataReceived((object)null, (SerialDataReceivedEventArgs)null);
} }
} }
catch { return; } catch { threadrun = false; return; }
} }
try try
{ {
@ -259,12 +259,12 @@ namespace ArdupilotMega.GCSViews
catch { } catch { }
} }
threadrun = false;
comPort.DtrEnable = false; comPort.DtrEnable = false;
if (threadrun == false)
{
comPort.Close(); comPort.Close();
}
Console.WriteLine("Comport thread close"); Console.WriteLine("Comport thread close");
}); });
t11.IsBackground = true; t11.IsBackground = true;

267
Tools/ArdupilotMegaPlanner/Msi/installer.wxs
View File

@ -2,14 +2,14 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:difx="http://schemas.microsoft.com/wix/DifxAppExtension"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:difx="http://schemas.microsoft.com/wix/DifxAppExtension">
<Product Id="*" Name="APM Planner" Language="1033" Version="1.1.94" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}"> <Product Id="*" Name="APM Planner" Language="1033" Version="1.1.95" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
<Package Description="APM Planner Installer" Comments="Apm Planner Installer" Manufacturer="Michael Oborne" InstallerVersion="200" Compressed="yes" /> <Package Description="APM Planner Installer" Comments="Apm Planner Installer" Manufacturer="Michael Oborne" InstallerVersion="200" Compressed="yes" />
<Upgrade Id="{625389D7-EB3C-4d77-A5F6-A285CF99437D}"> <Upgrade Id="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
<UpgradeVersion OnlyDetect="yes" Minimum="1.1.94" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" /> <UpgradeVersion OnlyDetect="yes" Minimum="1.1.95" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
<UpgradeVersion OnlyDetect="no" Maximum="1.1.94" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" /> <UpgradeVersion OnlyDetect="no" Maximum="1.1.95" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
</Upgrade> </Upgrade>
<InstallExecuteSequence> <InstallExecuteSequence>
@ -31,7 +31,7 @@
<Permission User="Everyone" GenericAll="yes" /> <Permission User="Everyone" GenericAll="yes" />
</CreateFolder> </CreateFolder>
</Component> </Component>
<Component Id="_comp1" Guid="73b00fbb-76c5-44d2-a1d3-7c4597e981d7"> <Component Id="_comp1" Guid="5aaf1928-e09d-4e37-9469-e5052d863bfd">
<File Id="_2" Source="..\bin\release\.gdbinit" /> <File Id="_2" Source="..\bin\release\.gdbinit" />
<File Id="_3" Source="..\bin\release\.gitignore" /> <File Id="_3" Source="..\bin\release\.gitignore" />
<File Id="_4" Source="..\bin\release\aerosim3.91.txt" /> <File Id="_4" Source="..\bin\release\aerosim3.91.txt" />
@ -97,154 +97,155 @@
<File Id="_64" Source="..\bin\release\System.Reactive.dll" /> <File Id="_64" Source="..\bin\release\System.Reactive.dll" />
<File Id="_65" Source="..\bin\release\System.Reactive.xml" /> <File Id="_65" Source="..\bin\release\System.Reactive.xml" />
<File Id="_66" Source="..\bin\release\System.Speech.dll" /> <File Id="_66" Source="..\bin\release\System.Speech.dll" />
<File Id="_67" Source="..\bin\release\Updater.exe" /> <File Id="_67" Source="..\bin\release\Transitions.dll" />
<File Id="_68" Source="..\bin\release\Updater.exe.config" /> <File Id="_68" Source="..\bin\release\Updater.exe" />
<File Id="_69" Source="..\bin\release\Updater.pdb" /> <File Id="_69" Source="..\bin\release\Updater.exe.config" />
<File Id="_70" Source="..\bin\release\version.exe" /> <File Id="_70" Source="..\bin\release\Updater.pdb" />
<File Id="_71" Source="..\bin\release\version.txt" /> <File Id="_71" Source="..\bin\release\version.exe" />
<File Id="_72" Source="..\bin\release\ZedGraph.dll" /> <File Id="_72" Source="..\bin\release\version.txt" />
<File Id="_73" Source="..\bin\release\ZedGraph.dll" />
</Component> </Component>
<Directory Id="aircraft72" Name="aircraft"> <Directory Id="aircraft73" Name="aircraft">
<Component Id="_comp73" Guid="99d059ca-fa16-4a34-b168-eee253dd05cb"> <Component Id="_comp74" Guid="b2dcad0d-c45f-42ab-b166-5e491f3c0e35">
<File Id="_74" Source="..\bin\release\aircraft\placeholder.txt" /> <File Id="_75" Source="..\bin\release\aircraft\placeholder.txt" />
</Component> </Component>
<Directory Id="arducopter74" Name="arducopter"> <Directory Id="arducopter75" Name="arducopter">
<Component Id="_comp75" Guid="dec6420f-1730-4098-8a00-6c2c6c50c176"> <Component Id="_comp76" Guid="c4f10ce4-1c94-485c-b631-da697a862b03">
<File Id="_76" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" /> <File Id="_77" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
<File Id="_77" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" /> <File Id="_78" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
<File Id="_78" Source="..\bin\release\aircraft\arducopter\arducopter.xml" /> <File Id="_79" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
<File Id="_79" Source="..\bin\release\aircraft\arducopter\initfile.xml" /> <File Id="_80" Source="..\bin\release\aircraft\arducopter\initfile.xml" />
<File Id="_80" Source="..\bin\release\aircraft\arducopter\plus_quad2-set.xml" /> <File Id="_81" Source="..\bin\release\aircraft\arducopter\plus_quad2-set.xml" />
<File Id="_81" Source="..\bin\release\aircraft\arducopter\plus_quad2.xml" /> <File Id="_82" Source="..\bin\release\aircraft\arducopter\plus_quad2.xml" />
<File Id="_82" Source="..\bin\release\aircraft\arducopter\quad.nas" /> <File Id="_83" Source="..\bin\release\aircraft\arducopter\quad.nas" />
<File Id="_83" Source="..\bin\release\aircraft\arducopter\README" /> <File Id="_84" Source="..\bin\release\aircraft\arducopter\README" />
</Component> </Component>
<Directory Id="data83" Name="data"> <Directory Id="data84" Name="data">
<Component Id="_comp84" Guid="b73f95ee-2ae5-4ca7-b2a6-bb946632a27f"> <Component Id="_comp85" Guid="7eab9b6d-4d9a-47b6-9cf0-f8b17de70070">
<File Id="_85" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" /> <File Id="_86" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
<File Id="_86" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" /> <File Id="_87" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
<File Id="_87" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" /> <File Id="_88" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="Engines87" Name="Engines"> <Directory Id="Engines88" Name="Engines">
<Component Id="_comp88" Guid="7ee46f7c-6ee3-4fb8-8cce-32b00949ccad"> <Component Id="_comp89" Guid="8ae25de9-82ff-4650-b014-423a9af8076b">
<File Id="_89" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" /> <File Id="_90" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
<File Id="_90" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" /> <File Id="_91" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="Models90" Name="Models"> <Directory Id="Models91" Name="Models">
<Component Id="_comp91" Guid="f0c2bffe-1711-49b0-8138-aa3c7140b1d5"> <Component Id="_comp92" Guid="d5c63e2f-83cc-4851-ad0e-2eeeebffb00a">
<File Id="_92" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" /> <File Id="_93" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
<File Id="_93" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" /> <File Id="_94" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
<File Id="_94" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" /> <File Id="_95" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
<File Id="_95" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.ac" /> <File Id="_96" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.ac" />
<File Id="_96" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.xml" /> <File Id="_97" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.xml" />
<File Id="_97" Source="..\bin\release\aircraft\arducopter\Models\quad.3ds" /> <File Id="_98" Source="..\bin\release\aircraft\arducopter\Models\quad.3ds" />
<File Id="_98" Source="..\bin\release\aircraft\arducopter\Models\shareware_output.3ds" /> <File Id="_99" Source="..\bin\release\aircraft\arducopter\Models\shareware_output.3ds" />
<File Id="_99" Source="..\bin\release\aircraft\arducopter\Models\Untitled.ac" /> <File Id="_100" Source="..\bin\release\aircraft\arducopter\Models\Untitled.ac" />
<File Id="_100" Source="..\bin\release\aircraft\arducopter\Models\Y6_test.ac" /> <File Id="_101" Source="..\bin\release\aircraft\arducopter\Models\Y6_test.ac" />
</Component> </Component>
</Directory> </Directory>
</Directory> </Directory>
<Directory Id="Rascal100" Name="Rascal"> <Directory Id="Rascal101" Name="Rascal">
<Component Id="_comp101" Guid="615c6b7f-f8aa-4960-a596-49357da8741b"> <Component Id="_comp102" Guid="db7915a5-5407-4a3f-8e46-e30e159805be">
<File Id="_102" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" /> <File Id="_103" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
<File Id="_103" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" /> <File Id="_104" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
<File Id="_104" Source="..\bin\release\aircraft\Rascal\Rascal.xml" /> <File Id="_105" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
<File Id="_105" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim-set.xml" /> <File Id="_106" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim-set.xml" />
<File Id="_106" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim.xml" /> <File Id="_107" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim.xml" />
<File Id="_107" Source="..\bin\release\aircraft\Rascal\Rascal110-splash.rgb" /> <File Id="_108" Source="..\bin\release\aircraft\Rascal\Rascal110-splash.rgb" />
<File Id="_108" Source="..\bin\release\aircraft\Rascal\README.Rascal" /> <File Id="_109" Source="..\bin\release\aircraft\Rascal\README.Rascal" />
<File Id="_109" Source="..\bin\release\aircraft\Rascal\reset_CMAC.xml" /> <File Id="_110" Source="..\bin\release\aircraft\Rascal\reset_CMAC.xml" />
<File Id="_110" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" /> <File Id="_111" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
</Component> </Component>
<Directory Id="Engines110" Name="Engines"> <Directory Id="Engines111" Name="Engines">
<Component Id="_comp111" Guid="6fb8b91b-105b-415d-acde-93b8b280d800"> <Component Id="_comp112" Guid="6a231d14-d3df-40e0-93b3-376270583846">
<File Id="_112" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" /> <File Id="_113" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
<File Id="_113" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" /> <File Id="_114" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="Models113" Name="Models"> <Directory Id="Models114" Name="Models">
<Component Id="_comp114" Guid="f5cebabf-1c5d-455c-8dbd-1ad9f658e81f"> <Component Id="_comp115" Guid="48a86b1f-21bc-4308-9cdc-4d64a5a729a7">
<File Id="_115" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" /> <File Id="_116" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
<File Id="_116" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" /> <File Id="_117" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
<File Id="_117" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" /> <File Id="_118" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
<File Id="_118" Source="..\bin\release\aircraft\Rascal\Models\smoke.png" /> <File Id="_119" Source="..\bin\release\aircraft\Rascal\Models\smoke.png" />
<File Id="_119" Source="..\bin\release\aircraft\Rascal\Models\smokeW.xml" /> <File Id="_120" Source="..\bin\release\aircraft\Rascal\Models\smokeW.xml" />
<File Id="_120" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.ac" /> <File Id="_121" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.ac" />
<File Id="_121" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.xml" /> <File Id="_122" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.xml" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="Systems121" Name="Systems"> <Directory Id="Systems122" Name="Systems">
<Component Id="_comp122" Guid="6c6b3b7b-6047-4b93-812f-ce9fd0e4f5a0"> <Component Id="_comp123" Guid="51d9759f-a50b-42ef-8913-c99b99651073">
<File Id="_123" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" /> <File Id="_124" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
<File Id="_124" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" /> <File Id="_125" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
<File Id="_125" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" /> <File Id="_126" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
<File Id="_126" Source="..\bin\release\aircraft\Rascal\Systems\main.nas" /> <File Id="_127" Source="..\bin\release\aircraft\Rascal\Systems\main.nas" />
<File Id="_127" Source="..\bin\release\aircraft\Rascal\Systems\ugear.nas" /> <File Id="_128" Source="..\bin\release\aircraft\Rascal\Systems\ugear.nas" />
</Component> </Component>
</Directory> </Directory>
</Directory> </Directory>
</Directory> </Directory>
<Directory Id="Driver127" Name="Driver"> <Directory Id="Driver128" Name="Driver">
<Component Id="_comp128" Guid="12ce9c0e-c6fb-4c12-ae36-61814cfce607"> <Component Id="_comp129" Guid="ad08c36b-87ba-4414-ac24-e0166cc08942">
<File Id="_129" Source="..\bin\release\Driver\Arduino MEGA 2560.inf" /> <File Id="_130" Source="..\bin\release\Driver\Arduino MEGA 2560.inf" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="es_ES129" Name="es-ES"> <Directory Id="es_ES130" Name="es-ES">
<Component Id="_comp130" Guid="01265ed4-7b14-406d-b236-1020b407a26b"> <Component Id="_comp131" Guid="cad1f0d4-8279-43ba-9b80-55d78fe045d1">
<File Id="_131" Source="..\bin\release\es-ES\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_132" Source="..\bin\release\es-ES\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="fr131" Name="fr"> <Directory Id="fr132" Name="fr">
<Component Id="_comp132" Guid="5bb76b0c-070c-44b5-b28a-1017cc93db61"> <Component Id="_comp133" Guid="b24333f5-6691-4bd9-886c-87f3745e6044">
<File Id="_133" Source="..\bin\release\fr\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_134" Source="..\bin\release\fr\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="it_IT133" Name="it-IT"> <Directory Id="it_IT134" Name="it-IT">
<Component Id="_comp134" Guid="f036c3d7-fe2a-4e54-af83-bdaff26dc9c7"> <Component Id="_comp135" Guid="5a85fb3f-e836-4e26-a7de-1362badc0fa3">
<File Id="_135" Source="..\bin\release\it-IT\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_136" Source="..\bin\release\it-IT\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="jsbsim135" Name="jsbsim"> <Directory Id="jsbsim136" Name="jsbsim">
<Component Id="_comp136" Guid="83d2b000-4515-45a8-a014-9263d493d771"> <Component Id="_comp137" Guid="181669f4-2d71-4d7e-adc4-48bdd6c35f88">
<File Id="_137" Source="..\bin\release\jsbsim\fgout.xml" /> <File Id="_138" Source="..\bin\release\jsbsim\fgout.xml" />
<File Id="_138" Source="..\bin\release\jsbsim\rascal_test.xml" /> <File Id="_139" Source="..\bin\release\jsbsim\rascal_test.xml" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="m3u138" Name="m3u"> <Directory Id="m3u139" Name="m3u">
<Component Id="_comp139" Guid="d1f10ef1-a76c-4aa7-adf9-40806fb39bda"> <Component Id="_comp140" Guid="ac316674-97e5-4c0b-a294-ee3ffbadb06b">
<File Id="_140" Source="..\bin\release\m3u\both.m3u" /> <File Id="_141" Source="..\bin\release\m3u\both.m3u" />
<File Id="_141" Source="..\bin\release\m3u\GeoRefnetworklink.kml" /> <File Id="_142" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
<File Id="_142" Source="..\bin\release\m3u\hud.m3u" /> <File Id="_143" Source="..\bin\release\m3u\hud.m3u" />
<File Id="_143" Source="..\bin\release\m3u\map.m3u" /> <File Id="_144" Source="..\bin\release\m3u\map.m3u" />
<File Id="_144" Source="..\bin\release\m3u\networklink.kml" /> <File Id="_145" Source="..\bin\release\m3u\networklink.kml" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="pl144" Name="pl"> <Directory Id="pl145" Name="pl">
<Component Id="_comp145" Guid="d8a89eb1-82e9-48ec-b72b-4a2a772d94bc"> <Component Id="_comp146" Guid="8245cbbf-d2d5-44fa-ad79-d368569f0b71">
<File Id="_146" Source="..\bin\release\pl\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_147" Source="..\bin\release\pl\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="Resources146" Name="Resources"> <Directory Id="Resources147" Name="Resources">
<Component Id="_comp147" Guid="35eaf355-814a-44a7-9721-46de0a3d4ead"> <Component Id="_comp148" Guid="dd8ecf56-34d7-4023-85bd-3e2c5a89fd3c">
<File Id="_148" Source="..\bin\release\Resources\MAVCmd.txt" /> <File Id="_149" Source="..\bin\release\Resources\MAVCmd.txt" />
<File Id="_149" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" /> <File Id="_150" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="ru_RU149" Name="ru-RU"> <Directory Id="ru_RU150" Name="ru-RU">
<Component Id="_comp150" Guid="a6364b29-52a2-401e-ac6e-be439a38b196"> <Component Id="_comp151" Guid="23156b45-b72e-4c25-802e-6b8417eac33a">
<File Id="_151" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_152" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="zh_Hans151" Name="zh-Hans"> <Directory Id="zh_Hans152" Name="zh-Hans">
<Component Id="_comp152" Guid="c0c3c964-13c5-4908-8014-625313f016bb"> <Component Id="_comp153" Guid="e23f73d4-5f7a-4727-aff1-a88675a3448a">
<File Id="_153" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_154" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="zh_TW153" Name="zh-TW"> <Directory Id="zh_TW154" Name="zh-TW">
<Component Id="_comp154" Guid="3e391954-f83a-45bf-975c-ee56d8dd3c11"> <Component Id="_comp155" Guid="ddbd2375-9e66-4126-8346-310bbf8db53f">
<File Id="_155" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_156" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
@ -288,26 +289,26 @@
<ComponentRef Id="InstallDirPermissions" /> <ComponentRef Id="InstallDirPermissions" />
<ComponentRef Id="_comp1" /> <ComponentRef Id="_comp1" />
<ComponentRef Id="_comp73" /> <ComponentRef Id="_comp74" />
<ComponentRef Id="_comp75" /> <ComponentRef Id="_comp76" />
<ComponentRef Id="_comp84" /> <ComponentRef Id="_comp85" />
<ComponentRef Id="_comp88" /> <ComponentRef Id="_comp89" />
<ComponentRef Id="_comp91" /> <ComponentRef Id="_comp92" />
<ComponentRef Id="_comp101" /> <ComponentRef Id="_comp102" />
<ComponentRef Id="_comp111" /> <ComponentRef Id="_comp112" />
<ComponentRef Id="_comp114" /> <ComponentRef Id="_comp115" />
<ComponentRef Id="_comp122" /> <ComponentRef Id="_comp123" />
<ComponentRef Id="_comp128" /> <ComponentRef Id="_comp129" />
<ComponentRef Id="_comp130" /> <ComponentRef Id="_comp131" />
<ComponentRef Id="_comp132" /> <ComponentRef Id="_comp133" />
<ComponentRef Id="_comp134" /> <ComponentRef Id="_comp135" />
<ComponentRef Id="_comp136" /> <ComponentRef Id="_comp137" />
<ComponentRef Id="_comp139" /> <ComponentRef Id="_comp140" />
<ComponentRef Id="_comp145" /> <ComponentRef Id="_comp146" />
<ComponentRef Id="_comp147" /> <ComponentRef Id="_comp148" />
<ComponentRef Id="_comp150" /> <ComponentRef Id="_comp151" />
<ComponentRef Id="_comp152" /> <ComponentRef Id="_comp153" />
<ComponentRef Id="_comp154" /> <ComponentRef Id="_comp155" />
<ComponentRef Id="ApplicationShortcut" /> <ComponentRef Id="ApplicationShortcut" />

2
Tools/ArdupilotMegaPlanner/Presenter/ConfigCameraStabPresenter.cs
View File

@ -250,7 +250,7 @@ namespace ArdupilotMega.Presenter
// handle boolean // handle boolean
if (val.GetType() == typeof(Boolean)) if (val.GetType() == typeof(Boolean))
{ {
if (!_mavlink.setParam(p.ApmPropertyName, ((Boolean)val) ? 1 : 0)) if (!_mavlink.setParam(p.ApmPropertyName, ((Boolean)val) ? 1 : -1))
log.Error("Error setting Camstab parameter"); log.Error("Error setting Camstab parameter");
} }
else else

6
Tools/ArdupilotMegaPlanner/Program.cs
View File

@ -67,6 +67,12 @@ namespace ArdupilotMega
return; return;
*/ */
char[] line = "testtesttesttesttest".ToCharArray();
Delta.delta_encode(ref line);
Delta.delta_decode(ref line);
if (System.Diagnostics.Debugger.IsAttached) if (System.Diagnostics.Debugger.IsAttached)
{ {
// testing // testing

2
Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
View File

@ -34,5 +34,5 @@ using System.Resources;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.*")] [assembly: AssemblyVersion("1.1.*")]
[assembly: AssemblyFileVersion("1.1.95")] [assembly: AssemblyFileVersion("1.1.96")]
[assembly: NeutralResourcesLanguageAttribute("")] [assembly: NeutralResourcesLanguageAttribute("")]

6
Tools/ArdupilotMegaPlanner/Radio/3DRradio.cs
View File

@ -51,7 +51,11 @@ namespace ArdupilotMega
} }
else if (device == uploader.Uploader.Code.DEVICE_ID_RFD900) else if (device == uploader.Uploader.Code.DEVICE_ID_RFD900)
{ {
return Common.getFilefromNet("http://www.samba.org/tridge/UAV/3DR/radio.rfd900.hex", firmwarefile); return Common.getFilefromNet("http://rfdesign.com.au/firmware/radio.rfd900.hex", firmwarefile);
}
else if (device == uploader.Uploader.Code.DEVICE_ID_RFD900A)
{
return Common.getFilefromNet("http://rfdesign.com.au/firmware/radio.rfd900a.hex", firmwarefile);
} }
else else
{ {

3
Tools/ArdupilotMegaPlanner/Radio/Uploader.cs
View File

@ -40,6 +40,7 @@ namespace uploader
DEVICE_ID_RF50 = 0x4d, DEVICE_ID_RF50 = 0x4d,
DEVICE_ID_HM_TRP= 0x4e, DEVICE_ID_HM_TRP= 0x4e,
DEVICE_ID_RFD900 = 0X42, DEVICE_ID_RFD900 = 0X42,
DEVICE_ID_RFD900A = 0X43,
// frequency code bytes XXX should come with the firmware image... // frequency code bytes XXX should come with the firmware image...
FREQ_NONE = 0xf0, FREQ_NONE = 0xf0,
@ -322,7 +323,7 @@ namespace uploader
freq = (Code)recv (); freq = (Code)recv ();
// XXX should be getting valid board/frequency data from firmware file // XXX should be getting valid board/frequency data from firmware file
if ((id != Code.DEVICE_ID_HM_TRP) && (id != Code.DEVICE_ID_RF50) && (id != Code.DEVICE_ID_RFD900)) if ((id != Code.DEVICE_ID_HM_TRP) && (id != Code.DEVICE_ID_RF50) && (id != Code.DEVICE_ID_RFD900) && (id != Code.DEVICE_ID_RFD900A))
throw new Exception ("bootloader device ID mismatch - device:" + id.ToString()); throw new Exception ("bootloader device ID mismatch - device:" + id.ToString());
getSync (); getSync ();

1
Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataParser.cs
View File

@ -237,6 +237,7 @@ namespace ArdupilotMega.Utilities
} }
} }
} }
if (!returnDict.ContainsKey(key))
returnDict.Add(key, metaDict); returnDict.Add(key, metaDict);
} }
} }

13
Tools/ArdupilotMegaPlanner/temp.Designer.cs generated
View File

@ -48,6 +48,7 @@
this.BUT_flashdl = new ArdupilotMega.Controls.MyButton(); this.BUT_flashdl = new ArdupilotMega.Controls.MyButton();
this.BUT_wipeeeprom = new ArdupilotMega.Controls.MyButton(); this.BUT_wipeeeprom = new ArdupilotMega.Controls.MyButton();
this.button1 = new ArdupilotMega.Controls.MyButton(); this.button1 = new ArdupilotMega.Controls.MyButton();
this.BUT_paramgen = new ArdupilotMega.Controls.MyButton();
this.SuspendLayout(); this.SuspendLayout();
// //
// label1 // label1
@ -244,11 +245,22 @@
this.button1.UseVisualStyleBackColor = true; this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click); this.button1.Click += new System.EventHandler(this.button1_Click);
// //
// BUT_paramgen
//
this.BUT_paramgen.Location = new System.Drawing.Point(206, 118);
this.BUT_paramgen.Name = "BUT_paramgen";
this.BUT_paramgen.Size = new System.Drawing.Size(75, 23);
this.BUT_paramgen.TabIndex = 20;
this.BUT_paramgen.Text = "Param gen";
this.BUT_paramgen.UseVisualStyleBackColor = true;
this.BUT_paramgen.Click += new System.EventHandler(this.BUT_paramgen_Click);
//
// temp // temp
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(731, 281); this.ClientSize = new System.Drawing.Size(731, 281);
this.Controls.Add(this.BUT_paramgen);
this.Controls.Add(this.BUT_magcalib); this.Controls.Add(this.BUT_magcalib);
this.Controls.Add(this.BUT_ant_track); this.Controls.Add(this.BUT_ant_track);
this.Controls.Add(this.BUT_follow_me); this.Controls.Add(this.BUT_follow_me);
@ -299,5 +311,6 @@
private ArdupilotMega.Controls.MyButton BUT_follow_me; private ArdupilotMega.Controls.MyButton BUT_follow_me;
private ArdupilotMega.Controls.MyButton BUT_ant_track; private ArdupilotMega.Controls.MyButton BUT_ant_track;
private ArdupilotMega.Controls.MyButton BUT_magcalib; private ArdupilotMega.Controls.MyButton BUT_magcalib;
private Controls.MyButton BUT_paramgen;
} }
} }

5
Tools/ArdupilotMegaPlanner/temp.cs
View File

@ -904,5 +904,10 @@ namespace ArdupilotMega
{ {
MagCalib.ProcessLog(); MagCalib.ProcessLog();
} }
private void BUT_paramgen_Click(object sender, EventArgs e)
{
ParameterMetaDataParser.GetParameterInformation();
}
} }
} }