diff --git a/HVACTOOL/Form1.vb b/HVACTOOL/Form1.vb
index d1f47add3859267481641b3e7aa7ed9eaf5d0215..1253f160068b77efbc709ba7f56b5c079c69796f 100644
--- a/HVACTOOL/Form1.vb
+++ b/HVACTOOL/Form1.vb
@@ -11,9 +11,9 @@ Public Class Form1
Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
- Dim frm As New frmHVACTool("BusDatabase.csv", "ssmDelete.ahsm")
-
- frm.Show
+' Dim frm As New frmHVACTool("BusDatabase.csv", "ssmDelete.ahsm")
+'
+' frm.Show
End Sub
diff --git a/VECTO.sln b/VECTO.sln
index 90a53d73d48a6edcc8899eeb0fc17d124414f35f..80b219ca75a46e480657581b533194c6cb369077 100644
--- a/VECTO.sln
+++ b/VECTO.sln
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VECTO", "VECTO\VECTO.vbproj", "{AAC0F132-0A9F-45B3-B682-77AC9B24B352}"
EndProject
@@ -51,7 +51,4 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(Performance) = preSolution
- HasPerformanceSessions = true
- EndGlobalSection
EndGlobal
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/Alternator.vb b/VECTOAux/VectoAuxiliaries/Electrics/Alternator.vb
index f8e259f192a3a4309a94240c90ae8df5325d7b4a..024d40a3b67f1af4ebd989f7b76ef93fcc7e9bfd 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/Alternator.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/Alternator.vb
@@ -193,8 +193,10 @@ Public Class Alternator
M14 = 6000
RangeTable(4).RPM = M14
- 'Row 1 - RPM
- M11 = Convert.ToSingle(IF(M12=IF(N12>N13,M12-((M12-M13)/(N12-N13))*(N12-N11),M12-((M12-M13)/(N12-N13))*(N12-N11)), M12-0.01, IF(N12>N13,M12-((M12-M13)/(N12-N13))*(N12-N11),M12-((M12-M13)/(N12-N13))*(N12-N11))))
+ 'Row 1 - RPM
+ 'NOTE: Update to reflect CombineALternatorSchematicV02 20150429
+ 'IF(M12=IF(N12>N13,M12-((M12-M13)/(N12-N13))*(N12-N11),M12-((M12-M13)/(N12-N13))*(N12-N11)), M12-0.01, IF(N12>N13,M12-((M12-M13)/(N12-N13))*(N12-N11),M12-((M12-M13)/(N12-N13))*(N12-N11)))
+ M11 = Convert.ToSingle(If(N12 - N13 = 0, 0, If(M12 = If(N12 > N13, M12 - ((M12 - M13) / (N12 - N13)) * (N12 - N11), M12 - ((M12 - M13) / (N12 - N13)) * (N12 - N11)), M12 - 0.01, If(N12 > N13, M12 - ((M12 - M13) / (N12 - N13)) * (N12 - N11), M12 - ((M12 - M13) / (N12 - N13)) * (N12 - N11)))))
RangeTable(1).RPM =M11
'Row 0 - RPM
diff --git a/packages/ValueInjecter.2.3.3/ValueInjecter.2.3.3.nupkg b/packages/ValueInjecter.2.3.3/ValueInjecter.2.3.3.nupkg
new file mode 100644
index 0000000000000000000000000000000000000000..cef2647a58fcafdb7f37a5442e198390dba7181b
Binary files /dev/null and b/packages/ValueInjecter.2.3.3/ValueInjecter.2.3.3.nupkg differ
diff --git a/packages/ValueInjecter.2.3.3/lib/net35/Omu.ValueInjecter.XML b/packages/ValueInjecter.2.3.3/lib/net35/Omu.ValueInjecter.XML
new file mode 100644
index 0000000000000000000000000000000000000000..d779e408be474f075cab5255e172e229c5cf06ea
--- /dev/null
+++ b/packages/ValueInjecter.2.3.3/lib/net35/Omu.ValueInjecter.XML
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<doc>
+ <assembly>
+ <name>Omu.ValueInjecter</name>
+ </assembly>
+ <members>
+ <member name="T:Omu.ValueInjecter.ExactValueInjection">
+ <summary>
+ </summary>
+ </member>
+ <member name="M:Omu.ValueInjecter.PrefixedValueInjection.SearchTargetName(System.String)">
+ <summary>
+ get a string representing the target property name using the source property name and prefixes
+ </summary>
+ <param name="s">source property original name</param>
+ <returns></returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.PrefixedValueInjection.SearchSourceName(System.String)">
+ <summary>
+ get a string representing the source property name using the target property name and prefixes
+ </summary>
+ <param name="s">target property original name</param>
+ <returns></returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.DescriptorTools.GetByName(System.ComponentModel.PropertyDescriptorCollection,System.String)">
+ <summary>
+ Seek for a PropertyDescriptor within the collection by Name
+ </summary>
+ <returns>the search result or null if nothing was found</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.DescriptorTools.GetByName(System.ComponentModel.PropertyDescriptorCollection,System.String,System.Boolean)">
+ <summary>
+ Seek for a PropertyDescriptor within the collection by Name with option to ignore case
+ </summary>
+ <returns>search result or null if nothing was found</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.DescriptorTools.GetByNameType``1(System.ComponentModel.PropertyDescriptorCollection,System.String)">
+ <summary>
+ Search for a PropertyDescriptor within the collection that is of a specific type T
+ </summary>
+ <returns>search result or null if nothing was found</returns>
+ </member>
+ <member name="T:Omu.ValueInjecter.NoSourceValueInjection">
+ <summary>
+ inject value without source
+ </summary>
+ </member>
+ <member name="T:Omu.ValueInjecter.UberFlatter">
+ <summary>
+ performs flattening and unflattening
+ first version of this class was made by Vadim Plamadeala ☺
+ </summary>
+ </member>
+ <member name="T:Omu.ValueInjecter.PropertyInfosStorage">
+ <summary>
+ this is for caching the PropertyDescriptorCollection and PropertyInfo[] for each Type
+ </summary>
+ </member>
+ <member name="T:Omu.ValueInjecter.LoopValueInjection`2">
+ <summary>
+ maps the properties with the same name from the source object of type TSourceProperty to the ones from the target object of type TTargetProperty
+ </summary>
+ <typeparam name="TSourceProperty">source properties type</typeparam>
+ <typeparam name="TTargetProperty">target properties type</typeparam>
+ </member>
+ <member name="T:Omu.ValueInjecter.LoopValueInjection">
+ <summary>
+ maps the properties with the same name and type(by default, but you can override TypesMatch to change this) from source to the ones in the target
+ </summary>
+ </member>
+ <member name="M:Omu.ValueInjecter.StaticValueInjecter.InjectFrom``1(System.Object,System.Object[])">
+ <summary>
+ Injects values from source to target
+ </summary>
+ <typeparam name="T">ValueInjection used</typeparam>
+ <param name="target">target where the value is going to be injected</param>
+ <param name="source">source from where the value is taken</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.StaticValueInjecter.InjectFrom(System.Object,Omu.ValueInjecter.IValueInjection,System.Object[])">
+ <summary>
+ Injects values from source to target
+ </summary>
+ <param name="target">target where the value is going to be injected</param>
+ <param name="injection">ValueInjection used</param>
+ <param name="source">source from where the value is taken</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.StaticValueInjecter.InjectFrom``1(System.Object)">
+ <summary>
+ Injects values into the target
+ </summary>
+ <typeparam name="T">ValueInjection(INoSourceValueInjection) used for that</typeparam>
+ <param name="target">target where the value is going to be injected</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.StaticValueInjecter.InjectFrom(System.Object,Omu.ValueInjecter.INoSourceValueInjection)">
+ <summary>
+ Injects value into target without source
+ </summary>
+ <param name="target">the target where the value is going to be injected</param>
+ <param name="injection"> the injection(INoSourceValueInjection) used to inject value</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.StaticValueInjecter.InjectFrom(System.Object,System.Object[])">
+ <summary>
+ it the same as calling InjectFrom<LookupValueInjection>()
+ </summary>
+ </member>
+ <member name="M:Omu.ValueInjecter.ValueInjecter.Inject``1(System.Object,System.Object[])">
+ <summary>
+ inject values from source to target
+ </summary>
+ <typeparam name="T">ValueInjection used </typeparam>
+ <param name="target">target where the values is going to be injected</param>
+ <param name="source">source from where the values are taken</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.ValueInjecter.Inject(Omu.ValueInjecter.IValueInjection,System.Object,System.Object[])">
+ <summary>
+ inject values from source to target
+ </summary>
+ <param name="injection">the injection used</param>
+ <param name="target">target where the values is going to be injected</param>
+ <param name="source">source from where the values are taken</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.ValueInjecter.Inject``1(System.Object)">
+ <summary>
+ inject values into the target
+ </summary>
+ <typeparam name="T">ValueInjection used </typeparam>
+ <param name="target">target where the values is going to be injected</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.ValueInjecter.Inject(Omu.ValueInjecter.INoSourceValueInjection,System.Object)">
+ <summary>
+ inject values into the target
+ </summary>
+ <param name="injection">ValueInjection used</param>
+ <param name="target">target where the values is going to be injected</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.ValueInjecter.Inject(System.Object,System.Object[])">
+ <summary>
+ the same as calling Inject<LoopValueInjection>()
+ </summary>
+ </member>
+ </members>
+</doc>
diff --git a/packages/ValueInjecter.2.3.3/lib/net35/Omu.ValueInjecter.dll b/packages/ValueInjecter.2.3.3/lib/net35/Omu.ValueInjecter.dll
new file mode 100644
index 0000000000000000000000000000000000000000..5542abecac8d76e1fff9df7c342a6bb9876528d2
Binary files /dev/null and b/packages/ValueInjecter.2.3.3/lib/net35/Omu.ValueInjecter.dll differ
diff --git a/packages/ValueInjecter.2.3.3/lib/sl3/Omu.ValueInjecter.Silverlight.XML b/packages/ValueInjecter.2.3.3/lib/sl3/Omu.ValueInjecter.Silverlight.XML
new file mode 100644
index 0000000000000000000000000000000000000000..cb3357cf513e5633663f4c821098d4b9d6f22d45
--- /dev/null
+++ b/packages/ValueInjecter.2.3.3/lib/sl3/Omu.ValueInjecter.Silverlight.XML
@@ -0,0 +1,149 @@
+<?xml version="1.0"?>
+<doc>
+ <assembly>
+ <name>Omu.ValueInjecter.Silverlight</name>
+ </assembly>
+ <members>
+ <member name="M:Omu.ValueInjecter.Silverlight.StaticValueInjecter.InjectFrom``1(System.Object,System.Object[])">
+ <summary>
+ Injects values from source to target
+ </summary>
+ <typeparam name="T">ValueInjection used</typeparam>
+ <param name="target">target where the value is going to be injected</param>
+ <param name="source">source from where the value is taken</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.StaticValueInjecter.InjectFrom(System.Object,Omu.ValueInjecter.Silverlight.IValueInjection,System.Object[])">
+ <summary>
+ Injects values from source to target
+ </summary>
+ <param name="target">target where the value is going to be injected</param>
+ <param name="injection">ValueInjection used</param>
+ <param name="source">source from where the value is taken</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.StaticValueInjecter.InjectFrom``1(System.Object)">
+ <summary>
+ Injects values into the target
+ </summary>
+ <typeparam name="T">ValueInjection(INoSourceValueInjection) used for that</typeparam>
+ <param name="target">target where the value is going to be injected</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.StaticValueInjecter.InjectFrom(System.Object,Omu.ValueInjecter.Silverlight.INoSourceValueInjection)">
+ <summary>
+ Injects value into target without source
+ </summary>
+ <param name="target">the target where the value is going to be injected</param>
+ <param name="injection"> the injection(INoSourceValueInjection) used to inject value</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.StaticValueInjecter.InjectFrom(System.Object,System.Object[])">
+ <summary>
+ it the same as calling InjectFrom<LookupValueInjection>()
+ </summary>
+ </member>
+ <member name="T:Omu.ValueInjecter.Silverlight.NoSourceValueInjection">
+ <summary>
+ inject value without source
+ </summary>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.PrefixedValueInjection.SearchTargetName(System.String)">
+ <summary>
+ get a string representing the target property name using the source property name and prefixes
+ </summary>
+ <param name="s">source property original name</param>
+ <returns></returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.PrefixedValueInjection.SearchSourceName(System.String)">
+ <summary>
+ get a string representing the source property name using the target property name and prefixes
+ </summary>
+ <param name="s">target property original name</param>
+ <returns></returns>
+ </member>
+ <member name="T:Omu.ValueInjecter.Silverlight.ExactValueInjection">
+ <summary>
+ </summary>
+ </member>
+ <member name="T:Omu.ValueInjecter.Silverlight.PropertyInfosStorage">
+ <summary>
+ this is for caching the PropertyInfo[] of each Type
+ </summary>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.DescriptorTools.GetByName(System.Reflection.PropertyInfo[],System.String)">
+ <summary>
+ Seek for a PropertyInfo within the collection by Name
+ </summary>
+ <returns>the search result or null if nothing was found</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.DescriptorTools.GetByName(System.Reflection.PropertyInfo[],System.String,System.Boolean)">
+ <summary>
+ Seek for a PropertyInfo within the collection by Name with option to ignore case
+ </summary>
+ <returns>search result or null if nothing was found</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.DescriptorTools.GetByNameType``1(System.Reflection.PropertyInfo[],System.String)">
+ <summary>
+ Search for a PropertyInfo within the collection that is of a specific type T
+ </summary>
+ <returns>search result or null if nothing was found</returns>
+ </member>
+ <member name="T:Omu.ValueInjecter.Silverlight.ValueInjecter">
+ <summary>
+ ValueInjecter
+ </summary>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.ValueInjecter.Inject``1(System.Object,System.Object[])">
+ <summary>
+ inject values from source to target
+ </summary>
+ <typeparam name="T">ValueInjection used </typeparam>
+ <param name="target">target where the values is going to be injected</param>
+ <param name="source">source from where the values are taken</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.ValueInjecter.Inject(Omu.ValueInjecter.Silverlight.IValueInjection,System.Object,System.Object[])">
+ <summary>
+ inject values from source to target
+ </summary>
+ <param name="injection">the injection used</param>
+ <param name="target">target where the values is going to be injected</param>
+ <param name="source">source from where the values are taken</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.ValueInjecter.Inject``1(System.Object)">
+ <summary>
+ inject values into the target
+ </summary>
+ <typeparam name="T">ValueInjection used </typeparam>
+ <param name="target">target where the values is going to be injected</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.ValueInjecter.Inject(Omu.ValueInjecter.Silverlight.INoSourceValueInjection,System.Object)">
+ <summary>
+ inject values into the target
+ </summary>
+ <param name="injection">ValueInjection used</param>
+ <param name="target">target where the values is going to be injected</param>
+ <returns>the modified target</returns>
+ </member>
+ <member name="M:Omu.ValueInjecter.Silverlight.ValueInjecter.Inject(System.Object,System.Object[])">
+ <summary>
+ the same as calling Inject<LoopValueInjection>()
+ </summary>
+ </member>
+ <member name="T:Omu.ValueInjecter.Silverlight.LoopValueInjection`2">
+ <summary>
+ maps the properties with the same name from the source object of type TSourceProperty to the ones from the target object of type TTargetProperty
+ </summary>
+ <typeparam name="TSourceProperty">source properties type</typeparam>
+ <typeparam name="TTargetProperty">target properties type</typeparam>
+ </member>
+ <member name="T:Omu.ValueInjecter.Silverlight.LoopValueInjection">
+ <summary>
+ maps the properties with the same name and type(by default, but you can override TypesMatch to change this) from source to the ones in the target
+ </summary>
+ </member>
+ </members>
+</doc>
diff --git a/packages/ValueInjecter.2.3.3/lib/sl3/Omu.ValueInjecter.Silverlight.dll b/packages/ValueInjecter.2.3.3/lib/sl3/Omu.ValueInjecter.Silverlight.dll
new file mode 100644
index 0000000000000000000000000000000000000000..742f1dae5678af2a7b58bd240dc059209c6977b5
Binary files /dev/null and b/packages/ValueInjecter.2.3.3/lib/sl3/Omu.ValueInjecter.Silverlight.dll differ
diff --git a/packages/ValueInjecter.2.3.3/valueinjecter.2.3.nupkg b/packages/ValueInjecter.2.3.3/valueinjecter.2.3.nupkg
new file mode 100644
index 0000000000000000000000000000000000000000..bb735d488090c4cb522ef65c14b074677e4e4786
Binary files /dev/null and b/packages/ValueInjecter.2.3.3/valueinjecter.2.3.nupkg differ