Skip to content

Commit f3e4527

Browse files
authored
Merge pull request #109 from Neotron-Compute/chunky-palette-fix
Consistently use the first palette values in chunky modes.
2 parents fadb760 + ee9d92b commit f3e4527

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/main.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ use core::{
6464
fmt::Write,
6565
ptr::{addr_of, addr_of_mut},
6666
sync::atomic::{AtomicBool, AtomicU32, Ordering},
67-
u32,
6867
};
6968

7069
// Third Party Stuff
@@ -1704,9 +1703,9 @@ pub extern "C" fn serial_read(
17041703
/// Gregorian calendar. It simply stores time as an incrementing number of
17051704
/// seconds since some epoch, and the number of milliseconds since that second
17061705
/// began. A day is assumed to be exactly 86,400 seconds long. This is a lot
1707-
/// like POSIX time, except we have a different epoch
1708-
/// - the Neotron epoch is 2000-01-01T00:00:00Z. It is highly recommend that you
1709-
/// store UTC in the BIOS and use the OS to handle time-zones.
1706+
/// like POSIX time, except we have a different epoch - the Neotron epoch is
1707+
/// 2000-01-01T00:00:00Z. It is highly recommend that you store UTC in the BIOS
1708+
/// and use the OS to handle time-zones.
17101709
///
17111710
/// If the BIOS does not have a battery-backed clock, or if that battery has
17121711
/// failed to keep time, the system starts up assuming it is the epoch.

src/vga/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ impl RenderEngine {
251251
// Get a pointer into our scan-line buffer
252252
let mut scan_line_buffer_ptr = scan_line_buffer.pixel_ptr();
253253
let black_pixel = RGBColour(VIDEO_PALETTE[0].load(Ordering::Relaxed));
254-
let white_pixel = RGBColour(VIDEO_PALETTE[15].load(Ordering::Relaxed));
254+
let white_pixel = RGBColour(VIDEO_PALETTE[1].load(Ordering::Relaxed));
255255
if is_double {
256256
// double-width mode.
257257
// sixteen RGB pixels (eight pairs) per byte

0 commit comments

Comments
 (0)