diff --git a/bin/Control/MyControlView.class b/bin/Control/MyControlView.class index 1cca0eb..a9145e7 100644 Binary files a/bin/Control/MyControlView.class and b/bin/Control/MyControlView.class differ diff --git a/bin/Runtime/Main.class b/bin/Runtime/Main.class index f0ff056..642c5cf 100644 Binary files a/bin/Runtime/Main.class and b/bin/Runtime/Main.class differ diff --git a/bin/View/GUIPorts.class b/bin/View/GUIPorts.class index fed0fb1..faf0916 100644 Binary files a/bin/View/GUIPorts.class and b/bin/View/GUIPorts.class differ diff --git a/src/Control/MyControlView.java b/src/Control/MyControlView.java index 709daa8..ead8fdd 100644 --- a/src/Control/MyControlView.java +++ b/src/Control/MyControlView.java @@ -141,6 +141,15 @@ public class MyControlView { abEnabled[8] = true; abEnabled[9] = true; + boolean[] abSelected = new boolean[5]; + + abSelected[0] = oPIC.getRam().get_RA0(); + abSelected[1] = oPIC.getRam().get_RA1(); + abSelected[2] = oPIC.getRam().get_RA2(); + abSelected[3] = oPIC.getRam().get_RA3(); + abSelected[4] = oPIC.getRam().get_RA4_T0CKI(); + + oMyView.getGUIPorts().checkPortsA(abSelected); oMyView.getGUIPorts().enableCheckboxesA(abEnabled); } @@ -169,6 +178,18 @@ public class MyControlView { abEnabled[14] = true; abEnabled[15] = true; + boolean[] abSelected = new boolean[8]; + + abSelected[0] = oPIC.getRam().get_RB0_INT(); + abSelected[1] = oPIC.getRam().get_RB1(); + abSelected[2] = oPIC.getRam().get_RB2(); + abSelected[3] = oPIC.getRam().get_RB3(); + abSelected[4] = oPIC.getRam().get_RB4(); + abSelected[5] = oPIC.getRam().get_RB5(); + abSelected[6] = oPIC.getRam().get_RB6(); + abSelected[7] = oPIC.getRam().get_RB7(); + + oMyView.getGUIPorts().checkPortsB(abSelected); oMyView.getGUIPorts().enableCheckboxesB(abEnabled); } diff --git a/src/Runtime/Main.java b/src/Runtime/Main.java index f757098..42a25df 100755 --- a/src/Runtime/Main.java +++ b/src/Runtime/Main.java @@ -9,6 +9,12 @@ import Model.MyModelData; import Model.Microcontroller.Pic; import View.MyView; +//LST 1,2,3,4,5,6,7,8,10,15,101 funktionieren +//LST 9 und 11 funktionieren nicht, da WDT nicht richtig implementiert +//LST 12 funktioniert nicht, da eeprom nicht komplett +//LST 13 funktioniert nicht, da kein Lauflicht implementiert +//LST 14 funktioniert nicht, da kein Leuchtband implementiert + public class Main { public static void main(String[] args) { diff --git a/src/View/GUIPorts.java b/src/View/GUIPorts.java index 879edba..f0f4bf0 100644 --- a/src/View/GUIPorts.java +++ b/src/View/GUIPorts.java @@ -215,6 +215,24 @@ public class GUIPorts extends JPanel { return null; } + public void checkPortsA(boolean[] bChecked) { + for (int i = 0; i < 5; i++) { + if (!oCheckboxes.get(i).isEnabled()) { + oCheckboxes.get(i).setSelected(bChecked[i]); + } + } + } + + public void checkPortsB(boolean[] bChecked) { + int j = 0; + for (int i = 10; i < 18; i++) { + if (!oCheckboxes.get(i).isEnabled()) { + oCheckboxes.get(i).setSelected(bChecked[j]); + } + j++; + } + } + public void enableCheckboxesA(boolean[] abEnabled) { for (int i = 0; i < 10; i++) { oCheckboxes.get(i).setEnabled(abEnabled[i]);