diff --git a/bin/Control/MyControlModel.class b/bin/Control/MyControlModel.class index 3920d54..1661bf8 100644 Binary files a/bin/Control/MyControlModel.class and b/bin/Control/MyControlModel.class differ diff --git a/bin/Control/MyControlView.class b/bin/Control/MyControlView.class index fc80e71..b3d78e2 100644 Binary files a/bin/Control/MyControlView.class and b/bin/Control/MyControlView.class differ diff --git a/bin/Model/Microcontroller/Alu.class b/bin/Model/Microcontroller/Alu.class index 4c942e7..7cf9d04 100644 Binary files a/bin/Model/Microcontroller/Alu.class and b/bin/Model/Microcontroller/Alu.class differ diff --git a/bin/Model/Microcontroller/Eeprom.class b/bin/Model/Microcontroller/Eeprom.class index 66dd2c7..60a0983 100644 Binary files a/bin/Model/Microcontroller/Eeprom.class and b/bin/Model/Microcontroller/Eeprom.class differ diff --git a/bin/Model/Microcontroller/EepromThread.class b/bin/Model/Microcontroller/EepromThread.class index 0700ceb..9cb6470 100644 Binary files a/bin/Model/Microcontroller/EepromThread.class and b/bin/Model/Microcontroller/EepromThread.class differ diff --git a/bin/Model/Microcontroller/InstructionDecoder.class b/bin/Model/Microcontroller/InstructionDecoder.class index 8595154..e86a4f9 100644 Binary files a/bin/Model/Microcontroller/InstructionDecoder.class and b/bin/Model/Microcontroller/InstructionDecoder.class differ diff --git a/bin/Model/Microcontroller/Pic.class b/bin/Model/Microcontroller/Pic.class index 09ea301..149964d 100644 Binary files a/bin/Model/Microcontroller/Pic.class and b/bin/Model/Microcontroller/Pic.class differ diff --git a/bin/Model/Microcontroller/Ram.class b/bin/Model/Microcontroller/Ram.class index cfb089c..addfa9a 100644 Binary files a/bin/Model/Microcontroller/Ram.class and b/bin/Model/Microcontroller/Ram.class differ diff --git a/bin/Model/Microcontroller/Stack.class b/bin/Model/Microcontroller/Stack.class index 57d7170..62821b3 100644 Binary files a/bin/Model/Microcontroller/Stack.class and b/bin/Model/Microcontroller/Stack.class differ diff --git a/bin/Model/Microcontroller/Time.class b/bin/Model/Microcontroller/Time.class index 654c905..43117ca 100644 Binary files a/bin/Model/Microcontroller/Time.class and b/bin/Model/Microcontroller/Time.class differ diff --git a/bin/Model/MyModel.class b/bin/Model/MyModel.class index a8e4fe2..76d798d 100644 Binary files a/bin/Model/MyModel.class and b/bin/Model/MyModel.class differ diff --git a/bin/Model/MyModelData.class b/bin/Model/MyModelData.class index 4a24f17..3adaba6 100644 Binary files a/bin/Model/MyModelData.class and b/bin/Model/MyModelData.class differ diff --git a/bin/Model/ProgramLoader/ReadProgramFile.class b/bin/Model/ProgramLoader/ReadProgramFile.class index e3a4fe7..b6aae51 100644 Binary files a/bin/Model/ProgramLoader/ReadProgramFile.class and b/bin/Model/ProgramLoader/ReadProgramFile.class differ diff --git a/bin/Model/ProgramStepInformation.class b/bin/Model/ProgramStepInformation.class index abe036e..054ebdd 100644 Binary files a/bin/Model/ProgramStepInformation.class and b/bin/Model/ProgramStepInformation.class differ diff --git a/bin/Runtime/Main.class b/bin/Runtime/Main.class index 3607b9c..e3a9b8d 100644 Binary files a/bin/Runtime/Main.class and b/bin/Runtime/Main.class differ diff --git a/bin/View/GUIAbout.class b/bin/View/GUIAbout.class index f6644e6..48ed4a2 100644 Binary files a/bin/View/GUIAbout.class and b/bin/View/GUIAbout.class differ diff --git a/bin/View/GUIHelp.class b/bin/View/GUIHelp.class index 04e0af4..6981ec4 100644 Binary files a/bin/View/GUIHelp.class and b/bin/View/GUIHelp.class differ diff --git a/bin/View/GUIMCMenu.class b/bin/View/GUIMCMenu.class index ff5f92e..3339487 100644 Binary files a/bin/View/GUIMCMenu.class and b/bin/View/GUIMCMenu.class differ diff --git a/bin/View/GUIMainFrame.class b/bin/View/GUIMainFrame.class index 26852d0..9fd0550 100644 Binary files a/bin/View/GUIMainFrame.class and b/bin/View/GUIMainFrame.class differ diff --git a/bin/View/GUIMenuBar.class b/bin/View/GUIMenuBar.class index f05cf62..8ed7418 100644 Binary files a/bin/View/GUIMenuBar.class and b/bin/View/GUIMenuBar.class differ diff --git a/bin/View/GUIPorts.class b/bin/View/GUIPorts.class index faf0916..32fe341 100644 Binary files a/bin/View/GUIPorts.class and b/bin/View/GUIPorts.class differ diff --git a/bin/View/GUIProgramMemory.class b/bin/View/GUIProgramMemory.class index 4542f06..c8b2336 100644 Binary files a/bin/View/GUIProgramMemory.class and b/bin/View/GUIProgramMemory.class differ diff --git a/bin/View/GUIRamTable.class b/bin/View/GUIRamTable.class index bd7aa49..8493954 100644 Binary files a/bin/View/GUIRamTable.class and b/bin/View/GUIRamTable.class differ diff --git a/bin/View/GUIRegister.class b/bin/View/GUIRegister.class index 2a14ab7..1ac4d3e 100644 Binary files a/bin/View/GUIRegister.class and b/bin/View/GUIRegister.class differ diff --git a/bin/View/GUIRegistersDetailed.class b/bin/View/GUIRegistersDetailed.class index 4923629..387e5f5 100644 Binary files a/bin/View/GUIRegistersDetailed.class and b/bin/View/GUIRegistersDetailed.class differ diff --git a/bin/View/GUIStack.class b/bin/View/GUIStack.class index 430080e..8fb5c74 100644 Binary files a/bin/View/GUIStack.class and b/bin/View/GUIStack.class differ diff --git a/bin/View/GUITestFileTable.class b/bin/View/GUITestFileTable.class index 4dfbb88..fdd3ae2 100644 Binary files a/bin/View/GUITestFileTable.class and b/bin/View/GUITestFileTable.class differ diff --git a/bin/View/GUITime.class b/bin/View/GUITime.class index 868bfb1..a1edd44 100644 Binary files a/bin/View/GUITime.class and b/bin/View/GUITime.class differ diff --git a/bin/View/MyColors.class b/bin/View/MyColors.class index 960b0d4..9c37953 100644 Binary files a/bin/View/MyColors.class and b/bin/View/MyColors.class differ diff --git a/bin/View/MyView.class b/bin/View/MyView.class index 82aad5f..8df9143 100644 Binary files a/bin/View/MyView.class and b/bin/View/MyView.class differ diff --git a/documentation/WORD/Dokumentation_Final.docx b/documentation/WORD/Dokumentation_Final.docx index 1b96e89..b235aa4 100644 Binary files a/documentation/WORD/Dokumentation_Final.docx and b/documentation/WORD/Dokumentation_Final.docx differ diff --git a/documentation/WORD/Dokumentation_Final.odt b/documentation/WORD/Dokumentation_Final.odt deleted file mode 100644 index 249c7ea..0000000 Binary files a/documentation/WORD/Dokumentation_Final.odt and /dev/null differ diff --git a/src/Control/MyControlModel.java b/src/Control/MyControlModel.java index 3f5d1a4..57201c1 100644 --- a/src/Control/MyControlModel.java +++ b/src/Control/MyControlModel.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package Control; import Model.MyModelData; diff --git a/src/Control/MyControlView.java b/src/Control/MyControlView.java index fef949d..836a5f6 100644 --- a/src/Control/MyControlView.java +++ b/src/Control/MyControlView.java @@ -1,6 +1,8 @@ +/** + * @author Aaron Moser + */ package Control; -import java.util.ArrayList; import java.util.concurrent.ConcurrentLinkedQueue; import javax.swing.JFrame; @@ -149,6 +151,15 @@ public class MyControlView { abSelected[3] = oPIC.getRam().get_RA3(); abSelected[4] = oPIC.getRam().get_RA4_T0CKI(); + boolean[] abTrisSelected = new boolean[5]; + + abTrisSelected[0] = oPIC.getRam().get_TRISA0(); + abTrisSelected[1] = oPIC.getRam().get_TRISA1(); + abTrisSelected[2] = oPIC.getRam().get_TRISA2(); + abTrisSelected[3] = oPIC.getRam().get_TRISA3(); + abTrisSelected[4] = oPIC.getRam().get_TRISA4(); + + oMyView.getGUIPorts().checkTrisA(abTrisSelected); oMyView.getGUIPorts().checkPortsA(abSelected); oMyView.getGUIPorts().enableCheckboxesA(abEnabled); } @@ -189,6 +200,18 @@ public class MyControlView { abSelected[6] = oPIC.getRam().get_RB6(); abSelected[7] = oPIC.getRam().get_RB7(); + boolean[] abTrisSelected = new boolean[8]; + + abTrisSelected[0] = oPIC.getRam().get_TRISB0(); + abTrisSelected[1] = oPIC.getRam().get_TRISB1(); + abTrisSelected[2] = oPIC.getRam().get_TRISB2(); + abTrisSelected[3] = oPIC.getRam().get_TRISB3(); + abTrisSelected[4] = oPIC.getRam().get_TRISB4(); + abTrisSelected[5] = oPIC.getRam().get_TRISB5(); + abTrisSelected[6] = oPIC.getRam().get_TRISB6(); + abTrisSelected[7] = oPIC.getRam().get_TRISB7(); + + oMyView.getGUIPorts().checkTrisB(abTrisSelected); oMyView.getGUIPorts().checkPortsB(abSelected); oMyView.getGUIPorts().enableCheckboxesB(abEnabled); } diff --git a/src/Model/Microcontroller/Alu.java b/src/Model/Microcontroller/Alu.java index 42c2ee1..82025a9 100644 --- a/src/Model/Microcontroller/Alu.java +++ b/src/Model/Microcontroller/Alu.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package Model.Microcontroller; public class Alu { diff --git a/src/Model/Microcontroller/Eeprom.java b/src/Model/Microcontroller/Eeprom.java index 2bfe6bd..424194b 100644 --- a/src/Model/Microcontroller/Eeprom.java +++ b/src/Model/Microcontroller/Eeprom.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package Model.Microcontroller; import java.io.BufferedReader; diff --git a/src/Model/Microcontroller/EepromThread.java b/src/Model/Microcontroller/EepromThread.java index dce8dcb..ef31e66 100644 --- a/src/Model/Microcontroller/EepromThread.java +++ b/src/Model/Microcontroller/EepromThread.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package Model.Microcontroller; public class EepromThread extends Thread { diff --git a/src/Model/Microcontroller/InstructionDecoder.java b/src/Model/Microcontroller/InstructionDecoder.java index 24aebca..5468fbb 100644 --- a/src/Model/Microcontroller/InstructionDecoder.java +++ b/src/Model/Microcontroller/InstructionDecoder.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package Model.Microcontroller; public class InstructionDecoder { diff --git a/src/Model/Microcontroller/Pic.java b/src/Model/Microcontroller/Pic.java index d43d24b..2fa627a 100755 --- a/src/Model/Microcontroller/Pic.java +++ b/src/Model/Microcontroller/Pic.java @@ -1,9 +1,8 @@ -package Model.Microcontroller; - /** * @author Aaron Moser * @date 23.06.2021 */ +package Model.Microcontroller; /** * Microcontrollerclass that contains all other partclasses @@ -31,6 +30,11 @@ public class Pic { WRegister = 0; ArithmeticLogicUnit = new Alu(); oEeprom = new Eeprom(); + + Ram.set_OPTION(0b11111111); + Ram.set_TRISA(0b11111); + Ram.set_TRISB(0b11111111); + Ram.set_STATUS(0b00011000); } public synchronized void resetPIC() { @@ -38,6 +42,11 @@ public class Pic { Stack = new Stack(); Runtimer = new Time(Ram); WRegister = 0; + + Ram.set_OPTION(0b11111111); + Ram.set_TRISA(0b11111); + Ram.set_TRISB(0b11111111); + Ram.set_STATUS(0b00011000); } //Bitmasks to set or get bits (use OR for set and AND for get). diff --git a/src/Model/Microcontroller/ProgramMemory.java b/src/Model/Microcontroller/ProgramMemory.java index 22330b2..0bd2cc5 100644 --- a/src/Model/Microcontroller/ProgramMemory.java +++ b/src/Model/Microcontroller/ProgramMemory.java @@ -1,8 +1,8 @@ -package Model.Microcontroller; /** * @author Aaron Moser * @date 23.06.2021 */ +package Model.Microcontroller; /** * ProgramMemory of the PIC (Programmspeicher) diff --git a/src/Model/Microcontroller/Ram.java b/src/Model/Microcontroller/Ram.java index e36f028..684e807 100755 --- a/src/Model/Microcontroller/Ram.java +++ b/src/Model/Microcontroller/Ram.java @@ -1,9 +1,8 @@ -package Model.Microcontroller; - /** * @author Aaron Moser * @date 23.06.2021 */ +package Model.Microcontroller; /** * Random Access Memory of the PIC (Datenspeicher) diff --git a/src/Model/Microcontroller/Stack.java b/src/Model/Microcontroller/Stack.java index d1f8b56..0232afb 100755 --- a/src/Model/Microcontroller/Stack.java +++ b/src/Model/Microcontroller/Stack.java @@ -1,11 +1,10 @@ -package Model.Microcontroller; - -import java.util.EmptyStackException; - /** * @author Aaron Moser * @date 31.03.2021 */ +package Model.Microcontroller; + +import java.util.EmptyStackException; /** * Datasheet Page 18 diff --git a/src/Model/Microcontroller/Time.java b/src/Model/Microcontroller/Time.java index c5bd8ab..e9bee87 100644 --- a/src/Model/Microcontroller/Time.java +++ b/src/Model/Microcontroller/Time.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package Model.Microcontroller; public class Time { diff --git a/src/Model/MyModel.java b/src/Model/MyModel.java index 12893c6..f710c64 100644 --- a/src/Model/MyModel.java +++ b/src/Model/MyModel.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package Model; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/src/Model/MyModelData.java b/src/Model/MyModelData.java index 073fc1d..1eaf929 100644 --- a/src/Model/MyModelData.java +++ b/src/Model/MyModelData.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package Model; import Model.Microcontroller.Pic; diff --git a/src/Model/ProgramLoader/ReadProgramFile.java b/src/Model/ProgramLoader/ReadProgramFile.java index 19fef56..4a4fec2 100644 --- a/src/Model/ProgramLoader/ReadProgramFile.java +++ b/src/Model/ProgramLoader/ReadProgramFile.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package Model.ProgramLoader; import java.io.BufferedReader; diff --git a/src/Model/ProgramStepInformation.java b/src/Model/ProgramStepInformation.java index 183fdfa..054172e 100755 --- a/src/Model/ProgramStepInformation.java +++ b/src/Model/ProgramStepInformation.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package Model; import Model.Microcontroller.Pic; diff --git a/src/Runtime/Main.java b/src/Runtime/Main.java index e738675..212d0b2 100755 --- a/src/Runtime/Main.java +++ b/src/Runtime/Main.java @@ -1,4 +1,5 @@ -/**@author Aaron Moser +/** + * @author Aaron Moser */ package Runtime; diff --git a/src/View/GUIAbout.java b/src/View/GUIAbout.java index 90af5c0..7a7ad21 100644 --- a/src/View/GUIAbout.java +++ b/src/View/GUIAbout.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import java.awt.Dimension; diff --git a/src/View/GUIHelp.java b/src/View/GUIHelp.java index cf2972b..984645c 100644 --- a/src/View/GUIHelp.java +++ b/src/View/GUIHelp.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import java.awt.Dimension; diff --git a/src/View/GUIMCMenu.java b/src/View/GUIMCMenu.java index 8490043..2b6318d 100644 --- a/src/View/GUIMCMenu.java +++ b/src/View/GUIMCMenu.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import java.util.ArrayList; diff --git a/src/View/GUIMainFrame.java b/src/View/GUIMainFrame.java index 03ca27a..3104379 100755 --- a/src/View/GUIMainFrame.java +++ b/src/View/GUIMainFrame.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import java.awt.Color; diff --git a/src/View/GUIMenuBar.java b/src/View/GUIMenuBar.java index 3e5b35c..6a75140 100644 --- a/src/View/GUIMenuBar.java +++ b/src/View/GUIMenuBar.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import java.awt.Color; diff --git a/src/View/GUIPorts.java b/src/View/GUIPorts.java index f0f4bf0..3c0171b 100644 --- a/src/View/GUIPorts.java +++ b/src/View/GUIPorts.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import java.util.ArrayList; @@ -233,6 +236,22 @@ public class GUIPorts extends JPanel { } } + public void checkTrisA(boolean[] bChecked) { + int j = 0; + for (int i = 5; i < 10; i++) { + oCheckboxes.get(i).setSelected(bChecked[j]); + j++; + } + } + + public void checkTrisB(boolean[] bChecked) { + int j = 0; + for (int i = 18; i < 26; i++) { + 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]); diff --git a/src/View/GUIProgramMemory.java b/src/View/GUIProgramMemory.java index e04ffa7..2ddedee 100644 --- a/src/View/GUIProgramMemory.java +++ b/src/View/GUIProgramMemory.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; public class GUIProgramMemory { diff --git a/src/View/GUIRamTable.java b/src/View/GUIRamTable.java index dd12f8e..c9c1f36 100644 --- a/src/View/GUIRamTable.java +++ b/src/View/GUIRamTable.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import java.awt.Color; diff --git a/src/View/GUIRegister.java b/src/View/GUIRegister.java index a4c136c..79bfe00 100644 --- a/src/View/GUIRegister.java +++ b/src/View/GUIRegister.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import java.util.ArrayList; diff --git a/src/View/GUIRegistersDetailed.java b/src/View/GUIRegistersDetailed.java index 5b52d28..a2f4e66 100644 --- a/src/View/GUIRegistersDetailed.java +++ b/src/View/GUIRegistersDetailed.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import javax.swing.BorderFactory; diff --git a/src/View/GUIStack.java b/src/View/GUIStack.java index 88d91ae..da41109 100644 --- a/src/View/GUIStack.java +++ b/src/View/GUIStack.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import java.awt.GridBagLayout; diff --git a/src/View/GUITestFileTable.java b/src/View/GUITestFileTable.java index d55e548..a8ba3ba 100644 --- a/src/View/GUITestFileTable.java +++ b/src/View/GUITestFileTable.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import java.awt.Dimension; @@ -195,7 +198,7 @@ public class GUITestFileTable extends JScrollPane { * @param iLineToMark */ public void markLine(int iLineToMark) { - if (oLineInformation.size() > iLineToMark) { + if (oLineInformation.size() > (iLineToMark * 2 + 1)) { if (iLineToMark > -1) { oLineInformation.get(iLineToMark * 2).setForeground(getThemeColor()[3]); oLineInformation.get(iLineToMark * 2).setBorder(BorderFactory.createLineBorder(getThemeColor()[3])); @@ -210,7 +213,7 @@ public class GUITestFileTable extends JScrollPane { * @param iLineToUnmark */ public void unmarkLine(int iLineToUnmark) { - if (oLineInformation.size() > iLineToUnmark) { + if (oLineInformation.size() > (iLineToUnmark * 2 + 1)) { if (iLineToUnmark > -1) { oLineInformation.get(iLineToUnmark * 2).setForeground(getThemeColor()[0]); oLineInformation.get(iLineToUnmark * 2).setBorder(BorderFactory.createLineBorder(getThemeColor()[2])); diff --git a/src/View/GUITime.java b/src/View/GUITime.java index 26ff964..fc951f5 100644 --- a/src/View/GUITime.java +++ b/src/View/GUITime.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import java.awt.Color; diff --git a/src/View/IMyView.java b/src/View/IMyView.java index d743d1f..7492722 100644 --- a/src/View/IMyView.java +++ b/src/View/IMyView.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; public interface IMyView { diff --git a/src/View/MyColors.java b/src/View/MyColors.java index 5582d52..3f82e66 100644 --- a/src/View/MyColors.java +++ b/src/View/MyColors.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import java.awt.Color; diff --git a/src/View/MyView.java b/src/View/MyView.java index 1431b61..96e7117 100644 --- a/src/View/MyView.java +++ b/src/View/MyView.java @@ -1,3 +1,6 @@ +/** + * @author Aaron Moser + */ package View; import java.util.ArrayList;