andrey/k210-sdk-stuff
1
0
Fork 0
mirror of https://github.com/laanwj/k210-sdk-stuff.git synced 2025-01-18 21:17:09 +04:00
Code Issues Projects Releases Wiki Activity

rust: LCD x/y y/x orientation

Browse Source
This commit is contained in:
Wladimir J. van der Laan 2019-05-18 19:51:24 +00:00
parent 5e1213870c
commit ce28856653
5 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust/accelerometer/src/main.rs
View File

@ -77,7 +77,7 @@ fn main() -> ! {
io_set_power();
let spi = p.SPI0.constrain();
let lcd = LCD::new(spi);
let mut lcd = LCD::new(spi);
lcd.init();
lcd.set_direction(lcd::direction::YX_LRUD);
lcd.clear(lcd_colors::PURPLE);

2
rust/game-of-life/src/main.rs
View File

@ -155,7 +155,7 @@ fn main() -> ! {
io_set_power();
let spi = p.SPI0.constrain();
let lcd = LCD::new(spi);
let mut lcd = LCD::new(spi);
lcd.init();
lcd.set_direction(lcd::direction::YX_LRUD);
lcd.clear(lcd_colors::PURPLE);

2
rust/k210-console/src/main.rs
View File

@ -116,7 +116,7 @@ fn main() -> ! {
/* LCD init */
let spi = p.SPI0.constrain();
let lcd = LCD::new(spi);
let mut lcd = LCD::new(spi);
lcd.init();
lcd.set_direction(lcd::direction::YX_RLDU);
lcd.clear(lcd_colors::PURPLE);

37
rust/k210-shared/src/board/lcd.rs
View File

@ -12,8 +12,8 @@ pub const SPI_SLAVE_SELECT: u32 = 3;
pub const DCX_GPIONUM: u8 = 2;
pub const RST_GPIONUM: u8 = 3;
pub const LCD_X_MAX: u16 = 320;
pub const LCD_Y_MAX: u16 = 240;
pub const LCD_X_MAX: u16 = 240;
pub const LCD_Y_MAX: u16 = 320;
#[repr(u8)]
#[derive(Copy, Clone)]
@ -113,11 +113,17 @@ pub const DIR_MASK: u8 = 0xE0;
pub struct LCD<SPI> {
spi: SPI,
pub width: u16,
pub height: u16,
}
impl<X: SPI> LCD<X> {
pub fn new(spi: X) -> Self {
Self { spi }
Self {
spi,
width: 0,
height: 0,
}
}
/* Low-level functions */
@ -245,7 +251,7 @@ impl<X: SPI> LCD<X> {
/* High-level functions */
pub fn init(&self) {
pub fn init(&mut self) {
self.hard_init();
/*soft reset*/
self.write_command(command::SOFTWARE_RESET);
@ -262,20 +268,14 @@ impl<X: SPI> LCD<X> {
self.write_command(command::DISPLAY_ON);
}
pub fn set_direction(&self, dir: direction) {
/* No support for YX orientations right now --
lcd_ctl.dir = dir;
if (dir & DIR_XY_MASK)
{
lcd_ctl.width = LCD_Y_MAX - 1;
lcd_ctl.height = LCD_X_MAX - 1;
pub fn set_direction(&mut self, dir: direction) {
if ((dir as u8) & DIR_XY_MASK) != 0 {
self.width = LCD_Y_MAX;
self.height = LCD_X_MAX;
} else {
self.width = LCD_X_MAX;
self.height = LCD_Y_MAX;
}
else
{
lcd_ctl.width = LCD_X_MAX - 1;
lcd_ctl.height = LCD_Y_MAX - 1;
}
*/
self.write_command(command::MEMORY_ACCESS_CTL);
self.write_byte(&[dir as u8]);
@ -304,8 +304,7 @@ impl<X: SPI> LCD<X> {
pub fn clear(&self, color: u16) {
let data = ((color as u32) << 16) | (color as u32);
//set_area(0, 0, lcd_ctl.width, lcd_ctl.height);
self.set_area(0, 0, LCD_X_MAX - 1, LCD_Y_MAX - 1);
self.set_area(0, 0, self.width - 1, self.height - 1);
self.fill_data(data, (LCD_X_MAX as usize) * (LCD_Y_MAX as usize) / 2);
}

2
rust/mandelbrot/src/main.rs
View File

@ -81,7 +81,7 @@ fn main() -> ! {
io_set_power();
let spi = p.SPI0.constrain();
let lcd = LCD::new(spi);
let mut lcd = LCD::new(spi);
lcd.init();
lcd.set_direction(lcd::direction::YX_RLDU);
lcd.clear(lcd_colors::PURPLE);