Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
imagej-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
imagej-elphel
Commits
1bd52d1c
Commit
1bd52d1c
authored
Oct 18, 2014
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing power control
parent
b9cfde9c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
CalibrationHardwareInterface.java
src/main/java/CalibrationHardwareInterface.java
+7
-6
No files found.
src/main/java/CalibrationHardwareInterface.java
View file @
1bd52d1c
...
...
@@ -1802,7 +1802,7 @@ public class CalibrationHardwareInterface {
public
static
class
PowerControl
{
public
boolean
[]
states
={
false
,
false
,
false
,
false
,
false
};
public
int
[]
lightsChannels
={
2
,
3
,
4
};
// which lights to control on on/off
public
int
[]
lightsChannels
={
/*2,*/
3
,
4
};
// which lights to control on on/off
public
String
[]
groups
={
"heater"
,
"fan"
,
"light"
,
"light1"
,
"light2"
};
public
int
debugLevel
=
1
;
private
String
powerIP
=
"192.168.0.80"
;
...
...
@@ -1870,6 +1870,7 @@ public class CalibrationHardwareInterface {
}
return
true
;
}
public
boolean
showDialog
(
String
title
,
boolean
control
)
{
GenericDialog
gd
=
new
GenericDialog
(
title
);
boolean
heaterOn
=
false
,
fanOn
=
false
,
lightOn
=
false
,
light1On
=
false
,
light2On
=
false
;
...
...
@@ -1898,11 +1899,11 @@ public class CalibrationHardwareInterface {
light2On
=
gd
.
getNextBoolean
();
lightOn
=
gd
.
getNextBoolean
();
if
(!
gd
.
wasOKed
())
{
setPower
(
"heater"
,
heaterOn
?
"on"
:
"off"
);
setPower
(
"fan"
,
fanOn
?
"on"
:
"off"
);
setPower
(
"light
"
,
lightOn
?
"on"
:
"off
"
);
setPower
(
"light
1"
,
light1On
?
"on"
:
"off
"
);
setPower
(
"light2"
,
light2On
?
"on"
:
"off
"
);
setPower
(
"heater"
,
heaterOn
?
"on"
:
"off"
);
setPower
(
"heater"
,
"state"
);
setPower
(
"fan"
,
fanOn
?
"on"
:
"off"
);
setPower
(
"fan"
,
"state"
);
setPower
(
"light
1"
,
light1On
?
"on"
:
"off"
);
setPower
(
"light1"
,
"state
"
);
setPower
(
"light
2"
,
light2On
?
"on"
:
"off"
);
setPower
(
"light2"
,
"state
"
);
// setPower("light",lightOn?"on":"off"); setPower("light","state
");
}
}
return
true
;
...
...
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