Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadCommandSystem
Commits
f2fb1473
Commit
f2fb1473
authored
Jun 17, 2020
by
ics
Browse files
use new protocol buffer
parent
16eaa5bd
Changes
4
Show whitespace changes
Inline
Side-by-side
ChangeLog
View file @
f2fb1473
* Use new protocol buf 3.12.1
4.0.20 16/06/2020
------
* sendCrashMail method added in SessionManager.
...
...
pom.xml
View file @
f2fb1473
...
...
@@ -61,12 +61,12 @@
<dependency>
<groupId>
fr.ill.ics
</groupId>
<artifactId>
nomadcommandsystem-messages
</artifactId>
<version>
0.0.
1
</version>
<version>
0.0.
3
</version>
</dependency>
<dependency>
<groupId>
fr.ill.ics
</groupId>
<artifactId>
cameo-api
</artifactId>
<version>
0.1.
8
</version>
<version>
0.1.
9
</version>
<exclusions>
<exclusion>
<groupId>
fr.ill.ics
</groupId>
...
...
src/main/java/fr/ill/ics/nscclient/command/CommandZoneAccessor.java
View file @
f2fb1473
...
...
@@ -2411,7 +2411,7 @@ public class CommandZoneAccessor {
.
setClientID
(
getClientID
())
.
setCommandBoxID
(
commandBoxID
)
.
setLineIndex
(
lineIndex
)
.
setType
((
forLoopType
==
ForLoopType
.
VALUES
?
CommandZoneRequests
.
ForLoopType
.
Type
.
VALUES
:
CommandZoneRequests
.
ForLoopType
.
Type
.
RANGE
))
.
setType
((
forLoopType
==
ForLoopType
.
VALUES
?
CommandZoneRequests
.
ForLoopType
.
Type
.
FOR_
VALUES
:
CommandZoneRequests
.
ForLoopType
.
Type
.
FOR_
RANGE
))
.
build
();
commandBoxRequester
.
sendTwoParts
(
type
.
toByteArray
(),
request
.
toByteArray
());
...
...
@@ -2457,7 +2457,7 @@ public class CommandZoneAccessor {
CommandZoneRequests
.
ForLoopType
.
Type
forLoopType
=
response
.
getValue
();
if
(
forLoopType
==
CommandZoneRequests
.
ForLoopType
.
Type
.
VALUES
)
{
if
(
forLoopType
==
CommandZoneRequests
.
ForLoopType
.
Type
.
FOR_
VALUES
)
{
return
ForLoopType
.
VALUES
;
}
...
...
src/main/java/fr/ill/ics/nscclient/notification/commandzone/sync/CommandZoneSyncEventNotifier.java
View file @
f2fb1473
...
...
@@ -294,7 +294,7 @@ public class CommandZoneSyncEventNotifier {
// Notify if it is not the same client that sent the request.
if
(
request
.
getClientID
()
!=
getClientID
())
{
CommandZoneRequests
.
ForLoopType
.
Type
forLoopType
=
request
.
getType
();
return
new
SetForLoopType
(
request
.
getCommandBoxID
(),
request
.
getLineIndex
(),
(
forLoopType
==
CommandZoneRequests
.
ForLoopType
.
Type
.
VALUES
?
ForLoopType
.
VALUES
:
ForLoopType
.
RANGE
));
return
new
SetForLoopType
(
request
.
getCommandBoxID
(),
request
.
getLineIndex
(),
(
forLoopType
==
CommandZoneRequests
.
ForLoopType
.
Type
.
FOR_
VALUES
?
ForLoopType
.
VALUES
:
ForLoopType
.
RANGE
));
}
}
else
if
(
type
==
CommandZoneRequests
.
Message
.
Type
.
SetStepType
)
{
...
...
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