1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-06-26 10:29:31 +00:00

Merge branch 'master' into PCHD

This commit is contained in:
Thomas Harte 2023-12-10 23:15:33 -05:00
commit 05bfab47d2
2 changed files with 2 additions and 2 deletions

View File

@ -461,7 +461,7 @@ class KeyboardController {
pic_.apply_edge<1>(false);
[[fallthrough]];
case Mode::Reset:
reset_delay_ = 5; // Arbitrarily.
reset_delay_ = 15; // Arbitrarily.
break;
}
}

View File

@ -53,7 +53,7 @@ class RTC {
break;
case 0x05: return 0; // Hours alarm
case 0x06: return bcd(time_date->tm_wday + 1); // Day of the week [Sunday = 1]
case 0x07: return bcd(time_date->tm_mon); // Date of the Month [1-31]
case 0x07: return bcd(time_date->tm_mday); // Date of the Month [1-31]
case 0x08: return bcd(time_date->tm_mon + 1); // Month [1-12]
case 0x09: return bcd(time_date->tm_year % 100); // Year [0-99]
case 0x32: return bcd(19 + time_date->tm_year / 100); // Century