From 07af460ac24a9ef1a6a63ec13113490849821a61 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期四, 10 十月 2024 15:24:32 +0800
Subject: [PATCH] 声光报警调试
---
IEC61850_ForPowerSupply_ForNW/src/com/power/spcomm/SocketClientComm_Thread.java | 3 +++
IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_Task_Thread.java | 2 +-
IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt | 5 +++++
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_Task_Thread.java b/IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_Task_Thread.java
index 79c29da..8eb0a95 100644
--- a/IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_Task_Thread.java
+++ b/IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_Task_Thread.java
@@ -50,7 +50,7 @@
for(int n=0;n<m_AL_Data.getItemCount();n++) {
if(115 != (m_AL_Data.getItem(n).PowerDevDeviceId/1000000)) {
- System.out.println(m_AL_Data.getItem(n).PowerDevDeviceId);
+ //System.out.println(m_AL_Data.getItem(n).PowerDevDeviceId);
continue;
}
diff --git a/IEC61850_ForPowerSupply_ForNW/src/com/power/spcomm/SocketClientComm_Thread.java b/IEC61850_ForPowerSupply_ForNW/src/com/power/spcomm/SocketClientComm_Thread.java
index 8e8f0c3..99c63ec 100644
--- a/IEC61850_ForPowerSupply_ForNW/src/com/power/spcomm/SocketClientComm_Thread.java
+++ b/IEC61850_ForPowerSupply_ForNW/src/com/power/spcomm/SocketClientComm_Thread.java
@@ -421,9 +421,11 @@
if(alarm_exists) {
if(Alarm_config.Beeper_Sound_OFF>0) {
+ //关闭声音，保留灯
turnOffBuzzerBeep();
}
else {
+ //打开声音和灯
buzzerBeepAndLedOn();
}
}
@@ -434,6 +436,7 @@
}
else {
if(socketCommOK) {
+ //关闭声音和灯
turnOffBuzzerAndLed();
}
}
diff --git a/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt b/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt
index a33de90..79105f4 100644
--- a/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt
+++ b/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt
@@ -1,4 +1,9 @@
南网通信电源通信程序
+ 声光报警器 [串口RS485] - 波特率 9600
+
+ 短信告警 [串口RS232] - 波特率 9600
+
+
V1.102 2024-01-22
1.电源通信程序运行时不再删除配电柜实时状态表重新创建
--
Gitblit v1.9.1