diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-08 12:49:55 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-08 12:49:55 +0300 |
| commit | 4fe0d91ac7b4f8c8ec1ff5b2f9741d92ece1dc42 (patch) | |
| tree | c6d481ce983671a011db5b9355c2ecc21977ee77 /Software/Embedded_SW/Embedded/Modules | |
| parent | 12a8b6f0237581ba1530148ead2fb123dc43a089 (diff) | |
| parent | a2d60cff1060053c906e0b2728e3c581bf2c37bb (diff) | |
| download | Tango-4fe0d91ac7b4f8c8ec1ff5b2f9741d92ece1dc42.tar.gz Tango-4fe0d91ac7b4f8c8ec1ff5b2f9741d92ece1dc42.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c index fc5fb94ee..72276772c 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c @@ -328,6 +328,9 @@ void SendDiagnostics(void) DiagnosticsMonitor.dancer1angle = DancerValue[0]; DiagnosticsMonitor.dancer2angle = DancerValue[1]; DiagnosticsMonitor.dancer3angle = DancerValue[2]; + DiagnosticsMonitor.n_threadspeed = SpeedCounterIndex; + DiagnosticsMonitor.threadspeed = SpeedValue; + DiagnosticsMonitor.feedermotorfrequency = MotorValue[FEEDER_MOTOR]; DiagnosticsMonitor.dryermotor = MotorValue[DRYER_MOTOR]; @@ -342,6 +345,7 @@ void SendDiagnostics(void) } memset(DancerCounterIndex,0,sizeof(DancerCounterIndex)); memset(MotorCounterIndex,0,sizeof(MotorCounterIndex)); + SpeedCounterIndex = 0; DiagnosticsMonitor.mixertemperature = HeaterTemperature[HARDWARE_PID_CONTROL_TYPE__MixerHeater]; DiagnosticsMonitor.headzone1temperature = HeaterTemperature[HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ1]; |