Merge pull request #126 from willemml/fmc_lcd

Add support for some LCD controllers using the FMC

Author: hannobraun

Cargo.toml

@@ -43,6 +43,10 @@ version = "0.2.3"
 default-features = false
 version = "1.0.2"
 
+[dependencies.display-interface]
+optional = true
+version = "0.4.1"
+
 [dev-dependencies]
 cortex-m-semihosting = "0.3.3"
 panic-halt = "0.2.0"
@@ -59,7 +63,7 @@ usb_hs_phy = []
 rt = ["stm32f7/rt"]
 stm32f722 = ["stm32f7/stm32f7x2", "device-selected"]
 stm32f723 = ["stm32f7/stm32f7x3", "device-selected", "usb_hs_phy"]
-stm32f730 = ["stm32f7/stm32f730", "device-selected", "usb_hs_phy"]
+stm32f730 = ["stm32f7/stm32f730", "device-selected", "usb_hs_phy", "fmc"]
 stm32f732 = ["stm32f7/stm32f7x2", "device-selected"]
 stm32f733 = ["stm32f7/stm32f7x3", "device-selected", "usb_hs_phy"]
 stm32f745 = ["stm32f7/stm32f745", "device-selected", "fmc"]
@@ -72,6 +76,8 @@ stm32f777 = ["stm32f7/stm32f7x7", "device-selected", "ltdc", "fmc"]
 stm32f778 = ["stm32f7/stm32f7x9", "device-selected", "ltdc", "fmc"]
 stm32f779 = ["stm32f7/stm32f7x9", "device-selected", "ltdc", "fmc"]
 
+fmc_lcd = ["display-interface"]
+
 usb_fs = ["synopsys-usb-otg", "synopsys-usb-otg/fs"]
 usb_hs = ["synopsys-usb-otg", "synopsys-usb-otg/hs"]
 

src/fmc.rs

@@ -65,7 +65,7 @@ use crate::gpio::{Alternate, AF12};
 
 /// Storage type for Flexible Memory Controller and its clocks
 pub struct FMC {
-    _fmc: stm32::FMC,
+    pub fmc: stm32::FMC,
     hclk: Hertz,
 }
 
@@ -105,7 +105,7 @@ impl FmcExt for stm32::FMC {
     /// New FMC instance
     fn fmc(self, clocks: &Clocks) -> FMC {
         FMC {
-            _fmc: self,
+            fmc: self,
             hclk: clocks.hclk(),
         }
     }

src/fmc_lcd/display_interface_impl.rs

@@ -0,0 +1,76 @@
+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);
+                }
+            }
+            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));
+                }
+            }
+            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(())
+    }
+}