合并

wells

2020-07-10 799808db1ace43141760a1fe74b2cbf28ddb2e39

 src/Bro.M071.Process/M071Process.cs

@@ -50,6 +50,8 @@

            base.Open();

            InitialMotionCardBaseAxisAlarm();

            SwitchBeep(false);
            SwitchLightGreen(false);
            SwitchLightRed(false);
@@ -59,6 +61,21 @@
            FullReset(null);
        }

        private void InitialMotionCardBaseAxisAlarm()
        {
            if (outputCtrlCard != null)
            {
                outputCtrlCard.OnAxisAlarmRaised -= MotionCard_OnAxisAlarmRaised;
                outputCtrlCard.OnAxisAlarmRaised += MotionCard_OnAxisAlarmRaised;
            }
        }

        private void MotionCard_OnAxisAlarmRaised(int axisIndex, string alarmMsg)
        {
            RaisedAlarm(alarmMsg); 
            MachineState = MachineState.Alarm;
        }

        private void InitialSetting()
        {
            //数据库迁移检查