ITL-Stefan/sps-modbus-app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added 2 more photosensors, and functional descriptions thereof

Browse Source
This commit is contained in:
root 2018-06-17 22:40:59 +02:00
parent 29172b2386
commit 11d4208ec7
3 changed files with 101 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -4,10 +4,10 @@
/.idea/libraries /.idea/libraries
/.idea/modules.xml /.idea/modules.xml
/.idea/workspace.xml /.idea/workspace.xml
/.idea/caches
.DS_Store .DS_Store
/build /build
/captures /captures
.externalNativeBuild .externalNativeBuild
.idea/assetWizardSettings.xml .idea/assetWizardSettings.xml
/documentation/.~lock.doku.ods# /documentation/.~lock.doku.ods#
.idea/caches/build_file_checksums.ser

112
app/src/main/res/layout/activity_main.xml
View File

@ -52,48 +52,48 @@
android:layout_width="62dp" android:layout_width="62dp"
android:layout_height="21dp" android:layout_height="21dp"
app:srcCompat="@drawable/zyl1" app:srcCompat="@drawable/zyl1"
tools:layout_editor_absoluteX="190dp" tools:layout_editor_absoluteX="91dp"
tools:layout_editor_absoluteY="172dp" /> tools:layout_editor_absoluteY="118dp" />
<ImageView <ImageView
android:id="@+id/b1_icon" android:id="@+id/b1_icon"
android:layout_width="62dp" android:layout_width="62dp"
android:layout_height="21dp" android:layout_height="21dp"
app:srcCompat="@drawable/zyl1" app:srcCompat="@drawable/zyl1"
tools:layout_editor_absoluteX="242dp" tools:layout_editor_absoluteX="91dp"
tools:layout_editor_absoluteY="95dp" /> tools:layout_editor_absoluteY="54dp" />
<ImageView <ImageView
android:id="@+id/sp1_icon" android:id="@+id/sp1_icon"
android:layout_width="62dp" android:layout_width="62dp"
android:layout_height="21dp" android:layout_height="21dp"
app:srcCompat="@drawable/zyl1" app:srcCompat="@drawable/zyl1"
tools:layout_editor_absoluteX="86dp" tools:layout_editor_absoluteX="9dp"
tools:layout_editor_absoluteY="93dp" /> tools:layout_editor_absoluteY="54dp" />
<ImageView <ImageView
android:id="@+id/pu1_icon" android:id="@+id/pu1_icon"
android:layout_width="62dp" android:layout_width="62dp"
android:layout_height="21dp" android:layout_height="21dp"
app:srcCompat="@drawable/zyl1" app:srcCompat="@drawable/zyl1"
tools:layout_editor_absoluteX="76dp" tools:layout_editor_absoluteX="9dp"
tools:layout_editor_absoluteY="172dp" /> tools:layout_editor_absoluteY="119dp" />
<ImageView <ImageView
android:id="@+id/ls5_icon" android:id="@+id/ls5_icon"
android:layout_width="26dp" android:layout_width="26dp"
android:layout_height="38dp" android:layout_height="38dp"
app:srcCompat="@drawable/ls1" app:srcCompat="@drawable/ls1"
tools:layout_editor_absoluteX="179dp" tools:layout_editor_absoluteX="205dp"
tools:layout_editor_absoluteY="77dp" /> tools:layout_editor_absoluteY="54dp" />
<ImageView <ImageView
android:id="@+id/ind1_icon" android:id="@+id/ind1_icon"
android:layout_width="26dp" android:layout_width="26dp"
android:layout_height="38dp" android:layout_height="38dp"
app:srcCompat="@drawable/ls1" app:srcCompat="@drawable/ls1"
tools:layout_editor_absoluteX="29dp" tools:layout_editor_absoluteX="262dp"
tools:layout_editor_absoluteY="76dp" /> tools:layout_editor_absoluteY="54dp" />
<ImageView <ImageView
android:id="@+id/h2_icon" android:id="@+id/h2_icon"
@ -113,6 +113,22 @@
app:srcCompat="@drawable/zyl2" app:srcCompat="@drawable/zyl2"
tools:layout_editor_absoluteY="239dp" /> tools:layout_editor_absoluteY="239dp" />
<ImageView
android:id="@+id/ls4_icon"
android:layout_width="26dp"
android:layout_height="38dp"
app:srcCompat="@drawable/ls1"
tools:layout_editor_absoluteX="262dp"
tools:layout_editor_absoluteY="139dp" />
<ImageView
android:id="@+id/ls1_icon"
android:layout_width="26dp"
android:layout_height="38dp"
app:srcCompat="@drawable/ls1"
tools:layout_editor_absoluteX="205dp"
tools:layout_editor_absoluteY="139dp" />
<ImageView <ImageView
android:id="@+id/pu1_status_light_off_mainview" android:id="@+id/pu1_status_light_off_mainview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -338,7 +354,6 @@
app:layout_constraintStart_toStartOf="@+id/m1_icon" app:layout_constraintStart_toStartOf="@+id/m1_icon"
app:srcCompat="@android:drawable/presence_online" /> app:srcCompat="@android:drawable/presence_online" />
<ImageView <ImageView
android:id="@+id/m2_status_light_off_mainview" android:id="@+id/m2_status_light_off_mainview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -378,7 +393,6 @@
app:layout_constraintTop_toTopOf="@+id/m1_icon" app:layout_constraintTop_toTopOf="@+id/m1_icon"
app:layout_constraintVertical_bias="1.0" /> app:layout_constraintVertical_bias="1.0" />
<TextView <TextView
android:id="@+id/m2_textview_mainview" android:id="@+id/m2_textview_mainview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -481,4 +495,74 @@
app:layout_constraintEnd_toEndOf="@+id/sp1_icon" app:layout_constraintEnd_toEndOf="@+id/sp1_icon"
app:layout_constraintStart_toStartOf="@+id/sp1_icon" app:layout_constraintStart_toStartOf="@+id/sp1_icon"
app:layout_constraintTop_toBottomOf="@+id/sp1_icon" /> app:layout_constraintTop_toBottomOf="@+id/sp1_icon" />
<TextView
android:id="@+id/ls4_textview_mainview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="LS4"
app:layout_constraintEnd_toEndOf="@+id/ls4_icon"
app:layout_constraintStart_toStartOf="@+id/ls4_icon"
app:layout_constraintTop_toBottomOf="@+id/ls4_icon" />
<ImageView
android:id="@+id/ls4_status_light_off_mainview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
app:layout_constraintBottom_toTopOf="@+id/ls4_icon"
app:layout_constraintEnd_toEndOf="@+id/ls4_icon"
app:layout_constraintStart_toStartOf="@+id/ls4_icon"
app:srcCompat="@android:drawable/presence_invisible" />
<ImageView
android:id="@+id/ls4_status_light_on_mainview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
app:layout_constraintBottom_toTopOf="@+id/ls4_icon"
app:layout_constraintEnd_toEndOf="@+id/ls4_icon"
app:layout_constraintStart_toStartOf="@+id/ls4_icon"
app:srcCompat="@android:drawable/presence_online" />
<TextView
android:id="@+id/ls1_textview_mainview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="LS1"
app:layout_constraintEnd_toEndOf="@+id/ls1_icon"
app:layout_constraintStart_toStartOf="@+id/ls1_icon"
app:layout_constraintTop_toBottomOf="@+id/ls1_icon" />
<ImageView
android:id="@+id/ls1_status_light_off_mainview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
app:layout_constraintBottom_toTopOf="@+id/ls1_icon"
app:layout_constraintEnd_toEndOf="@+id/ls1_icon"
app:layout_constraintStart_toStartOf="@+id/ls1_icon"
app:srcCompat="@android:drawable/presence_invisible" />
<ImageView
android:id="@+id/ls1_status_light_on_mainview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
app:layout_constraintBottom_toTopOf="@+id/ls1_icon"
app:layout_constraintEnd_toEndOf="@+id/ls1_icon"
app:layout_constraintStart_toStartOf="@+id/ls1_icon"
app:srcCompat="@android:drawable/presence_online" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>

BIN
documentation/doku.ods
View File

Binary file not shown.