diff --git a/bin/Control/Control.class b/bin/Control/Control.class new file mode 100644 index 0000000..dc8fbca Binary files /dev/null and b/bin/Control/Control.class differ diff --git a/bin/Control/IActions.class b/bin/Control/IActions.class new file mode 100644 index 0000000..366e3b7 Binary files /dev/null and b/bin/Control/IActions.class differ diff --git a/bin/Model/Backend/MyModel.class b/bin/Model/Backend/MyModel.class new file mode 100644 index 0000000..07c747f Binary files /dev/null and b/bin/Model/Backend/MyModel.class differ diff --git a/bin/Model/Backend/Runtime/Environment.class b/bin/Model/Backend/Runtime/Environment.class index 8e1fd93..b60a699 100644 Binary files a/bin/Model/Backend/Runtime/Environment.class and b/bin/Model/Backend/Runtime/Environment.class differ diff --git a/bin/View/GUIMainFrame.class b/bin/View/GUIMainFrame.class new file mode 100644 index 0000000..0e0ca46 Binary files /dev/null and b/bin/View/GUIMainFrame.class differ diff --git a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.class b/bin/View/GUIMenuBar.class similarity index 88% rename from bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.class rename to bin/View/GUIMenuBar.class index c4349c6..b09d869 100644 Binary files a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.class and b/bin/View/GUIMenuBar.class differ diff --git a/bin/View/GUIPorts.class b/bin/View/GUIPorts.class new file mode 100644 index 0000000..62dbe8d Binary files /dev/null and b/bin/View/GUIPorts.class differ diff --git a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegister.class b/bin/View/GUIRegister.class similarity index 93% rename from bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegister.class rename to bin/View/GUIRegister.class index 511e298..f8a65c9 100644 Binary files a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegister.class and b/bin/View/GUIRegister.class differ diff --git a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.class b/bin/View/GUIRegistersDetailed.class similarity index 76% rename from bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.class rename to bin/View/GUIRegistersDetailed.class index 1c48f95..f85869f 100644 Binary files a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.class and b/bin/View/GUIRegistersDetailed.class differ diff --git a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.class b/bin/View/GUITestFileTable.class similarity index 90% rename from bin/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.class rename to bin/View/GUITestFileTable.class index 7e4b9d6..a84f1bc 100644 Binary files a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.class and b/bin/View/GUITestFileTable.class differ diff --git a/bin/View/IMyView.class b/bin/View/IMyView.class new file mode 100644 index 0000000..7e11211 Binary files /dev/null and b/bin/View/IMyView.class differ diff --git a/bin/View/MyView.class b/bin/View/MyView.class new file mode 100644 index 0000000..f73f877 Binary files /dev/null and b/bin/View/MyView.class differ diff --git a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.class b/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.class deleted file mode 100644 index e1aab4c..0000000 Binary files a/bin/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.class and /dev/null differ diff --git a/src/Control/Control.java b/src/Control/Control.java new file mode 100644 index 0000000..c1d19da --- /dev/null +++ b/src/Control/Control.java @@ -0,0 +1,118 @@ +package Control; + +import java.util.ArrayList; + +import Model.Backend.MyModel; +import View.MyView; + +public class Control implements IActions { + + MyModel oModel; + MyView oView; + //put Objects to manipulate here + + public Control(MyModel model, MyView view) { + oModel = model; + oView = view; + } + + public void getWRegister(int iValue) { + + } + + public void getPCintern(int iValue) { + + } + + public void getPCLATH(int iValue) { + + } + + public void getPCL(int iValue) { + + } + + public void getFSR(int iValue) { + + } + + public void getStatus(int iValue) { + + } + + public void getOption(int iValue) { + + } + + public void getPrescaler(int iValue) { + + } + + public void getTMR0(int iValue) { + + } + + + + public void setPortAPinXToY(int iPort, boolean bEnabled) { + + } + + public void setPortBPinXToY(int iPort, boolean bEnabled) { + + } + + public void setPortATrisXToY(int iPort, boolean bEnabled) { + + } + + public void setPortBTrisXToY(int iPort, boolean bEnabled) { + + } + + public void getRam(int[][] aiiRam) { + + } + + + public void startProgram() { + + } + + public void stepProgram() { + + } + + public void pauseProgram() { + + } + + public void resetProgram() { + + } + + public void controlWDT(boolean bEnabled) { + + } + + public void setQuarz(int iElement) { + + } + + + public void loadFileToEEPROM(ArrayList oData) { + + } + + public void saveSimulatorState() { + + } + + public void loadSimulatorState() { + + } + + public void exitSimulator() { + + } +} diff --git a/src/Control/IActions.java b/src/Control/IActions.java new file mode 100644 index 0000000..8fdbbc3 --- /dev/null +++ b/src/Control/IActions.java @@ -0,0 +1,58 @@ +package Control; + +import java.util.ArrayList; + +public interface IActions { + + public void getWRegister(int iValue); + + public void getPCintern(int iValue); + + public void getPCLATH(int iValue); + + public void getPCL(int iValue); + + public void getFSR(int iValue); + + public void getStatus(int iValue); + + public void getOption(int iValue); + + public void getPrescaler(int iValue); + + public void getTMR0(int iValue); + + + + public void setPortAPinXToY(int iPort, boolean bEnabled); + + public void setPortBPinXToY(int iPort, boolean bEnabled); + + public void setPortATrisXToY(int iPort, boolean bEnabled); + + public void setPortBTrisXToY(int iPort, boolean bEnabled); + + public void getRam(int[][] aiiRam); + + + public void startProgram(); + + public void stepProgram(); + + public void pauseProgram(); + + public void resetProgram(); + + public void controlWDT(boolean bEnabled); + + public void setQuarz(int iElement); + + + public void loadFileToEEPROM(ArrayList oData); + + public void saveSimulatorState(); + + public void loadSimulatorState(); + + public void exitSimulator(); +} diff --git a/src/Model/Backend/MyModel.java b/src/Model/Backend/MyModel.java new file mode 100644 index 0000000..ff9ef86 --- /dev/null +++ b/src/Model/Backend/MyModel.java @@ -0,0 +1,15 @@ +package Model.Backend; + +import Model.Backend.Microcontroller.PIC; + +public class MyModel { + PIC oPIC; + + public MyModel(PIC pic) { + oPIC = pic; + } + + public PIC getPIC() { + return this.oPIC; + } +} diff --git a/src/Model/Backend/Runtime/Environment.java b/src/Model/Backend/Runtime/Environment.java index 0926c5b..f5a9000 100755 --- a/src/Model/Backend/Runtime/Environment.java +++ b/src/Model/Backend/Runtime/Environment.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import Model.Backend.Microcontroller.PIC; import Model.Backend.Microcontroller.WATCHDOG; -import View.PIC_SIMULATOR_GUI_JAVA.GUIMainFrame; +import View.GUIMainFrame; public class Environment { diff --git a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.java b/src/View/GUIMainFrame.java similarity index 97% rename from src/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.java rename to src/View/GUIMainFrame.java index 957614a..e6ed750 100755 --- a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIMainFrame.java +++ b/src/View/GUIMainFrame.java @@ -1,4 +1,4 @@ -package View.PIC_SIMULATOR_GUI_JAVA; +package View; import java.awt.Color; import java.awt.Insets; @@ -117,6 +117,7 @@ public class GUIMainFrame extends JFrame { oMainPanel.add(oPanelRegisterInformation, c); oPanels.add(oPanelRegisterInformation); oPanels.add(oMainPanel); + oMainPanel.add(new GUIPorts()); this.add(oMainPanel); updateWindow(); } diff --git a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.java b/src/View/GUIMenuBar.java similarity index 99% rename from src/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.java rename to src/View/GUIMenuBar.java index 129aed3..d7ca917 100644 --- a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIMenuBar.java +++ b/src/View/GUIMenuBar.java @@ -1,4 +1,4 @@ -package View.PIC_SIMULATOR_GUI_JAVA; +package View; import java.awt.Color; import java.awt.Dimension; diff --git a/src/View/GUIPorts.java b/src/View/GUIPorts.java new file mode 100644 index 0000000..c117406 --- /dev/null +++ b/src/View/GUIPorts.java @@ -0,0 +1,132 @@ +package View; + +import java.awt.GridBagLayout; +import java.awt.GridBagConstraints; + +import javax.swing.JCheckBox; +import javax.swing.JLabel; +import javax.swing.JPanel; + +public class GUIPorts extends JPanel { + + JPanel oPanelPortA = new JPanel(); + JPanel oPanelPortB = new JPanel(); + + JPanel oPanelPortAPins = new JPanel(); + JPanel oPanelPortATris = new JPanel(); + JPanel oPanelPortBPins = new JPanel(); + JPanel oPanelPortBTris = new JPanel(); + + JLabel oPortA = new JLabel("Port A"); + JLabel oPortB = new JLabel("Port B"); + JLabel oTrisA = new JLabel("Tris"); + JLabel oTrisB = new JLabel("Tris"); + JLabel oPinA = new JLabel("Pin"); + JLabel oPinB = new JLabel("Pin"); + + JCheckBox oRA4 = new JCheckBox("RA4"); + JCheckBox oRA3 = new JCheckBox("RA3"); + JCheckBox oRA2 = new JCheckBox("RA2"); + JCheckBox oRA1 = new JCheckBox("RA1"); + JCheckBox oRA0 = new JCheckBox("RA0"); + + JCheckBox oTRISA4 = new JCheckBox("TRISA4"); + JCheckBox oTRISA3 = new JCheckBox("TRISA3"); + JCheckBox oTRISA2 = new JCheckBox("TRISA2"); + JCheckBox oTRISA1 = new JCheckBox("TRISA1"); + JCheckBox oTRISA0 = new JCheckBox("TRISA0"); + + JCheckBox oRB7 = new JCheckBox("RB7"); + JCheckBox oRB6 = new JCheckBox("RB6"); + JCheckBox oRB5 = new JCheckBox("RB5"); + JCheckBox oRB4 = new JCheckBox("RB4"); + JCheckBox oRB3 = new JCheckBox("RB3"); + JCheckBox oRB2 = new JCheckBox("RB2"); + JCheckBox oRB1 = new JCheckBox("RB1"); + JCheckBox oRB0 = new JCheckBox("RB0"); + + JCheckBox oTRISB7 = new JCheckBox("TRISB7"); + JCheckBox oTRISB6 = new JCheckBox("TRISB6"); + JCheckBox oTRISB5 = new JCheckBox("TRISB5"); + JCheckBox oTRISB4 = new JCheckBox("TRISB4"); + JCheckBox oTRISB3 = new JCheckBox("TRISB3"); + JCheckBox oTRISB2 = new JCheckBox("TRISB2"); + JCheckBox oTRISB1 = new JCheckBox("TRISB1"); + JCheckBox oTRISB0 = new JCheckBox("TRISB0"); + + public GUIPorts() { + buildGUIPorts(); + } + + private void buildGUIPorts() { + oPanelPortAPins.add(oRA4); + oPanelPortAPins.add(oRA3); + oPanelPortAPins.add(oRA2); + oPanelPortAPins.add(oRA1); + oPanelPortAPins.add(oRA0); + + oPanelPortATris.add(oTRISA4); + oPanelPortATris.add(oTRISA3); + oPanelPortATris.add(oTRISA2); + oPanelPortATris.add(oTRISA1); + oPanelPortATris.add(oTRISA0); + + oPanelPortBPins.add(oRB7); + oPanelPortBPins.add(oRB6); + oPanelPortBPins.add(oRB5); + oPanelPortBPins.add(oRB4); + oPanelPortBPins.add(oRB3); + oPanelPortBPins.add(oRB2); + oPanelPortBPins.add(oRB1); + oPanelPortBPins.add(oRB0); + + oPanelPortBTris.add(oTRISB7); + oPanelPortBTris.add(oTRISB6); + oPanelPortBTris.add(oTRISB5); + oPanelPortBTris.add(oTRISB4); + oPanelPortBTris.add(oTRISB3); + oPanelPortBTris.add(oTRISB2); + oPanelPortBTris.add(oTRISB1); + oPanelPortBTris.add(oTRISB0); + + oPanelPortA.setLayout(new GridBagLayout()); + oPanelPortB.setLayout(new GridBagLayout()); + + GridBagConstraints oConstraints = new GridBagConstraints(); + oConstraints.anchor = GridBagConstraints.WEST; + + oConstraints.gridx = 0; + oConstraints.gridy = 0; + oPanelPortA.add(oPortA, oConstraints); + oConstraints.gridy = 1; + oPanelPortA.add(oPinA, oConstraints); + oConstraints.gridx = 1; + oPanelPortA.add(oPanelPortAPins, oConstraints); + oConstraints.gridx = 0; + oConstraints.gridy = 2; + oPanelPortA.add(oTrisA); + oConstraints.gridx = 1; + oPanelPortA.add(oPanelPortATris, oConstraints); + + oConstraints.gridx = 0; + oConstraints.gridy = 0; + oPanelPortB.add(oPortB, oConstraints); + oConstraints.gridy = 1; + oPanelPortB.add(oPinB, oConstraints); + oConstraints.gridx = 1; + oPanelPortB.add(oPanelPortBPins, oConstraints); + oConstraints.gridx = 0; + oConstraints.gridy = 2; + oPanelPortB.add(oTrisB); + oConstraints.gridx = 1; + oPanelPortB.add(oPanelPortBTris, oConstraints); + + this.setLayout(new GridBagLayout()); + + oConstraints.gridx = 0; + oConstraints.gridy = 0; + this.add(oPanelPortA, oConstraints); + oConstraints.gridy = 1; + this.add(oPanelPortB, oConstraints); + } +} \ No newline at end of file diff --git a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegister.java b/src/View/GUIRegister.java similarity index 99% rename from src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegister.java rename to src/View/GUIRegister.java index e322489..7b7484d 100644 --- a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegister.java +++ b/src/View/GUIRegister.java @@ -1,4 +1,4 @@ -package View.PIC_SIMULATOR_GUI_JAVA; +package View; import java.util.ArrayList; diff --git a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.java b/src/View/GUIRegistersDetailed.java similarity index 99% rename from src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.java rename to src/View/GUIRegistersDetailed.java index ee2986a..b312a43 100644 --- a/src/View/PIC_SIMULATOR_GUI_JAVA/GUIRegistersDetailed.java +++ b/src/View/GUIRegistersDetailed.java @@ -1,6 +1,5 @@ -package View.PIC_SIMULATOR_GUI_JAVA; +package View; -import javax.sound.sampled.AudioSystem; import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; diff --git a/src/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.java b/src/View/GUITestFileTable.java similarity index 99% rename from src/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.java rename to src/View/GUITestFileTable.java index 4298e55..4e897bf 100644 --- a/src/View/PIC_SIMULATOR_GUI_JAVA/GUITestFileTable.java +++ b/src/View/GUITestFileTable.java @@ -1,4 +1,4 @@ -package View.PIC_SIMULATOR_GUI_JAVA; +package View; import java.awt.Dimension; import java.awt.GridBagConstraints; diff --git a/src/View/IMyView.java b/src/View/IMyView.java new file mode 100644 index 0000000..3aaef6e --- /dev/null +++ b/src/View/IMyView.java @@ -0,0 +1,5 @@ +package View; + +public interface IMyView { + +} diff --git a/src/View/MyView.java b/src/View/MyView.java new file mode 100644 index 0000000..33e91a0 --- /dev/null +++ b/src/View/MyView.java @@ -0,0 +1,19 @@ +package View; + +import javax.swing.JPanel; + +public class MyView { + + GUIMainFrame oGUIMainFrame; + GUIMenuBar oGUIMenuBar; + GUIPorts oGUIPorts; + GUIRegister oGUIRegister; + GUIRegistersDetailed oGUIRegistersDetailed; + GUITestFileTable oGUITestFileTable; + + JPanel oGUIMainPanel; + + public MyView() { + + } +}