-
Notifications
You must be signed in to change notification settings - Fork 212
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
10 changed files
with
104 additions
and
88 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,89 @@ | ||
| use display_interface::{DataFormat, DisplayError, WriteOnlyDataCommand}; | ||
|
|
||
| use super::{Lcd, SubBank}; | ||
|
|
||
| impl<S> WriteOnlyDataCommand for Lcd<S> | ||
| where | ||
| S: SubBank, | ||
| { | ||
| fn send_commands(&mut self, cmd: DataFormat<'_>) -> Result<(), DisplayError> { | ||
| match cmd { | ||
| DataFormat::U8(slice) => { | ||
| for value in slice { | ||
| self.write_command(u16::from(*value)); | ||
| } | ||
| } | ||
| DataFormat::U16(slice) => { | ||
| for value in slice { | ||
| self.write_command(*value); | ||
| } | ||
| } | ||
| DataFormat::U16BE(slice) | DataFormat::U16LE(slice) => { | ||
| // As long as the data bus is 16 bits wide, the byte order doesn't matter. | ||
| for value in slice { | ||
| self.write_command(*value); | ||
| macro_rules! impl_display_interface { | ||
| ($display_interface:ident) => { | ||
| impl<S> $display_interface::WriteOnlyDataCommand for Lcd<S> | ||
| where | ||
| S: SubBank, | ||
| { | ||
| fn send_commands( | ||
| &mut self, | ||
| cmd: $display_interface::DataFormat<'_>, | ||
| ) -> Result<(), $display_interface::DisplayError> { | ||
| use $display_interface::DataFormat; | ||
| match cmd { | ||
| DataFormat::U8(slice) => { | ||
| for value in slice { | ||
| self.write_command(u16::from(*value)); | ||
| } | ||
| } | ||
| DataFormat::U16(slice) => { | ||
| for value in slice { | ||
| self.write_command(*value); | ||
| } | ||
| } | ||
| DataFormat::U16BE(slice) | DataFormat::U16LE(slice) => { | ||
| // As long as the data bus is 16 bits wide, the byte order doesn't matter. | ||
| for value in slice { | ||
| self.write_command(*value); | ||
| } | ||
| } | ||
| DataFormat::U8Iter(iter) => { | ||
| for value in iter { | ||
| self.write_command(u16::from(value)); | ||
| } | ||
| } | ||
| DataFormat::U16BEIter(iter) | DataFormat::U16LEIter(iter) => { | ||
| // As long as the data bus is 16 bits wide, the byte order doesn't matter. | ||
| for value in iter { | ||
| self.write_command(value); | ||
| } | ||
| } | ||
| _ => return Err($display_interface::DisplayError::DataFormatNotImplemented), | ||
| } | ||
| Ok(()) | ||
| } | ||
| DataFormat::U8Iter(iter) => { | ||
| for value in iter { | ||
| self.write_command(u16::from(value)); | ||
| } | ||
| } | ||
| DataFormat::U16BEIter(iter) | DataFormat::U16LEIter(iter) => { | ||
| // As long as the data bus is 16 bits wide, the byte order doesn't matter. | ||
| for value in iter { | ||
| self.write_command(value); | ||
| } | ||
| } | ||
| _ => return Err(DisplayError::DataFormatNotImplemented), | ||
| } | ||
| Ok(()) | ||
| } | ||
|
|
||
| fn send_data(&mut self, buf: DataFormat<'_>) -> Result<(), DisplayError> { | ||
| match buf { | ||
| DataFormat::U8(slice) => { | ||
| for value in slice { | ||
| self.write_data(u16::from(*value)); | ||
| fn send_data( | ||
| &mut self, | ||
| buf: $display_interface::DataFormat<'_>, | ||
| ) -> Result<(), $display_interface::DisplayError> { | ||
| use $display_interface::DataFormat; | ||
| match buf { | ||
| DataFormat::U8(slice) => { | ||
| for value in slice { | ||
| self.write_data(u16::from(*value)); | ||
| } | ||
| } | ||
| DataFormat::U16(slice) => { | ||
| for value in slice { | ||
| self.write_data(*value); | ||
| } | ||
| } | ||
| DataFormat::U16BE(slice) | DataFormat::U16LE(slice) => { | ||
| // As long as the data bus is 16 bits wide, the byte order doesn't matter. | ||
| for value in slice { | ||
| self.write_data(*value); | ||
| } | ||
| } | ||
| DataFormat::U8Iter(iter) => { | ||
| for value in iter { | ||
| self.write_data(u16::from(value)); | ||
| } | ||
| } | ||
| DataFormat::U16BEIter(iter) | DataFormat::U16LEIter(iter) => { | ||
| // As long as the data bus is 16 bits wide, the byte order doesn't matter. | ||
| for value in iter { | ||
| self.write_data(value); | ||
| } | ||
| } | ||
| _ => return Err($display_interface::DisplayError::DataFormatNotImplemented), | ||
| } | ||
| Ok(()) | ||
| } | ||
| DataFormat::U16(slice) => { | ||
| for value in slice { | ||
| self.write_data(*value); | ||
| } | ||
| } | ||
| DataFormat::U16BE(slice) | DataFormat::U16LE(slice) => { | ||
| // As long as the data bus is 16 bits wide, the byte order doesn't matter. | ||
| for value in slice { | ||
| self.write_data(*value); | ||
| } | ||
| } | ||
| DataFormat::U8Iter(iter) => { | ||
| for value in iter { | ||
| self.write_data(u16::from(value)); | ||
| } | ||
| } | ||
| DataFormat::U16BEIter(iter) | DataFormat::U16LEIter(iter) => { | ||
| // As long as the data bus is 16 bits wide, the byte order doesn't matter. | ||
| for value in iter { | ||
| self.write_data(value); | ||
| } | ||
| } | ||
| _ => return Err(DisplayError::DataFormatNotImplemented), | ||
| } | ||
| Ok(()) | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| impl_display_interface!(display_interface); | ||
| impl_display_interface!(display_interface_04); |