add Class of PWM, Developing now!

diff --git a/ITOManager4.2/src/main.js b/ITOManager4.2/src/main.js
index dc0a9fc..f0f817b 100644 (file)
--- a/ITOManager4.2/src/main.js
+++ b/ITOManager4.2/src/main.js
@@ -34,6 +34,8 @@ var xPWMOutAmp = 3.3/2;
 var xPWMOutOffset =0.0;\r
 var nPWMMode = 1; //1:SineWave; 2:TriangleWave; 3:SquareWave\r
 \r
+var PWMPreset = new PWM();\r
+var PWMOut = new PWM();\r
 const deviceID = K4.deviceID;\r
 \r
 const nAnalogMeasureInterval = 50; //ms\r
@@ -58,8 +60,13 @@ const xErrorVoltageMin = 0.0; //V
 const xErrorTempMax = 100;//C\r
 const xErrorTempMin = -35;//C\r
 \r
+PWMPreset.xFrequency = 0.0;\r
+PWMPreset.xAmp = 0;\r
+PWMPreset.nPWMMode = 1;\r
+PWMPreset.xOffsetVoltage = 0.0;\r
 \r
-PWMFreqSet(xPWMFreqPreSet);\r
+PWMSet(PWMPreset, PWMOut);\r
+PWMFreqSet(PWMPreset.xFrequency);\r
 \r
 log("DeiveID: " +deviceID +"\n");\r
 \r
@@ -204,6 +211,10 @@ function Analog2ValueChanged(value){
 //     log('AD2:'+AD2.toFixed(3) +'\n');\r
 }\r
 \r
+function PWMSet(value1, value2){\r
+       value2 = value1;\r
+}\r
+\r
 function PWMFreqSet(value){\r
        xPWMFreq = value;\r
                nPeriodPWMCount = Math.round(1.0/value/(nPWMInterval/1000));\r

diff --git a/ITOManager4.2/src/tools.js b/ITOManager4.2/src/tools.js
index 9072dd3..4920cc3 100644 (file)
--- a/ITOManager4.2/src/tools.js
+++ b/ITOManager4.2/src/tools.js
@@ -11,4 +11,39 @@ function sleep(time) {
                                  d2 = new Date().getTime();\r
                                 }\r
                                  return;\r
-};
\ No newline at end of file
+};\r
+\r
+\r
+\r
+class PWM {\r
+       constructor(nPWMMode, xFrequency, xAmp, xOffsetVoltage) {\r
+           this._nPWMMode = nPWMMode;\r
+       this._xFrequency = xFrequency;\r
+       this._xAmp = xAmp;\r
+       this._xOffsetVoltage = xOffsetVoltage;\r
+       }\r
+       set nPWMMode(nPWMMode) {\r
+               this._nPWMMode = nPWMMode;\r
+       }\r
+       set xFrequency(xFrequency){\r
+               this._xFrequency = xFrequency;\r
+       }\r
+       set xAmp(xAmp){\r
+               this._xAmp = xAmp;\r
+       }\r
+       set xOffsetVoltage(xOffsetVoltage){\r
+               this._xOffsetVoltage = xOffsetVoltage;\r
+       }\r
+       get nPWMMode(){\r
+               return this._nPWMMode;\r
+       }\r
+       get xFrequency(){\r
+               return this._xFrequency;        \r
+       }\r
+       get xAmp(){\r
+               return this._xAmp;\r
+       }\r
+       get xOffsetVoltage(){\r
+               return this._xOffsetVoltage;\r
+       }\r
+}
\ No newline at end of file