Fix 90 and 270 degree rotations

Author: jamwaffles

src/command.rs

@@ -68,8 +68,10 @@ impl Command {
             Command::RemapAndColorDepth(hremap, vremap, cmode, addr_inc_mode) => (
                 [
                     0xA0,
-                    0x20 | ((vremap as u8) << 4 | (hremap as u8) << 1 | (cmode as u8) << 6)
-                        | (addr_inc_mode as u8),
+                    0x20 | ((vremap as u8) << 4
+                        | (hremap as u8) << 1
+                        | (cmode as u8) << 6
+                        | (addr_inc_mode as u8)),
                     0,
                     0,
                     0,

src/mode/graphics.rs

@@ -83,18 +83,17 @@ where
     pub fn flush(&mut self) -> Result<(), ()> {
         // Ensure the display buffer is at the origin of the display before we send the full frame
         // to prevent accidental offsets
-        let (display_width, display_height) = self.properties.get_dimensions();
-        self.properties
-            .set_draw_area((0, 0), (display_width, display_height))?;
+        // let (display_width, display_height) = self.properties.get_dimensions();
+        self.properties.set_draw_area((0, 0), (96, 64))?;
 
         self.properties.draw(&self.buffer)
-        // self.properties.draw(&[0xff; BUF_SIZE])
     }
 
     /// Turn a pixel on or off. A non-zero `value` is treated as on, `0` as off. If the X and Y
     /// coordinates are out of the bounds of the display, this method call is a noop.
     pub fn set_pixel(&mut self, x: u32, y: u32, value: u16) {
-        let (display_width, _) = self.properties.get_dimensions();
+        let display_width = 96;
+        let display_height = 64;
         let display_rotation = self.properties.get_rotation();
 
         let idx = match display_rotation {
@@ -109,7 +108,7 @@ where
                 if y >= display_width as u32 {
                     return;
                 }
-                ((x as usize) * display_width as usize) + (y as usize)
+                ((y as usize) * display_height as usize) + (x as usize)
             }
         } * 2;
 

src/properties.rs

@@ -25,13 +25,11 @@ where
     /// Initialise the display in column mode (i.e. a byte walks down a column of 8 pixels) with
     /// column 0 on the left and column _(display_width - 1)_ on the right.
     pub fn init_column_mode(&mut self) -> Result<(), ()> {
-        let (_, display_height) = self.get_dimensions();
-
         let display_rotation = self.display_rotation;
 
         Command::DisplayOn(false).send(&mut self.iface)?;
         Command::DisplayClockDiv(0x8, 0x0).send(&mut self.iface)?;
-        Command::Multiplex(display_height - 1).send(&mut self.iface)?;
+        Command::Multiplex(64 - 1).send(&mut self.iface)?;
         Command::DisplayOffset(0).send(&mut self.iface)?;
         Command::StartLine(0).send(&mut self.iface)?;
 
@@ -45,16 +43,6 @@ where
         Command::Invert(false).send(&mut self.iface)?;
         Command::DisplayOn(true).send(&mut self.iface)?;
 
-        // let cmds = [
-        //     0xA0, 0x72, 0xA1, 0x0, 0xA2, 0x0, 0xA4, 0xA8, 0x3F, 0xAD, 0x8E, 0xB0, 0x0B, 0xB1, 0x31,
-        //     0xB3, 0xF0, 0x8A, 0x64, 0x8B, 0x78, 0x8C, 0x64, 0xBB, 0x3A, 0xBE, 0x3E, 0x87, 0x06,
-        //     0x81, 0x91, 0x82, 0x50, 0x83, 0x7D,
-        // ];
-
-        // self.iface.send_commands(&cmds);
-
-        Command::DisplayOn(true).send(&mut self.iface)?;
-
         Ok(())
     }
 
@@ -133,7 +121,7 @@ where
             }
             DisplayRotation::Rotate90 => {
                 Command::RemapAndColorDepth(
-                    false,
+                    true,
                     false,
                     ColorMode::CM65k,
                     AddressIncrementMode::Vertical,
@@ -152,7 +140,7 @@ where
             DisplayRotation::Rotate270 => {
                 Command::RemapAndColorDepth(
                     false,
-                    false,
+                    true,
                     ColorMode::CM65k,
                     AddressIncrementMode::Vertical,
                 )