ctdo
/
crashtest
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup

This commit is contained in:
Lucas Pleß 2012-06-15 16:06:03 +02:00
parent 50ee753667
commit 65a2237348
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/de/ctdo/crashtest/domotics/IRelaisboard.java
View File

@ -5,6 +5,6 @@ public interface IRelaisboard {
void toggleRelais(final int relais, final int milliseconds); void toggleRelais(final int relais, final int milliseconds);
void blinkRelais(final int relais, final int pause); void blinkRelais(final int relais, final int pause);
void blinkRelaisStop(final int relais); void blinkRelaisStop(final int relais);
boolean open(); void open();
void close(); void close();
} }

10
src/de/ctdo/crashtest/domotics/Relaisboard.java
View File

@ -45,13 +45,13 @@ public class Relaisboard implements IRelaisboard {
@Override @Override
public boolean open() { public void open() {
serialPortGeoeffnet = false; serialPortGeoeffnet = false;
Boolean foundPort = false; Boolean foundPort = false;
if (serialPortGeoeffnet) { if (serialPortGeoeffnet) {
Logger.sLog("Serialport bereits geöffnet"); Logger.sLog("Serialport bereits geöffnet");
return false; return;
} }
Enumeration enumComm = CommPortIdentifier.getPortIdentifiers(); Enumeration enumComm = CommPortIdentifier.getPortIdentifiers();
@ -66,7 +66,7 @@ public class Relaisboard implements IRelaisboard {
} }
if (!foundPort) { if (!foundPort) {
Logger.sLog("Serialport nicht gefunden: " + portName); Logger.sLog("Serialport nicht gefunden: " + portName);
return false; return;
} }
try { try {
@ -77,8 +77,6 @@ public class Relaisboard implements IRelaisboard {
outputStream = serialPort.getOutputStream(); outputStream = serialPort.getOutputStream();
serialPortGeoeffnet = true; serialPortGeoeffnet = true;
return true;
} catch (PortInUseException e) { } catch (PortInUseException e) {
Logger.sLog("Relaisboard error: Port belegt " + portName); Logger.sLog("Relaisboard error: Port belegt " + portName);
} catch (IOException e) { } catch (IOException e) {
@ -86,8 +84,6 @@ public class Relaisboard implements IRelaisboard {
} catch(UnsupportedCommOperationException e) { } catch(UnsupportedCommOperationException e) {
Logger.sLog("Relaisboard error: Konnte Schnittstellen-Paramter nicht setzen"); Logger.sLog("Relaisboard error: Konnte Schnittstellen-Paramter nicht setzen");
} }
return false;
} }
@Override @Override