|
@@ -47,7 +47,7 @@ namespace HttpServer.mazak
|
|
|
ret = MaCls.MazGetFeed(h, status0, ref maz_feed);
|
|
ret = MaCls.MazGetFeed(h, status0, ref maz_feed);
|
|
|
YG.Log.Instance.WriteLogAdd($"mazak-进给-->> " + maz_feed.frev + ",maz_feed = " + maz_feed.frev);
|
|
YG.Log.Instance.WriteLogAdd($"mazak-进给-->> " + maz_feed.frev + ",maz_feed = " + maz_feed.frev);
|
|
|
ushort spindleLoad = 0;
|
|
ushort spindleLoad = 0;
|
|
|
- ret = MaCls.MazGetSpindleLoad(h, 0, ref spindleLoad);
|
|
|
|
|
|
|
+ ret = MaCls.MazGetSpindleLoad(h, 1, ref spindleLoad);
|
|
|
YG.Log.Instance.WriteLogAdd($"mazak-主轴负载-->> " + spindleLoad);
|
|
YG.Log.Instance.WriteLogAdd($"mazak-主轴负载-->> " + spindleLoad);
|
|
|
ushort feedOver = 0;
|
|
ushort feedOver = 0;
|
|
|
ret = MaCls.MazGetFeedOverRide(h, 0, ref feedOver);
|
|
ret = MaCls.MazGetFeedOverRide(h, 0, ref feedOver);
|
|
@@ -59,7 +59,7 @@ namespace HttpServer.mazak
|
|
|
MAZ_TOOLINFO currentToolInfo = default(MAZ_TOOLINFO);
|
|
MAZ_TOOLINFO currentToolInfo = default(MAZ_TOOLINFO);
|
|
|
MaCls.MazGetCurrentTool(h, 0, ref currentToolInfo);
|
|
MaCls.MazGetCurrentTool(h, 0, ref currentToolInfo);
|
|
|
YG.Log.Instance.WriteLogAdd($"mazak-刀具信息-->> " + JsonConvert.SerializeObject(currentToolInfo));
|
|
YG.Log.Instance.WriteLogAdd($"mazak-刀具信息-->> " + JsonConvert.SerializeObject(currentToolInfo));
|
|
|
- responseBody.runDatasInfo = "运行时间:" + runTime.uint_2 + ",主程序:" + proInfo.string_0 + ",进给:" + maz_feed.fmin + ",主轴负载:" + spindleLoad + ",进给负载:" + feedOver
|
|
|
|
|
|
|
+ responseBody.runDatasInfo = "运行时间:" + powerTime.uint_2 + ",主程序:" + proInfo.string_0 + ",进给:" + maz_feed.fmin/1000 + ",主轴负载:" + spindleLoad + ",进给负载:" + feedOver
|
|
|
+ "，主轴速度:" + spindleSpeed + ",刀具信息:" + JsonConvert.SerializeObject(currentToolInfo);
|
|
+ "，主轴速度:" + spindleSpeed + ",刀具信息:" + JsonConvert.SerializeObject(currentToolInfo);
|
|
|
|
|
|
|
|
|
|
|
zhuhao