Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hemei
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
hemei
Commits
cd8fc64a
Commit
cd8fc64a
authored
Jan 19, 2021
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
科斯林V1 完成
parent
ec4ddce2
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
189 additions
and
62 deletions
+189
-62
AirRingGraph.xaml
...FLY.KSL.UI.Client/UiModule/AirRingGraph/AirRingGraph.xaml
+1
-1
Accessory.cs
Project.FLY.Thick.Blowing360/FLY.KSL/Common/Accessory.cs
+0
-21
FurnaceOfSubdivide.cs
...FLY.Thick.Blowing360/FLY.KSL/Common/FurnaceOfSubdivide.cs
+6
-0
FLY.KSL.csproj
Project.FLY.Thick.Blowing360/FLY.KSL/FLY.KSL.csproj
+0
-1
IFurnaceSystemService.cs
...hick.Blowing360/FLY.KSL/IService/IFurnaceSystemService.cs
+0
-5
FeedbackHeat.cs
Project.FLY.Thick.Blowing360/FLY.KSL/Server/FeedbackHeat.cs
+1
-1
FurnaceSystem.cs
Project.FLY.Thick.Blowing360/FLY.KSL/Server/FurnaceSystem.cs
+2
-10
Accessory.cs
Resource/科斯林加热系统/设备连接变量表_v1/Generated/Accessory.cs
+0
-21
FurnaceOfSubdivide.cs
Resource/科斯林加热系统/设备连接变量表_v1/Generated/FurnaceOfSubdivide.cs
+6
-0
plcgroup.json
Resource/科斯林加热系统/设备连接变量表_v1/Generated/plcgroup.json
+173
-2
HMI-加热.hmiproj
Resource/科斯林加热系统/设备连接变量表_v1/HMI-加热/HMI-加热.hmiproj
+0
-0
HMI-加热.hmiproj.bak
Resource/科斯林加热系统/设备连接变量表_v1/HMI-加热/HMI-加热.hmiproj.bak
+0
-0
地址表.xlsx
Resource/科斯林加热系统/设备连接变量表_v1/地址表.xlsx
+0
-0
No files found.
Project.FLY.Thick.Blowing360/FLY.KSL.UI.Client/UiModule/AirRingGraph/AirRingGraph.xaml
View file @
cd8fc64a
...
...
@@ -375,7 +375,7 @@
StrokeThickness ="3"
Stroke="{StaticResource Brushes.PVs}"
Fill="Transparent"
Values="{Binding
PV
s}"
Values="{Binding
Curr
s}"
Configuration="{Binding Mapper}"/>
</lvc:CartesianChart.Series>
<lvc:CartesianChart.AxisX>
...
...
Project.FLY.Thick.Blowing360/FLY.KSL/Common/Accessory.cs
deleted
100644 → 0
View file @
ec4ddce2
using
System.ComponentModel
;
namespace
FLY.KSL.Common
{
public
class
Accessory
:
INotifyPropertyChanged
{
public
Accessory
()
{
}
#
region
辅助代码生成
/// <summary>
/// 温度设定SV改变
/// </summary>
[
Description
(
"温度设定SV改变"
)]
public
bool
IsTempSVChanged
{
get
;
set
;
}
#
endregion
public
event
PropertyChangedEventHandler
PropertyChanged
;
}
}
Project.FLY.Thick.Blowing360/FLY.KSL/Common/FurnaceOfSubdivide.cs
View file @
cd8fc64a
...
...
@@ -51,6 +51,12 @@ namespace FLY.KSL.Common
[
Description
(
"自整定开关"
)]
public
bool
IsSelfAdjustingOn
{
get
;
set
;
}
/// <summary>
/// 温度设定SV改变
/// </summary>
[
Description
(
"温度设定SV改变"
)]
public
bool
IsTempSVChanged
{
get
;
set
;
}
#
endregion
public
event
PropertyChangedEventHandler
PropertyChanged
;
}
...
...
Project.FLY.Thick.Blowing360/FLY.KSL/FLY.KSL.csproj
View file @
cd8fc64a
...
...
@@ -45,7 +45,6 @@
<Compile
Include=
"Client\FeedbackHeatServiceClient.cs"
/>
<Compile
Include=
"Client\HeatBufServiceClient.cs"
/>
<Compile
Include=
"Client\HeatCellServiceClient.cs"
/>
<Compile
Include=
"Common\Accessory.cs"
/>
<Compile
Include=
"Common\ERRNOs.cs"
/>
<Compile
Include=
"Common\FeedbackHeatsMark.cs"
/>
<Compile
Include=
"Common\FlyData_FeedbackHeat.cs"
/>
...
...
Project.FLY.Thick.Blowing360/FLY.KSL/IService/IFurnaceSystemService.cs
View file @
cd8fc64a
...
...
@@ -16,11 +16,6 @@ namespace FLY.KSL.IService
/// </summary>
ObservableCollection
<
FurnaceOfSubdivide
>
Fos
{
get
;
}
/// <summary>
/// 辅助设置
/// </summary>
Accessory
Accessory
{
get
;
}
/// <summary>
/// PLC代理系统
/// </summary>
...
...
Project.FLY.Thick.Blowing360/FLY.KSL/Server/FeedbackHeat.cs
View file @
cd8fc64a
...
...
@@ -398,8 +398,8 @@ namespace FLY.KSL.Server
{
var
heat
=
heats
[
i
];
plc
.
Fos
[
i
].
TempSV
=
heat
;
plc
.
Fos
[
i
].
IsTempSVChanged
=
true
;
}
plc
.
Accessory
.
IsTempSVChanged
=
true
;
}
...
...
Project.FLY.Thick.Blowing360/FLY.KSL/Server/FurnaceSystem.cs
View file @
cd8fc64a
...
...
@@ -22,11 +22,6 @@ namespace FLY.KSL.Server
/// </summary>
public
ObservableCollection
<
FurnaceOfSubdivide
>
Fos
{
get
;
}
=
new
ObservableCollection
<
FurnaceOfSubdivide
>();
/// <summary>
/// 辅助设置
/// </summary>
public
Accessory
Accessory
{
get
;
}
=
new
Accessory
();
/// <summary>
/// 区数
/// </summary>
...
...
@@ -57,14 +52,12 @@ namespace FLY.KSL.Server
List
<
string
>
props
=
new
List
<
string
>
{
nameof
(
FurnaceOfSubdivide
.
TempPV
),
nameof
(
FurnaceOfSubdivide
.
TempSV
)
nameof
(
FurnaceOfSubdivide
.
TempSV
),
nameof
(
FurnaceOfSubdivide
.
IsTempSVChanged
)
};
PLCos
.
SetPlan
(
$"
{
nameof
(
Fos
)}
[
{
i
}
]"
,
props
,
0
);
}
PLCos
.
SetPlan
(
$"
{
nameof
(
Accessory
)}
"
,
new
string
[]
{
nameof
(
Accessory
.
IsTempSVChanged
)
},
0
);
//--------------------------------------------------------------------------------
//last step PLC 更新计划服务初始化
...
...
@@ -98,7 +91,6 @@ namespace FLY.KSL.Server
//objname 转 obj
Dictionary
<
string
,
INotifyPropertyChanged
>
objnames
=
new
Dictionary
<
string
,
INotifyPropertyChanged
>();
objnames
.
Add
(
nameof
(
Accessory
),
Accessory
);
for
(
int
i
=
0
;
i
<
FosCnt
;
i
++)
objnames
.
Add
(
$"
{
nameof
(
Fos
)}
[
{
i
}
]"
,
Fos
[
i
]);
return
objnames
;
...
...
Resource/科斯林加热系统/设备连接变量表_v1/Generated/Accessory.cs
deleted
100644 → 0
View file @
ec4ddce2
using
System.ComponentModel
;
namespace
XXX.Common
{
public
class
Accessory
:
INotifyPropertyChanged
{
public
Accessory
()
{
}
#
region
辅助代码生成
/// <summary>
/// 温度设定SV改变
/// </summary>
[
Description
(
"温度设定SV改变"
)]
public
bool
IsTempSVChanged
{
get
;
set
;
}
#
endregion
public
event
PropertyChangedEventHandler
PropertyChanged
;
}
}
Resource/科斯林加热系统/设备连接变量表_v1/Generated/FurnaceOfSubdivide.cs
View file @
cd8fc64a
...
...
@@ -51,6 +51,12 @@ namespace XXX.Common
[
Description
(
"自整定开关"
)]
public
bool
IsSelfAdjustingOn
{
get
;
set
;
}
/// <summary>
/// 温度设定SV改变
/// </summary>
[
Description
(
"温度设定SV改变"
)]
public
bool
IsTempSVChanged
{
get
;
set
;
}
#
endregion
public
event
PropertyChangedEventHandler
PropertyChanged
;
}
...
...
Resource/科斯林加热系统/设备连接变量表_v1/Generated/plcgroup.json
View file @
cd8fc64a
...
...
@@ -1268,10 +1268,181 @@
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1
14
0
,
"Addr"
:
1
08
0
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Accessory"
,
"OwnerName"
:
"Fos[0]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1080
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[1]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1080
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[2]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1080
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[3]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1080
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[4]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1080
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[5]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1080
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[6]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1080
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[7]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1100
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[8]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1100
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[9]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1100
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[10]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1100
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[11]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1100
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[12]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1100
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[13]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1100
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[14]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1100
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[15]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1120
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[16]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1120
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[17]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1120
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[18]"
,
"PropertyName"
:
"IsTempSVChanged"
},
{
"DeviceIndex"
:
0
,
"Mode"
:
"0"
,
"Addr"
:
1120
,
"Type"
:
"bool"
,
"Scale"
:
1.0
,
"OwnerName"
:
"Fos[19]"
,
"PropertyName"
:
"IsTempSVChanged"
}
]
...
...
Resource/科斯林加热系统/设备连接变量表_v1/HMI-加热/HMI-加热.hmiproj
View file @
cd8fc64a
No preview for this file type
Resource/科斯林加热系统/设备连接变量表_v1/HMI-加热/HMI-加热.hmiproj.bak
deleted
100644 → 0
View file @
ec4ddce2
File deleted
Resource/科斯林加热系统/设备连接变量表_v1/地址表.xlsx
View file @
cd8fc64a
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment