diff --git a/3D-Modelle/Festo Halter downward.stl b/3D-Modelle/Festo Halter downward.stl new file mode 100755 index 0000000..c2d532f Binary files /dev/null and b/3D-Modelle/Festo Halter downward.stl differ diff --git a/3D-Modelle/Halterung Förderband.stl b/3D-Modelle/Halterung Förderband.stl new file mode 100755 index 0000000..f73a57d Binary files /dev/null and b/3D-Modelle/Halterung Förderband.stl differ diff --git a/3D-Modelle/SPS-Stabhalterung.stl b/3D-Modelle/SPS-Stabhalterung.stl new file mode 100755 index 0000000..c5f8c66 Binary files /dev/null and b/3D-Modelle/SPS-Stabhalterung.stl differ diff --git a/README.md b/Android app/README.md similarity index 100% rename from README.md rename to Android app/README.md diff --git a/app/.gitignore b/Android app/app/.gitignore similarity index 100% rename from app/.gitignore rename to Android app/app/.gitignore diff --git a/app/build.gradle b/Android app/app/build.gradle similarity index 100% rename from app/build.gradle rename to Android app/app/build.gradle diff --git a/app/proguard-rules.pro b/Android app/app/proguard-rules.pro similarity index 100% rename from app/proguard-rules.pro rename to Android app/app/proguard-rules.pro diff --git a/app/src/androidTest/java/com/example/user/myapp/ExampleInstrumentedTest.java b/Android app/app/src/androidTest/java/com/example/user/myapp/ExampleInstrumentedTest.java similarity index 100% rename from app/src/androidTest/java/com/example/user/myapp/ExampleInstrumentedTest.java rename to Android app/app/src/androidTest/java/com/example/user/myapp/ExampleInstrumentedTest.java diff --git a/app/src/main/AndroidManifest.xml b/Android app/app/src/main/AndroidManifest.xml similarity index 100% rename from app/src/main/AndroidManifest.xml rename to Android app/app/src/main/AndroidManifest.xml diff --git a/app/src/main/java/com/example/user/myapp/DisplayMessageActivity.java b/Android app/app/src/main/java/com/example/user/myapp/DisplayMessageActivity.java similarity index 100% rename from app/src/main/java/com/example/user/myapp/DisplayMessageActivity.java rename to Android app/app/src/main/java/com/example/user/myapp/DisplayMessageActivity.java diff --git a/app/src/main/java/com/example/user/myapp/GlobalState.java b/Android app/app/src/main/java/com/example/user/myapp/GlobalState.java similarity index 100% rename from app/src/main/java/com/example/user/myapp/GlobalState.java rename to Android app/app/src/main/java/com/example/user/myapp/GlobalState.java diff --git a/app/src/main/java/com/example/user/myapp/MainActivity.java b/Android app/app/src/main/java/com/example/user/myapp/MainActivity.java similarity index 100% rename from app/src/main/java/com/example/user/myapp/MainActivity.java rename to Android app/app/src/main/java/com/example/user/myapp/MainActivity.java diff --git a/app/src/main/java/com/example/user/myapp/ManualDriveActivity.java b/Android app/app/src/main/java/com/example/user/myapp/ManualDriveActivity.java similarity index 100% rename from app/src/main/java/com/example/user/myapp/ManualDriveActivity.java rename to Android app/app/src/main/java/com/example/user/myapp/ManualDriveActivity.java diff --git a/app/src/main/java/com/example/user/myapp/MeasurementActivity.java b/Android app/app/src/main/java/com/example/user/myapp/MeasurementActivity.java similarity index 100% rename from app/src/main/java/com/example/user/myapp/MeasurementActivity.java rename to Android app/app/src/main/java/com/example/user/myapp/MeasurementActivity.java diff --git a/app/src/main/java/com/example/user/myapp/MyIntentService.java b/Android app/app/src/main/java/com/example/user/myapp/MyIntentService.java similarity index 100% rename from app/src/main/java/com/example/user/myapp/MyIntentService.java rename to Android app/app/src/main/java/com/example/user/myapp/MyIntentService.java diff --git a/app/src/main/java/com/example/user/myapp/OnSwipeTouchListener.java b/Android app/app/src/main/java/com/example/user/myapp/OnSwipeTouchListener.java similarity index 100% rename from app/src/main/java/com/example/user/myapp/OnSwipeTouchListener.java rename to Android app/app/src/main/java/com/example/user/myapp/OnSwipeTouchListener.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/Modbus.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/Modbus.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/Modbus.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/Modbus.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/ModbusException.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/ModbusException.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/ModbusException.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/ModbusException.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/ModbusIOException.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/ModbusIOException.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/ModbusIOException.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/ModbusIOException.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/ModbusSlaveException.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/ModbusSlaveException.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/ModbusSlaveException.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/ModbusSlaveException.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/facade/AbstractModbusMaster.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/facade/AbstractModbusMaster.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/facade/AbstractModbusMaster.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/facade/AbstractModbusMaster.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/facade/ModbusTCPMaster.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/facade/ModbusTCPMaster.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/facade/ModbusTCPMaster.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/facade/ModbusTCPMaster.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/facade/ModbusUDPMaster.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/facade/ModbusUDPMaster.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/facade/ModbusUDPMaster.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/facade/ModbusUDPMaster.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/io/AbstractModbusTransport.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/AbstractModbusTransport.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/io/AbstractModbusTransport.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/AbstractModbusTransport.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/io/AbstractSerialTransportListener.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/AbstractSerialTransportListener.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/io/AbstractSerialTransportListener.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/AbstractSerialTransportListener.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/io/BytesInputStream.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/BytesInputStream.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/io/BytesInputStream.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/BytesInputStream.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/io/BytesOutputStream.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/BytesOutputStream.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/io/BytesOutputStream.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/BytesOutputStream.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/io/FastByteArrayInputStream.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/FastByteArrayInputStream.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/io/FastByteArrayInputStream.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/FastByteArrayInputStream.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/io/FastByteArrayOutputStream.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/FastByteArrayOutputStream.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/io/FastByteArrayOutputStream.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/FastByteArrayOutputStream.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusRTUTCPTransport.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusRTUTCPTransport.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusRTUTCPTransport.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusRTUTCPTransport.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusTCPTransaction.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusTCPTransaction.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusTCPTransaction.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusTCPTransaction.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusTCPTransport.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusTCPTransport.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusTCPTransport.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusTCPTransport.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusTransaction.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusTransaction.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusTransaction.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusTransaction.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusUDPTransaction.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusUDPTransaction.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusUDPTransaction.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusUDPTransaction.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusUDPTransport.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusUDPTransport.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusUDPTransport.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/ModbusUDPTransport.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/io/NonWordDataHandler.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/NonWordDataHandler.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/io/NonWordDataHandler.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/io/NonWordDataHandler.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ExceptionResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ExceptionResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ExceptionResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ExceptionResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalAddressExceptionResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalAddressExceptionResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalAddressExceptionResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalAddressExceptionResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalFunctionExceptionResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalFunctionExceptionResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalFunctionExceptionResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalFunctionExceptionResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalFunctionRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalFunctionRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalFunctionRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalFunctionRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalValueExceptionResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalValueExceptionResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalValueExceptionResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/IllegalValueExceptionResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/MaskWriteRegisterRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/MaskWriteRegisterRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/MaskWriteRegisterRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/MaskWriteRegisterRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/MaskWriteRegisterResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/MaskWriteRegisterResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/MaskWriteRegisterResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/MaskWriteRegisterResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusMessage.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusMessage.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusMessage.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusMessage.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusMessageImpl.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusMessageImpl.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusMessageImpl.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusMessageImpl.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ModbusResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCoilsRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCoilsRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCoilsRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCoilsRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCoilsResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCoilsResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCoilsResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCoilsResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventCounterRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventCounterRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventCounterRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventCounterRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventCounterResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventCounterResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventCounterResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventCounterResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventLogRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventLogRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventLogRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventLogRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventLogResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventLogResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventLogResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadCommEventLogResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadExceptionStatusRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadExceptionStatusRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadExceptionStatusRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadExceptionStatusRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadExceptionStatusResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadExceptionStatusResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadExceptionStatusResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadExceptionStatusResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFIFOQueueRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFIFOQueueRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFIFOQueueRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFIFOQueueRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFIFOQueueResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFIFOQueueResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFIFOQueueResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFIFOQueueResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFileRecordRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFileRecordRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFileRecordRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFileRecordRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFileRecordResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFileRecordResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFileRecordResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadFileRecordResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputDiscretesRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputDiscretesRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputDiscretesRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputDiscretesRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputDiscretesResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputDiscretesResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputDiscretesResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputDiscretesResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputRegistersRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputRegistersRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputRegistersRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputRegistersRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputRegistersResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputRegistersResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputRegistersResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadInputRegistersResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMEIRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMEIRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMEIRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMEIRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMEIResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMEIResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMEIResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMEIResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMultipleRegistersRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMultipleRegistersRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMultipleRegistersRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMultipleRegistersRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMultipleRegistersResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMultipleRegistersResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMultipleRegistersResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadMultipleRegistersResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadSerialDiagnosticsRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadSerialDiagnosticsRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadSerialDiagnosticsRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadSerialDiagnosticsRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadSerialDiagnosticsResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadSerialDiagnosticsResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadSerialDiagnosticsResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadSerialDiagnosticsResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadWriteMultipleRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadWriteMultipleRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadWriteMultipleRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadWriteMultipleRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadWriteMultipleResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadWriteMultipleResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadWriteMultipleResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReadWriteMultipleResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReportSlaveIDRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReportSlaveIDRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReportSlaveIDRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReportSlaveIDRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReportSlaveIDResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReportSlaveIDResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/ReportSlaveIDResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/ReportSlaveIDResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteCoilRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteCoilRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteCoilRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteCoilRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteCoilResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteCoilResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteCoilResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteCoilResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteFileRecordRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteFileRecordRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteFileRecordRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteFileRecordRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteFileRecordResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteFileRecordResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteFileRecordResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteFileRecordResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleCoilsRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleCoilsRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleCoilsRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleCoilsRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleCoilsResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleCoilsResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleCoilsResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleCoilsResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleRegistersRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleRegistersRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleRegistersRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleRegistersRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleRegistersResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleRegistersResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleRegistersResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteMultipleRegistersResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteSingleRegisterRequest.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteSingleRegisterRequest.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteSingleRegisterRequest.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteSingleRegisterRequest.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteSingleRegisterResponse.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteSingleRegisterResponse.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteSingleRegisterResponse.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/msg/WriteSingleRegisterResponse.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/net/AbstractModbusListener.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/AbstractModbusListener.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/net/AbstractModbusListener.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/AbstractModbusListener.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/net/AbstractSerialConnection.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/AbstractSerialConnection.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/net/AbstractSerialConnection.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/AbstractSerialConnection.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/net/AbstractUDPTerminal.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/AbstractUDPTerminal.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/net/AbstractUDPTerminal.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/AbstractUDPTerminal.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/net/ModbusTCPListener.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/ModbusTCPListener.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/net/ModbusTCPListener.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/ModbusTCPListener.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/net/ModbusUDPListener.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/ModbusUDPListener.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/net/ModbusUDPListener.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/ModbusUDPListener.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/net/TCPConnectionHandler.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/TCPConnectionHandler.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/net/TCPConnectionHandler.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/TCPConnectionHandler.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/net/TCPMasterConnection.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/TCPMasterConnection.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/net/TCPMasterConnection.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/TCPMasterConnection.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/net/TCPSlaveConnection.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/TCPSlaveConnection.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/net/TCPSlaveConnection.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/TCPSlaveConnection.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/net/UDPMasterConnection.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/UDPMasterConnection.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/net/UDPMasterConnection.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/UDPMasterConnection.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/net/UDPMasterTerminal.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/UDPMasterTerminal.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/net/UDPMasterTerminal.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/UDPMasterTerminal.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/net/UDPSlaveTerminal.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/UDPSlaveTerminal.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/net/UDPSlaveTerminal.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/net/UDPSlaveTerminal.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/AbstractRegister.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/AbstractRegister.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/AbstractRegister.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/AbstractRegister.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/DefaultProcessImageFactory.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/DefaultProcessImageFactory.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/DefaultProcessImageFactory.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/DefaultProcessImageFactory.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/DigitalIn.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/DigitalIn.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/DigitalIn.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/DigitalIn.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/DigitalOut.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/DigitalOut.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/DigitalOut.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/DigitalOut.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/FIFO.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/FIFO.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/FIFO.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/FIFO.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/File.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/File.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/File.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/File.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/IllegalAddressException.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/IllegalAddressException.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/IllegalAddressException.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/IllegalAddressException.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/InputRegister.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/InputRegister.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/InputRegister.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/InputRegister.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ObservableDigitalOut.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ObservableDigitalOut.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/ObservableDigitalOut.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ObservableDigitalOut.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ObservableRegister.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ObservableRegister.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/ObservableRegister.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ObservableRegister.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ProcessImage.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ProcessImage.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/ProcessImage.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ProcessImage.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ProcessImageFactory.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ProcessImageFactory.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/ProcessImageFactory.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ProcessImageFactory.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ProcessImageImplementation.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ProcessImageImplementation.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/ProcessImageImplementation.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/ProcessImageImplementation.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/Record.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/Record.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/Record.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/Record.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/Register.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/Register.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/Register.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/Register.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleDigitalIn.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleDigitalIn.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleDigitalIn.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleDigitalIn.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleDigitalOut.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleDigitalOut.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleDigitalOut.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleDigitalOut.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleInputRegister.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleInputRegister.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleInputRegister.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleInputRegister.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleProcessImage.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleProcessImage.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleProcessImage.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleProcessImage.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleRegister.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleRegister.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleRegister.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SimpleRegister.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SynchronizedAbstractRegister.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SynchronizedAbstractRegister.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/procimg/SynchronizedAbstractRegister.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/procimg/SynchronizedAbstractRegister.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/slave/ModbusSlave.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/slave/ModbusSlave.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/slave/ModbusSlave.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/slave/ModbusSlave.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/slave/ModbusSlaveFactory.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/slave/ModbusSlaveFactory.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/slave/ModbusSlaveFactory.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/slave/ModbusSlaveFactory.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/slave/ModbusSlaveType.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/slave/ModbusSlaveType.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/slave/ModbusSlaveType.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/slave/ModbusSlaveType.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/util/BitVector.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/util/BitVector.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/util/BitVector.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/util/BitVector.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/util/ModbusUtil.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/util/ModbusUtil.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/util/ModbusUtil.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/util/ModbusUtil.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/util/Observable.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/util/Observable.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/util/Observable.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/util/Observable.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/util/Observer.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/util/Observer.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/util/Observer.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/util/Observer.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/util/SerialParameters.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/util/SerialParameters.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/util/SerialParameters.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/util/SerialParameters.java diff --git a/app/src/main/java/com/ghgande/j2mod/modbus/util/ThreadPool.java b/Android app/app/src/main/java/com/ghgande/j2mod/modbus/util/ThreadPool.java similarity index 100% rename from app/src/main/java/com/ghgande/j2mod/modbus/util/ThreadPool.java rename to Android app/app/src/main/java/com/ghgande/j2mod/modbus/util/ThreadPool.java diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/Android app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to Android app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/app/src/main/res/drawable/con1.xml b/Android app/app/src/main/res/drawable/con1.xml similarity index 100% rename from app/src/main/res/drawable/con1.xml rename to Android app/app/src/main/res/drawable/con1.xml diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/Android app/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from app/src/main/res/drawable/ic_launcher_background.xml rename to Android app/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/app/src/main/res/drawable/ls1.xml b/Android app/app/src/main/res/drawable/ls1.xml similarity index 100% rename from app/src/main/res/drawable/ls1.xml rename to Android app/app/src/main/res/drawable/ls1.xml diff --git a/app/src/main/res/drawable/zyl1.xml b/Android app/app/src/main/res/drawable/zyl1.xml similarity index 100% rename from app/src/main/res/drawable/zyl1.xml rename to Android app/app/src/main/res/drawable/zyl1.xml diff --git a/app/src/main/res/drawable/zyl2.xml b/Android app/app/src/main/res/drawable/zyl2.xml similarity index 100% rename from app/src/main/res/drawable/zyl2.xml rename to Android app/app/src/main/res/drawable/zyl2.xml diff --git a/app/src/main/res/layout/activity_display_message.xml b/Android app/app/src/main/res/layout/activity_display_message.xml similarity index 100% rename from app/src/main/res/layout/activity_display_message.xml rename to Android app/app/src/main/res/layout/activity_display_message.xml diff --git a/app/src/main/res/layout/activity_main.xml b/Android app/app/src/main/res/layout/activity_main.xml similarity index 100% rename from app/src/main/res/layout/activity_main.xml rename to Android app/app/src/main/res/layout/activity_main.xml diff --git a/app/src/main/res/layout/activity_manual_drive.xml b/Android app/app/src/main/res/layout/activity_manual_drive.xml similarity index 100% rename from app/src/main/res/layout/activity_manual_drive.xml rename to Android app/app/src/main/res/layout/activity_manual_drive.xml diff --git a/app/src/main/res/layout/activity_measurement.xml b/Android app/app/src/main/res/layout/activity_measurement.xml similarity index 100% rename from app/src/main/res/layout/activity_measurement.xml rename to Android app/app/src/main/res/layout/activity_measurement.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Android app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to Android app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Android app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to Android app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Android app/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher.png rename to Android app/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Android app/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to Android app/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Android app/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher.png rename to Android app/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Android app/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to Android app/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Android app/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to Android app/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Android app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to Android app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Android app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to Android app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Android app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to Android app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Android app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to Android app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Android app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to Android app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/values/colors.xml b/Android app/app/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to Android app/app/src/main/res/values/colors.xml diff --git a/app/src/main/res/values/strings.xml b/Android app/app/src/main/res/values/strings.xml similarity index 100% rename from app/src/main/res/values/strings.xml rename to Android app/app/src/main/res/values/strings.xml diff --git a/app/src/main/res/values/styles.xml b/Android app/app/src/main/res/values/styles.xml similarity index 100% rename from app/src/main/res/values/styles.xml rename to Android app/app/src/main/res/values/styles.xml diff --git a/app/src/test/java/com/example/user/myapp/ExampleUnitTest.java b/Android app/app/src/test/java/com/example/user/myapp/ExampleUnitTest.java similarity index 100% rename from app/src/test/java/com/example/user/myapp/ExampleUnitTest.java rename to Android app/app/src/test/java/com/example/user/myapp/ExampleUnitTest.java diff --git a/build.gradle b/Android app/build.gradle similarity index 100% rename from build.gradle rename to Android app/build.gradle diff --git a/gradle.properties b/Android app/gradle.properties similarity index 100% rename from gradle.properties rename to Android app/gradle.properties diff --git a/gradle/wrapper/gradle-wrapper.jar b/Android app/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from gradle/wrapper/gradle-wrapper.jar rename to Android app/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/Android app/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from gradle/wrapper/gradle-wrapper.properties rename to Android app/gradle/wrapper/gradle-wrapper.properties diff --git a/gradlew b/Android app/gradlew similarity index 100% rename from gradlew rename to Android app/gradlew diff --git a/gradlew.bat b/Android app/gradlew.bat similarity index 100% rename from gradlew.bat rename to Android app/gradlew.bat diff --git a/settings.gradle b/Android app/settings.gradle similarity index 100% rename from settings.gradle rename to Android app/settings.gradle diff --git a/Dokumentation/Anlage/.~lock.Tag Liste.xlsx# b/Dokumentation/Anlage/.~lock.Tag Liste.xlsx# new file mode 100644 index 0000000..9e741b5 --- /dev/null +++ b/Dokumentation/Anlage/.~lock.Tag Liste.xlsx# @@ -0,0 +1 @@ +,neko,t400.local,23.01.2019 10:42,file:///home/neko/.config/libreoffice/4; \ No newline at end of file diff --git a/Dokumentation/Anlage/SPS-Schauanlage Dokumentation.md b/Dokumentation/Anlage/SPS-Schauanlage Dokumentation.md new file mode 100644 index 0000000..a13a6af --- /dev/null +++ b/Dokumentation/Anlage/SPS-Schauanlage Dokumentation.md @@ -0,0 +1,85 @@ +# SPS-Schauanlage + +Schauanlage, welche eine industrielle Verarbeitung eines Werkstücks simulieren soll. Die Anlage umfasst einen im Kreis laufenden Würfel ("Werkstück"), welches über Förderbänder und Lifte transportiert wird. + +[TOC] + +## Übersicht + +![Skizze-Übersicht](/home/neko/Programs/Git/sps-modbus-app/Dokumentation/Anlage/Skizze-Übersicht.jpg) + +Erklärung der Abkürzungen + +|Abkürzung|Bedeutung| +|---------|---------| +|H#|Heber #| +|PU#|Pusher #| +|LS#|Lichtschranke #| +|SP#|Sortierplatte #| +|B#|"Bohrer"[^Bohrer] #| +|IND#|Induktiver Sensor #| +|R#|Reed-Kontakt #| +|StV#|Stellventil[^StV] #| +|Rb#|Rollband, Förderband| + +[^Bohrer]: Kein wirklicher Bohrer, zur Schau gestellt durch einen Kolben. +[^StV]: Achtung, 2 verschiedenen Typen unter der selben Bezeichnung -> Laut Pneumatikplan vorgehen! + +## Komponentenliste + +|Name|Stk.|Beschreibung|ModellNr.#| +|--|--|--|--| +|Einfachwirkender Kolben mit Rückzug|4|Einfachwirkende Kolben für die Pusher PU1 und PU2 sowie SP1 und B1|Festo ESNU-20-50-P-A| +|Doppelwirkender Kolben|2|Kolben für die Lifte H1 und H2|Festo DSNU-20-100-PPV-A| +|Förderband|2|Zur Beförderung des Werkstücks|| +|Lichtschranke|3|Einstellbare Lichtschranken von Festo zur Produkterkennung auf den Liften sowie bei B1|Festo S-ES-SOE-RT-PS-SIBU| +|Induktionssensor|1|Einstellbarer induktiver Sensor von Festo zur Metallerkennung bei SP1|Festo S-ES-SIE-P mit S-LED-M12| +|5/2 Wege Ventil|2|Festo Solenoid-Ventile für die beiden Heber H1 und H2|Festo VSVA-B-B52-H-A2-1R2L| +|3/2 Wege Ventil|2|Festo Solenoid-Ventile für die beiden Pusher PU1 und PU2 sowie SP1 und B1|Festo VSVA-B-T32C-AH-A2-1R2L| +|Elektronischer Druckmesser|1|Druckmessung des Pneumatiksystems|Festo SDE1-D10-G2-H18-PU-M8| +|Siemens Logo SPS|1|Siemens Logo SPS|Siemens Logo 0BA8| +|Siemens Logo Netzteil|1|Siemens Logo 24V Netzteil|| +|Siemens Logo IO-Erweiterung|1|Erweiterungskarte mit 4 Inputs und 4 Relais|| + +## Funktionsbeschreibung + +Das "Werkstück", repräsentiert durch einen 3D-gedruckten Würfen, wird auf das untere Förderband (RB1) aufgelegt. Das Förderband transportiert das Werkstück bis zum ersten Lift nach Links (H1). Die Lichtschranke (LS1) erkennt, dass sich das Werkstück auf dem Lift befindet und der Kolben H1 fährt aus. + +Wenn erkannt wird, dass der Kolben hochgefahren ist (Reed-Kontakte auf H1: R2 und R1) fährt der Pusher PU1 aus und schiebt das Werkstück auf das obere Förderband RB2. + +Insofern das Werkstück metallisch[^WS-Metall] ist bzw. Metall enthält, fährt die Sortierplatte anhand eines Kolben (SP1) nach unten. Das Werkstück gleitet an einer schrägen Oberfläche an der Spitze der Kolbenstange entlang und fällt vom Förderband in einen Korb vor der Anlage. Nicht-metallische Werkstücke fahren ungehindert an SP1 vorbei. + +Weiter nach Rechts von SP1 befindet sich die Lichtschranke LS5. Sobald diese ein Werkstück erkennt, bleibt das Rollband RB2 stehen und der Kolben B1 fährt aus. Dieser soll die Bohrung eines Werkstückes zur Schau stellen[^Bohrung]. + +Nach der Bohrung fährt das Werkstück weiter und wird durch das Förderband RB2 auf dem Lift H2[^Senker] platziert. Eine Lichtschranke erkennt, dass sich das Werkstück auf dem Lift befindet und der Kolben H2 senkt sich ab. + +Sobald der Kolben H2 die untere Ruheposition erreicht hat (erkannt durch Reed-Kontakte R4 und R3) fährt Pusher PU2 aus und schiebt das Werkstück auf das Förderband RB1 und der Prozess startet von vorne. + +### Geplante und nicht umgesetzte Funktionalität + +Aufgrunde des Mangels einer Lichtschranke (LS6) wurde eine vorgesehene Stop-Funktion der Anlage nicht implementiert. Diese Lichtschranke soll bei erkennen des Werkstückes einen Zähler in der Anlage einmal um 1 erhöhen und beide Förderbänder solange anhalten, bis das Werkstück von Hand nach vorne geschoben wird. + +## Aufbau und Standort + +![photo_2019-01-23_10-31-35](/home/neko/Programs/Git/sps-modbus-app/Dokumentation/Projektfotos/photo_2019-01-23_10-31-35.jpg) + +Der geplante Standort der Anlage sind die etwa 15° angewinkelten Wände im Ausbildungsraum neben der Küche. Diese Wände sind für die Befestigung der Festo Komponenten gedacht. Andere Komponenten wurden entweder anhand von 3D-gedruckten Adaptern (Förderbänder) oder einfach mit doppelseitigem Klebeband befestigt. + +Die SPS wird anhand einer selbstgebauten Adapterplatte auf das Lochraster über der Wand aufgesteckt. Auf der Adapterplatte befindet sich eine Hutschiene[^HutSch], auf der die SPS sowie das SPS-Netzteil und der IO-Erweiterungsadapter befestigt wird. + +Alle Pneumatikkomponenten und Förderbänder werden auf der schrägen Festo-Wand befestigt und lt. Skizze bzw. Photo platziert. + +Die Verkabelung der Komponenten ist lt. Stromlaufplan vorzunehmen. Die Pneumatik ist lt. Pneumatikplan zu verrohren. + +Die Stromversorgung des Systems läuft über die von Festo hergestellten 24V Netzteile und Bananenstecker/Kabel. Vom Netzteil wird die 24V-Schiene über Verteiler aufgeteilt und über Banenenstecker und Kabel zu den jeweiligen Komponenten gebracht. Es ist zu beachten, dass die Masse der 24V-Netzteile von Festo und der Siemens Logo gebrückt werden müssen. + +Die Ventile von Festo benötigten ein besonderes DIN-Anschluss-Kabel, welches in Bananenstecker terminiert. + +## SPS-Tags und Anschlusslisten + +In der Excel-Tabelle "Tag-Liste.xlsx" finden sich die Anschlusslisten und Benennungen sämtlicher im Stromlaufplan erwähnten Komponenten in eigenen Registerkarten. Außerdem findet sich dort die Liste der verwendeten Modbus Coils und Register und eine funktionelle Beschreibung der einzelnen Anschlüsse als Zusatzinformation zum Stromlauf- und Pneumatikplan. + +[^HutSch]: Nach EN50022, "DIN-Schiene" +[^WS-Metall]: Achtung: Aufgrund der niedrigen Spannung des Stoffes des Förderbands sind metallische Werkstücke nicht empfohlen. Durch ihr höheres Gewicht sinken diese leicht ein, was dem Antrieb der Förderbänder zu schaffen macht. +[^Bohrung]: Achtung: Sollte das Werkstück keinen Hohlraum oder keine Aussparung oben besitzen, führt dies dazu, dass der Kolben das Werkstück in das Förderband drückt und es damit evtl. beschädigt. Es wird empfohlen, oben offene Hohlkörper zu verwenden! +[^Senker]: Auch "Senker" genannt. diff --git a/Dokumentation/Anlage/Skizze-Übersicht.jpg b/Dokumentation/Anlage/Skizze-Übersicht.jpg new file mode 100755 index 0000000..b2e001d Binary files /dev/null and b/Dokumentation/Anlage/Skizze-Übersicht.jpg differ diff --git a/Dokumentation/Anlage/Tag Liste.xlsx b/Dokumentation/Anlage/Tag Liste.xlsx new file mode 100755 index 0000000..edb6bed Binary files /dev/null and b/Dokumentation/Anlage/Tag Liste.xlsx differ diff --git a/documentation/doku.ods b/Dokumentation/App/app-variablen.ods similarity index 100% rename from documentation/doku.ods rename to Dokumentation/App/app-variablen.ods diff --git a/Dokumentation/PM/Arbeitspaket-Beschreibung_Fertig.docx b/Dokumentation/PM/Arbeitspaket-Beschreibung_Fertig.docx new file mode 100755 index 0000000..6d1f28f Binary files /dev/null and b/Dokumentation/PM/Arbeitspaket-Beschreibung_Fertig.docx differ diff --git a/Dokumentation/PM/Projektablauf.docx b/Dokumentation/PM/Projektablauf.docx new file mode 100755 index 0000000..5f2eca8 Binary files /dev/null and b/Dokumentation/PM/Projektablauf.docx differ diff --git a/Dokumentation/PM/Projektorganisation.pdf b/Dokumentation/PM/Projektorganisation.pdf new file mode 100755 index 0000000..db3f197 Binary files /dev/null and b/Dokumentation/PM/Projektorganisation.pdf differ diff --git a/Dokumentation/PM/Prot_Controllingsitzung1_23-05-18.pdf b/Dokumentation/PM/Prot_Controllingsitzung1_23-05-18.pdf new file mode 100755 index 0000000..db5b0c0 Binary files /dev/null and b/Dokumentation/PM/Prot_Controllingsitzung1_23-05-18.pdf differ diff --git a/Dokumentation/PM/Prot_Kickoff_PM_18-05-18.pdf b/Dokumentation/PM/Prot_Kickoff_PM_18-05-18.pdf new file mode 100755 index 0000000..6d2fa4c Binary files /dev/null and b/Dokumentation/PM/Prot_Kickoff_PM_18-05-18.pdf differ diff --git a/Dokumentation/PM/Terminplanung.xlsx b/Dokumentation/PM/Terminplanung.xlsx new file mode 100755 index 0000000..2517b20 Binary files /dev/null and b/Dokumentation/PM/Terminplanung.xlsx differ diff --git a/Dokumentation/Projektfotos/_DSC1428.JPG b/Dokumentation/Projektfotos/_DSC1428.JPG new file mode 100755 index 0000000..aa41a0f Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1428.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1430.JPG b/Dokumentation/Projektfotos/_DSC1430.JPG new file mode 100755 index 0000000..7713366 Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1430.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1432.JPG b/Dokumentation/Projektfotos/_DSC1432.JPG new file mode 100755 index 0000000..db3adfa Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1432.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1433.JPG b/Dokumentation/Projektfotos/_DSC1433.JPG new file mode 100755 index 0000000..a95d6af Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1433.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1436.JPG b/Dokumentation/Projektfotos/_DSC1436.JPG new file mode 100755 index 0000000..429d589 Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1436.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1439.JPG b/Dokumentation/Projektfotos/_DSC1439.JPG new file mode 100755 index 0000000..f1f1d84 Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1439.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1445.JPG b/Dokumentation/Projektfotos/_DSC1445.JPG new file mode 100755 index 0000000..2f181fd Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1445.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1446.JPG b/Dokumentation/Projektfotos/_DSC1446.JPG new file mode 100755 index 0000000..6e99523 Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1446.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1448.JPG b/Dokumentation/Projektfotos/_DSC1448.JPG new file mode 100755 index 0000000..70ac2be Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1448.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1449.JPG b/Dokumentation/Projektfotos/_DSC1449.JPG new file mode 100755 index 0000000..9be3f97 Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1449.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1451.JPG b/Dokumentation/Projektfotos/_DSC1451.JPG new file mode 100755 index 0000000..6f8ff41 Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1451.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1452.JPG b/Dokumentation/Projektfotos/_DSC1452.JPG new file mode 100755 index 0000000..25bb943 Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1452.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1455.JPG b/Dokumentation/Projektfotos/_DSC1455.JPG new file mode 100755 index 0000000..a16b7f2 Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1455.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1456.JPG b/Dokumentation/Projektfotos/_DSC1456.JPG new file mode 100755 index 0000000..98138fd Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1456.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1460.JPG b/Dokumentation/Projektfotos/_DSC1460.JPG new file mode 100755 index 0000000..6ba9748 Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1460.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1463.JPG b/Dokumentation/Projektfotos/_DSC1463.JPG new file mode 100755 index 0000000..308dd13 Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1463.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1465.JPG b/Dokumentation/Projektfotos/_DSC1465.JPG new file mode 100755 index 0000000..48f1260 Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1465.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1466.JPG b/Dokumentation/Projektfotos/_DSC1466.JPG new file mode 100755 index 0000000..ea903d7 Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1466.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1507.JPG b/Dokumentation/Projektfotos/_DSC1507.JPG new file mode 100755 index 0000000..b3c195f Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1507.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1508.JPG b/Dokumentation/Projektfotos/_DSC1508.JPG new file mode 100755 index 0000000..f0616a6 Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1508.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1509.JPG b/Dokumentation/Projektfotos/_DSC1509.JPG new file mode 100755 index 0000000..33d431c Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1509.JPG differ diff --git a/Dokumentation/Projektfotos/_DSC1510.JPG b/Dokumentation/Projektfotos/_DSC1510.JPG new file mode 100755 index 0000000..085e0ec Binary files /dev/null and b/Dokumentation/Projektfotos/_DSC1510.JPG differ diff --git a/Dokumentation/Projektfotos/photo_2019-01-23_10-31-35.jpg b/Dokumentation/Projektfotos/photo_2019-01-23_10-31-35.jpg new file mode 100644 index 0000000..09bafc0 Binary files /dev/null and b/Dokumentation/Projektfotos/photo_2019-01-23_10-31-35.jpg differ diff --git a/Dokumentation/Präsentation/SPS-Projekt.pptm b/Dokumentation/Präsentation/SPS-Projekt.pptm new file mode 100755 index 0000000..6dbcde7 Binary files /dev/null and b/Dokumentation/Präsentation/SPS-Projekt.pptm differ diff --git a/SPS Programm/Testprogramme/Förderbandoben_bohrer.lsc b/SPS Programm/Testprogramme/Förderbandoben_bohrer.lsc new file mode 100755 index 0000000..199e5bf Binary files /dev/null and b/SPS Programm/Testprogramme/Förderbandoben_bohrer.lsc differ diff --git a/SPS Programm/Testprogramme/Heber1-Steuerung.lsc b/SPS Programm/Testprogramme/Heber1-Steuerung.lsc new file mode 100755 index 0000000..7e4478b Binary files /dev/null and b/SPS Programm/Testprogramme/Heber1-Steuerung.lsc differ diff --git a/SPS Programm/Testprogramme/SPSproejkt.lsc b/SPS Programm/Testprogramme/SPSproejkt.lsc new file mode 100755 index 0000000..4751d30 Binary files /dev/null and b/SPS Programm/Testprogramme/SPSproejkt.lsc differ diff --git a/SPS Programm/Testprogramme/Schaltplan2.lsc b/SPS Programm/Testprogramme/Schaltplan2.lsc new file mode 100755 index 0000000..2e73889 Binary files /dev/null and b/SPS Programm/Testprogramme/Schaltplan2.lsc differ diff --git a/SPS Programm/Testprogramme/allgemein SPS- projekt.lsc b/SPS Programm/Testprogramme/allgemein SPS- projekt.lsc new file mode 100755 index 0000000..82c6f8b Binary files /dev/null and b/SPS Programm/Testprogramme/allgemein SPS- projekt.lsc differ diff --git a/SPS Programm/V1/V01-Hauptprogramm-Alternative.lsc b/SPS Programm/V1/V01-Hauptprogramm-Alternative.lsc new file mode 100755 index 0000000..c91a2b4 Binary files /dev/null and b/SPS Programm/V1/V01-Hauptprogramm-Alternative.lsc differ diff --git a/SPS Programm/V1/V01-Hauptprogramm.lsc b/SPS Programm/V1/V01-Hauptprogramm.lsc new file mode 100755 index 0000000..3cc8bc9 Binary files /dev/null and b/SPS Programm/V1/V01-Hauptprogramm.lsc differ diff --git a/SPS Programm/V1/neu sps program.lsc b/SPS Programm/V1/neu sps program.lsc new file mode 100755 index 0000000..4632931 Binary files /dev/null and b/SPS Programm/V1/neu sps program.lsc differ diff --git a/SPS Programm/V2/V02-Hauptprogramm.lsc b/SPS Programm/V2/V02-Hauptprogramm.lsc new file mode 100755 index 0000000..d458759 Binary files /dev/null and b/SPS Programm/V2/V02-Hauptprogramm.lsc differ diff --git a/plc-program/V4/Schauanlage-Elektropneumatik.mnp b/SPS Programm/V4/Schauanlage-Elektropneumatik.mnp similarity index 100% rename from plc-program/V4/Schauanlage-Elektropneumatik.mnp rename to SPS Programm/V4/Schauanlage-Elektropneumatik.mnp diff --git a/plc-program/V4/notizen b/SPS Programm/V4/notizen similarity index 100% rename from plc-program/V4/notizen rename to SPS Programm/V4/notizen diff --git a/plc-program/V5/Schauanlage-Elektropneumatik_V5.mnp b/SPS Programm/V5/Schauanlage-Elektropneumatik_V5.mnp similarity index 100% rename from plc-program/V5/Schauanlage-Elektropneumatik_V5.mnp rename to SPS Programm/V5/Schauanlage-Elektropneumatik_V5.mnp diff --git a/plc-program/network-inputs-udf.lma b/SPS Programm/network-inputs-udf.lma similarity index 100% rename from plc-program/network-inputs-udf.lma rename to SPS Programm/network-inputs-udf.lma diff --git a/documentation/Tag Liste.xlsx b/documentation/Tag Liste.xlsx deleted file mode 100755 index a5a0994..0000000 Binary files a/documentation/Tag Liste.xlsx and /dev/null differ