Darkress/pic16f84-sim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

watchdog (#33)

Browse Source 
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#33
This commit was merged in pull request #33.
This commit is contained in:
darkress
2023-06-17 20:43:30 +02:00
parent f2423d0d71
commit 9f2a814c34
6 changed files with 76 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
de/darkress/pic16f84sim/microcontroller/Cycles.java
View File

@@ -5,7 +5,7 @@ public class Cycles {
public static void incCycles()
{
Timer.increaseTimer();
Timer.decreasePrescaler();
cycles++;
}

5
de/darkress/pic16f84sim/microcontroller/Memory.java
View File

@@ -54,7 +54,8 @@ public class Memory
setDataFromIndirectAddress(indirectAddress, data);
return;
}
if(address == 0x01) //Reset PrescalerCounter if change on Option or Timer Register
if(address == 0x01 && !Timer.getPrescalerAssignment()) //Reset PrescalerCounter if change on Option or Timer
// Register
{
Timer.resetTimeToTimerIncrease();
Timer.setCyclesToTimerIncrease(Timer.getCyclesToTimerIncrease() - 1); //Decrease by one to account for
@@ -86,7 +87,7 @@ public class Memory
private static void setDataFromIndirectAddress(int address, int data)
{
if(address == 0x81 || address == 0x01) //Reset PrescalerCounter if change on Option or Timer Register
if((address == 0x81 || address == 0x01) && !Timer.getPrescalerAssignment()) //Reset PrescalerCounter if change on Option or Timer Register
{
Timer.resetTimeToTimerIncrease();
Timer.setCyclesToTimerIncrease(Timer.getCyclesToTimerIncrease() - 1); //Decrease by one to account for

5
de/darkress/pic16f84sim/microcontroller/ProgramCounter.java
View File

@@ -36,4 +36,9 @@ public class ProgramCounter
pc++;
Memory.setPCL(pc & 0x00FF);
}
public static void resetProgramCounter() {
pc = 0;
Memory.setPCL(0x0);
}
}

32
de/darkress/pic16f84sim/microcontroller/Timer.java
View File

@@ -24,7 +24,7 @@ public class Timer
cyclesToTimerIncrease = getPrescalerFactor();
}
private static boolean getPrescalerAsssignment() {
public static boolean getPrescalerAssignment() {
return (Memory.getOption() & 0x08) == 0x08;
}
@@ -32,7 +32,7 @@ public class Timer
final int MULTIPLIER = 2;
int prescalerPower = Memory.getOption() & 0x07;
int prescaler = (int)Math.pow(2, prescalerPower);
if(!getPrescalerAsssignment())
if(!getPrescalerAssignment())
{
return prescaler * MULTIPLIER;
}
@@ -50,17 +50,27 @@ public class Timer
Memory.setTimer(timerRegister);
}
public static void increaseTimer()
public static void decreasePrescaler()
{
if(!timerEnabled())
{
return;
if(getPrescalerAssignment()) { // Assigned to WatchdogTimer
cyclesToTimerIncrease--;
if(cyclesToTimerIncrease == 0) {
resetTimeToTimerIncrease();
Watchdog.decreaseWatchdogTimer();
}
} else {
Watchdog.decreaseWatchdogTimer();
}
cyclesToTimerIncrease--;
if(cyclesToTimerIncrease == 0)
{
resetTimeToTimerIncrease();
increaseTimerRegister();
if(timerEnabled()) {
if(!getPrescalerAssignment()) { // Assigned to timer0
cyclesToTimerIncrease--;
if(cyclesToTimerIncrease == 0) {
resetTimeToTimerIncrease();
Timer.increaseTimerRegister();
}
} else {
Timer.increaseTimerRegister();
}
}
}
}

32
de/darkress/pic16f84sim/microcontroller/Watchdog.java Normal file
View File

@@ -0,0 +1,32 @@
package de.darkress.pic16f84sim.microcontroller;
public class Watchdog
{
private static int watchdogTimer = 18000;
public static int getWatchdogTimer()
{
return watchdogTimer;
}
public static void decreaseWatchdogTimer()
{
watchdogTimer--;
checkWatchdog();
}
private static void checkWatchdog()
{
if(watchdogTimer == 0)
{
System.out.println("Watchdog Time-Out");
Memory.setRegister(0x03, Memory.getRegister(0x03) & 0xEF); //Clear !TO in StatusReg
}
}
public static void resetProgram()
{
Memory.setRegister(0x03, Memory.getRegister(0x03) | 0x10);
watchdogTimer = 18000;
}
}