Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Thick-Common
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
潘栩锋
Thick-Common
Commits
55a18e0d
Commit
55a18e0d
authored
Mar 07, 2020
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
可以的AD盒界面设置 是否使用电脑计算速度, 因为当前AD盒推送的速度 都是偏小很多
parent
23d8f843
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
3 deletions
+23
-3
Page_FlyAD.xaml
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_FlyAD.xaml
+4
-0
FlyADServiceClient.cs
...LY.Thick.Base/FLY.Thick.Base/Client/FlyADServiceClient.cs
+7
-1
FLYAD_OBJ_INTERFACE.cs
....Base/FLY.Thick.Base/OBJ_INTERFACE/FLYAD_OBJ_INTERFACE.cs
+1
-0
FlyAD_OBJProxy.cs
...ick.Base/FLY.Thick.Base/Server.OBJProxy/FlyAD_OBJProxy.cs
+3
-0
SysParam.cs
Project.FLY.Thick.Base/FLY.Thick.Base/Server/SysParam.cs
+8
-2
No files found.
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_FlyAD.xaml
View file @
55a18e0d
...
...
@@ -53,6 +53,10 @@
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="CRC" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding HasCRC}"/>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="不使用AD盒速度" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsCalSpeed}" HorizontalAlignment="Left"/>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5" >
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strPulseOfGrid}" />
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding PosOfGrid}" />
...
...
Project.FLY.Thick.Base/FLY.Thick.Base/Client/FlyADServiceClient.cs
View file @
55a18e0d
...
...
@@ -47,6 +47,10 @@ namespace FLY.Thick.Base.Client
}
}
}
/// <summary>
/// 通过脉冲计算速度,不使用AD盒的输出
/// </summary>
public
bool
IsCalSpeed
{
get
;
set
;
}
=
true
;
public
int
PosLen
{
get
;
set
;
}
...
...
@@ -87,7 +91,8 @@ namespace FLY.Thick.Base.Client
posoffset
=
PosOffset
,
jogvelocity
=
JogVelocity
,
hasCRC
=
HasCRC
,
gridsmooth
=
GridSmooth
gridsmooth
=
GridSmooth
,
IsCalSpeed
=
IsCalSpeed
};
string
json
=
Newtonsoft
.
Json
.
JsonConvert
.
SerializeObject
(
p
);
...
...
@@ -198,6 +203,7 @@ namespace FLY.Thick.Base.Client
Ratio02
=
p
.
ratio02
;
HasCRC
=
p
.
hasCRC
;
GridSmooth
=
p
.
gridsmooth
;
IsCalSpeed
=
p
.
IsCalSpeed
;
}
break
;
}
}
...
...
Project.FLY.Thick.Base/FLY.Thick.Base/OBJ_INTERFACE/FLYAD_OBJ_INTERFACE.cs
View file @
55a18e0d
...
...
@@ -24,6 +24,7 @@ namespace FLY.Thick.Base.OBJ_INTERFACE
public
UInt32
jogvelocity
;
public
bool
hasCRC
;
public
int
gridsmooth
;
public
bool
IsCalSpeed
;
}
...
...
Project.FLY.Thick.Base/FLY.Thick.Base/Server.OBJProxy/FlyAD_OBJProxy.cs
View file @
55a18e0d
...
...
@@ -36,6 +36,7 @@ namespace FLY.Thick.Base.Server.OBJProxy
if
((
e
.
PropertyName
==
"LocalEP"
)
||
(
e
.
PropertyName
==
"HasCRC"
)
||
(
e
.
PropertyName
==
"GridSmooth"
)
||
(
e
.
PropertyName
==
"IsCalSpeed"
)
||
(
e
.
PropertyName
==
"PosOfGrid"
)
||
(
e
.
PropertyName
==
"PosLen"
)
||
(
e
.
PropertyName
==
"MotorType"
)
||
...
...
@@ -69,6 +70,7 @@ namespace FLY.Thick.Base.Server.OBJProxy
ep
=
mFlyAD
.
LocalEP
.
ToString
(),
hasCRC
=
mFlyAD
.
HasCRC
,
gridsmooth
=
mFlyAD
.
GridSmooth
,
IsCalSpeed
=
mFlyAD
.
IsCalSpeed
,
posofgrid
=
mFlyAD
.
PosOfGrid
,
motortype
=
(
MOTORTYPE
)
mFlyAD
.
MotorType
,
poslen
=
mFlyAD
.
PosLen
,
...
...
@@ -98,6 +100,7 @@ namespace FLY.Thick.Base.Server.OBJProxy
mFlyAD
.
HasCRC
=
p
.
hasCRC
;
mFlyAD
.
GridSmooth
=
p
.
gridsmooth
;
mFlyAD
.
IsCalSpeed
=
p
.
IsCalSpeed
;
var
ep
=
Misc
.
StringConverter
.
ToIPEndPoint
(
p
.
ep
);
if
(!
mFlyAD
.
LocalEP
.
Equals
(
ep
))
mFlyAD
.
Connect
(
ep
);
...
...
Project.FLY.Thick.Base/FLY.Thick.Base/Server/SysParam.cs
View file @
55a18e0d
...
...
@@ -38,6 +38,11 @@ namespace FLY.Thick.Base.Server
/// </summary>
public
int
FLYAD7_GridSmooth
{
get
;
set
;
}
=
0
;
/// <summary>
/// 电脑计算速度,不通过AD盒获取
/// </summary>
public
bool
FLYAD7_IsCalSpeed
{
get
;
set
;
}
=
true
;
#
endregion
private
string
param_path
=
"sysparam.xml"
;
...
...
@@ -58,7 +63,8 @@ namespace FLY.Thick.Base.Server
return
;
if
((
e
.
PropertyName
==
"FLYAD7EP"
)||
(
e
.
PropertyName
==
"FLYAD7_HasCRC"
)||
(
e
.
PropertyName
==
"FLYAD7_GridSmooth"
)
(
e
.
PropertyName
==
"FLYAD7_GridSmooth"
)||
(
e
.
PropertyName
==
"FLYAD7_IsCalSpeed"
)
)
{
Save
();
...
...
@@ -91,7 +97,7 @@ namespace FLY.Thick.Base.Server
"FLYAD7EP"
,
"FLYAD7_HasCRC"
,
"FLYAD7_GridSmooth"
,
"
DBPath
"
"
FLYAD7_IsCalSpeed
"
};
}
}
...
...
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