ITO manager ver.4.2
PWM出力をサポートの予定，
2016/8/17開発開始
2016/8/19 PWMのBLLファイルを追加
2016/8/19 PWMの出力デモコードを記述
2016/8/20 矩形波と三角波のモジュールを追加
Ref: https://osdn.jp/projects/ito-manager/scm/git/ito-manager4.2/tree/master/ITOManager4.2/
| Revision | b4d6f58f7b7f30ade27d8e912a1d8d8edfaba680 (tree) |
|---|---|
| Time | 2016-09-04 22:31:56 |
| Author | tomohiro <tomohiro@yz.y...> |
| Commiter | tomohiro |
add Class of PWM, Developing now!
ITOManager4.2/src/main.js (diff) ITOManager4.2/src/tools.js (diff)| @@ -34,6 +34,8 @@ var xPWMOutAmp = 3.3/2; | ||
| 34 | 34 | var xPWMOutOffset =0.0; |
| 35 | 35 | var nPWMMode = 1; //1:SineWave; 2:TriangleWave; 3:SquareWave |
| 36 | 36 | |
| 37 | +var PWMPreset = new PWM(); | |
| 38 | +var PWMOut = new PWM(); | |
| 37 | 39 | const deviceID = K4.deviceID; |
| 38 | 40 | |
| 39 | 41 | const nAnalogMeasureInterval = 50; //ms |
| @@ -58,8 +60,13 @@ const xErrorVoltageMin = 0.0; //V | ||
| 58 | 60 | const xErrorTempMax = 100;//C |
| 59 | 61 | const xErrorTempMin = -35;//C |
| 60 | 62 | |
| 63 | +PWMPreset.xFrequency = 0.0; | |
| 64 | +PWMPreset.xAmp = 0; | |
| 65 | +PWMPreset.nPWMMode = 1; | |
| 66 | +PWMPreset.xOffsetVoltage = 0.0; | |
| 61 | 67 | |
| 62 | -PWMFreqSet(xPWMFreqPreSet); | |
| 68 | +PWMSet(PWMPreset, PWMOut); | |
| 69 | +PWMFreqSet(PWMPreset.xFrequency); | |
| 63 | 70 | |
| 64 | 71 | log("DeiveID: " +deviceID +"\n"); |
| 65 | 72 |
| @@ -204,6 +211,10 @@ function Analog2ValueChanged(value){ | ||
| 204 | 211 | // log('AD2:'+AD2.toFixed(3) +'\n'); |
| 205 | 212 | } |
| 206 | 213 | |
| 214 | +function PWMSet(value1, value2){ | |
| 215 | + value2 = value1; | |
| 216 | +} | |
| 217 | + | |
| 207 | 218 | function PWMFreqSet(value){ |
| 208 | 219 | xPWMFreq = value; |
| 209 | 220 | nPeriodPWMCount = Math.round(1.0/value/(nPWMInterval/1000)); |
| @@ -11,4 +11,39 @@ function sleep(time) { | ||
| 11 | 11 | d2 = new Date().getTime(); |
| 12 | 12 | } |
| 13 | 13 | return; |
| 14 | -}; | |
| \ No newline at end of file | ||
| 14 | +}; | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | +class PWM { | |
| 19 | + constructor(nPWMMode, xFrequency, xAmp, xOffsetVoltage) { | |
| 20 | + this._nPWMMode = nPWMMode; | |
| 21 | + this._xFrequency = xFrequency; | |
| 22 | + this._xAmp = xAmp; | |
| 23 | + this._xOffsetVoltage = xOffsetVoltage; | |
| 24 | + } | |
| 25 | + set nPWMMode(nPWMMode) { | |
| 26 | + this._nPWMMode = nPWMMode; | |
| 27 | + } | |
| 28 | + set xFrequency(xFrequency){ | |
| 29 | + this._xFrequency = xFrequency; | |
| 30 | + } | |
| 31 | + set xAmp(xAmp){ | |
| 32 | + this._xAmp = xAmp; | |
| 33 | + } | |
| 34 | + set xOffsetVoltage(xOffsetVoltage){ | |
| 35 | + this._xOffsetVoltage = xOffsetVoltage; | |
| 36 | + } | |
| 37 | + get nPWMMode(){ | |
| 38 | + return this._nPWMMode; | |
| 39 | + } | |
| 40 | + get xFrequency(){ | |
| 41 | + return this._xFrequency; | |
| 42 | + } | |
| 43 | + get xAmp(){ | |
| 44 | + return this._xAmp; | |
| 45 | + } | |
| 46 | + get xOffsetVoltage(){ | |
| 47 | + return this._xOffsetVoltage; | |
| 48 | + } | |
| 49 | +} | |
| \ No newline at end of file |
Fork