[Csp-commits] svn:csp r1631 - in trunk/CSP/CSPSim: . Source

[<sv...@ww...>]

Author: mkrose
Date: 2005-10-15 14:24:42 -0700 (Sat, 15 Oct 2005)
New Revision: 1631

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Source/FlightControlSystem.cpp
Log:
* Add a scale parameter to fcs input channels.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1631

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-10-15 21:22:55 UTC (rev 1630)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-10-15 21:24:42 UTC (rev 1631)
@@ -22,6 +22,8 @@
 
  * Show mach readout to 2 decimal places on info display.
 
+ * Add a scale parameter to fcs input channels.
+
 2005-08-27: onsight
  * Link against sigc-2.0, not sigc-1.2 for debug builds under MSVC.
 

Modified: trunk/CSP/CSPSim/Source/FlightControlSystem.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/FlightControlSystem.cpp	2005-10-15 21:22:55 UTC (rev 1630)
+++ trunk/CSP/CSPSim/Source/FlightControlSystem.cpp	2005-10-15 21:24:42 UTC (rev 1631)
@@ -489,9 +489,10 @@
  */
 class InputChannel: public ControlNode {
 	std::string m_Name;
+	double m_Scale;
 public:
 	SIMDATA_DECLARE_ABSTRACT_OBJECT(InputChannel)
-	InputChannel() { }
+	InputChannel(): m_Scale(1.0) { }
 	virtual void importChannels(Bus *bus) {
 		DataChannelBase::CRef channel;
 		channel = bus->getChannel(m_Name);
@@ -502,12 +503,13 @@
 	virtual void setChannel(DataChannelBase::CRef &channel)=0;
 private:
 	virtual void evaluate(Timer const &timer) {
-		setOutput(getChannelValue(), timer);
+		setOutput(getChannelValue() * m_Scale, timer);
 	}
 };
 
 SIMDATA_XML_BEGIN(InputChannel)
 	SIMDATA_DEF("channel", m_Name, true)
+	SIMDATA_DEF("scale", m_Scale, false)
 SIMDATA_XML_END