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

Configurator.Net: Fix boolean values, stable mode vm tests 

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1233 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
mandrolic 2010-12-22 22:30:17 +00:00
parent b5a835b6ac
commit dccfe83567
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Configurator/Configurator.Net/PresentationModels/MonitorVm.cs
View File

@ -149,7 +149,11 @@ namespace ArducopterConfigurator
for (int i = 0; i < PropsInUpdateOrder.Length; i++)
{
var prop = this.GetType().GetProperty(PropsInUpdateOrder[i]);
strings[i] = prop.GetValue(this, null).ToString();
if (prop.PropertyType == typeof(bool))
strings[i] = ((bool) prop.GetValue(this, null)) ? "1" : "0";
else
strings[i] = prop.GetValue(this, null).ToString();
}

32
Configurator/Configurator.Net/Test/StableModeConfigVmTest.cs
View File

@ -45,22 +45,30 @@ namespace ArducopterConfiguratorTest
Assert.AreEqual("A5;6;7;1;2;3;8;9;10;4;1", _fakeComms.SentItems[0]);
}
[Test]
public void UpdateStringReceivedPopulatesValuesCorrectly()
{
_fakeComms.FireLineRecieve("B5;6;7;1;2;3;8;9;10;4;1");
_vm.Activate();
_fakeComms.FireLineRecieve(sampleLineOfData);
Assert.AreEqual(1.95f, _vm.RollP);
Assert.AreEqual(0.1f, _vm.RollI);
Assert.AreEqual(0.2f, _vm.RollD);
Assert.AreEqual(1.95f, _vm.PitchP);
Assert.AreEqual(0.3f, _vm.PitchI);
Assert.AreEqual(0.4f, _vm.PitchD);
Assert.AreEqual(3.2f, _vm.YawP);
Assert.AreEqual(0.5f, _vm.YawI);
Assert.AreEqual(0.6f, _vm.YawD);
Assert.AreEqual(0.32f, _vm.KPrate);
Assert.AreEqual(true, _vm.MagnetometerEnable);
Assert.AreEqual(1.0f, _vm.PitchP);
Assert.AreEqual(2f, _vm.PitchI);
Assert.AreEqual(3f, _vm.PitchD);
Assert.AreEqual(5f, _vm.RollP);
Assert.AreEqual(6f, _vm.RollI);
Assert.AreEqual(7f, _vm.RollD);
Assert.AreEqual(8f, _vm.YawP);
Assert.AreEqual(9f, _vm.YawI);
Assert.AreEqual(10f, _vm.YawD);
Assert.AreEqual(1f, _vm.MagnetometerEnable);
Assert.AreEqual(4f, _vm.KPrate);
}
}
}