From ea6cacfa700e72b5b3a3bb7e58e4077e7a642372 Mon Sep 17 00:00:00 2001
From: luca <luca@acmueller.com>
Date: Mon, 3 Jun 2024 00:27:53 +0200
Subject: [PATCH] sonderbefehle

---
 .idea/misc.xml                                     |  5 +++++
 .../simulator/pic16f84/Controller_Frontend.java    | 14 ++++++++++++--
 .../java/fabrik/simulator/pic16f84/PreScaler.java  |  6 ++++++
 src/main/java/fabrik/simulator/pic16f84/Table.java |  5 ++++-
 .../fabrik/simulator/pic16f84/frontend.fxml        |  1 +
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index e5d6295..0b4fa18 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <writeAnnotations>
+      <writeAnnotation name="javafx.fxml.FXML" />
+    </writeAnnotations>
+  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">
diff --git a/src/main/java/fabrik/simulator/pic16f84/Controller_Frontend.java b/src/main/java/fabrik/simulator/pic16f84/Controller_Frontend.java
index ef94a29..f7e3e9d 100644
--- a/src/main/java/fabrik/simulator/pic16f84/Controller_Frontend.java
+++ b/src/main/java/fabrik/simulator/pic16f84/Controller_Frontend.java
@@ -42,6 +42,8 @@ public class Controller_Frontend {
 
     private static double executionTimeMultiplier = 1;
 
+
+
     public static double getExecutionTimeMultiplier(){
         return executionTimeMultiplier;
     }
@@ -72,6 +74,9 @@ public class Controller_Frontend {
     @FXML
     private Label pclLabel;
 
+    @FXML
+    private Label PrescalerLabel;
+
     @FXML
     private Label statusLabel;
 
@@ -101,6 +106,8 @@ public class Controller_Frontend {
 
 
 
+
+
     private static volatile boolean isAutoRunActive = false;
     private static volatile boolean isSleeping = false;
 
@@ -409,10 +416,13 @@ public class Controller_Frontend {
 
     @FXML
     public void toggleWatchdog(ActionEvent actionEvent) {
-        if (wdtCheck.isSelected())
+        if (wdtCheck.isSelected()){
             WatchdogTimer.enable();
-        else
+
+        }
+        else{
             WatchdogTimer.disable();
+       }
     }
 
     @FXML
diff --git a/src/main/java/fabrik/simulator/pic16f84/PreScaler.java b/src/main/java/fabrik/simulator/pic16f84/PreScaler.java
index f8e9110..d0cf925 100644
--- a/src/main/java/fabrik/simulator/pic16f84/PreScaler.java
+++ b/src/main/java/fabrik/simulator/pic16f84/PreScaler.java
@@ -10,6 +10,12 @@ public class PreScaler {
         return DataRegister.getDirectBit(OPTION, PSA) == 0;
     }
 
+
+
+    public static int getScaler() {
+        return scaler;
+    }
+
     public static int getFactor () {
         int scale = DataRegister.getDirectRegister(OPTION) & 0b111;
         int timer = isPrescalerOnTimer() ? 1 : 0;
diff --git a/src/main/java/fabrik/simulator/pic16f84/Table.java b/src/main/java/fabrik/simulator/pic16f84/Table.java
index 6425b3e..2167ba1 100644
--- a/src/main/java/fabrik/simulator/pic16f84/Table.java
+++ b/src/main/java/fabrik/simulator/pic16f84/Table.java
@@ -79,13 +79,16 @@ public class Table {
         Label fsrLabel = new Label("FSR: 0x" + format(Integer.toHexString(DataRegister.getRegister(DataRegister.getFSR())).toUpperCase()));
         Label pclathLabel = new Label("PCLATH: 0x" + format(Integer.toHexString(DataRegister.getRegister(DataRegister.getPCLATH())).toUpperCase()));
         Label intconLabel = new Label("INTCON: 0x" + format(Integer.toHexString(DataRegister.getRegister(DataRegister.getINTCON())).toUpperCase()));
+        Label wRegisterLabel = new Label("W Register: 0x" + format(Integer.toHexString(Commands.get_wRegister()).toUpperCase()));
+        Label PCLabel = new Label("PC: 0x" + format(Integer.toHexString(DataRegister.getPC()).toUpperCase()));
+        Label Prescaler = new Label("Prescaler: " + format(Integer.toHexString(PreScaler.getScaler())).toUpperCase());
 
 
 
 
         // Erstelle einen VBox, um die TableView und Labels anzuzeigen
         VBox table = new VBox();
-        table.getChildren().addAll(tableView, pclLabel, statusLabel, fsrLabel, pclathLabel, intconLabel);
+        table.getChildren().addAll(tableView, pclLabel, statusLabel, fsrLabel, pclathLabel, intconLabel, wRegisterLabel, PCLabel, Prescaler);
         VBox.setMargin(tableView, new Insets(0, 0, 0, 0));
 
         return table;
diff --git a/src/main/resources/fabrik/simulator/pic16f84/frontend.fxml b/src/main/resources/fabrik/simulator/pic16f84/frontend.fxml
index 0b2125c..2a4cbb3 100644
--- a/src/main/resources/fabrik/simulator/pic16f84/frontend.fxml
+++ b/src/main/resources/fabrik/simulator/pic16f84/frontend.fxml
@@ -67,6 +67,7 @@
 
             <Label fx:id="totalExecutionTimeLabel" text="Total Execution Time: 0µs" />
             <CheckBox fx:id="wdtCheck" mnemonicParsing="false" onAction="#toggleWatchdog" text="Watchdog-Timer">
+               <Label fx:id="watchdogStatusLabel"/>
                <VBox.margin>
                   <Insets top="10.0" />
                </VBox.margin>