-
-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #23 from andrewdavidmackenzie/pigg-20
Refactor of GPIO
- Loading branch information
Showing
10 changed files
with
197 additions
and
178 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| mod pins; | ||
|
|
||
| //use serde::{Deserialize, Serialize}; | ||
| use pins::*; | ||
|
|
||
| pub type PinLevel = bool; | ||
|
|
||
| #[derive(Debug)] | ||
| #[allow(dead_code)] | ||
| pub struct GPIOState { | ||
| pub pin_state: [Option<PinLevel>; 40] // TODO make private later | ||
| } | ||
|
|
||
| // All the possible functions a pin can be given | ||
| #[derive(Debug, PartialEq, Clone)] | ||
| #[allow(non_camel_case_types)] | ||
| #[allow(clippy::upper_case_acronyms)] | ||
| pub enum PinFunction { | ||
| Power3V3, | ||
| Power5V, | ||
| Ground, | ||
| Input, | ||
| Output, | ||
| SDA1, | ||
| I2C, | ||
| SCL1, | ||
| SPIO_MOSI, | ||
| SPIO_MISO, | ||
| SPIO_SCLK, | ||
| ID_SD, | ||
| ID, | ||
| EEPROM, | ||
| UART0_TXD, | ||
| UART0_RXD, | ||
| PCM_CLK, | ||
| SPIO_CE0_N, | ||
| SPIO_CE1_N, | ||
| ID_SC | ||
| } | ||
|
|
||
| // [board_pin_number] refer to the pins by the number of the pin printed on the board | ||
| // [bcm_pin_number] refer to the pins by the "Broadcom SOC channel" number, | ||
| // these are the numbers after "GPIO" | ||
| #[derive(Debug, Clone)] | ||
| #[allow(dead_code)] // TODO remove later | ||
| pub struct PinConfig { | ||
| pub board_pin_number: u8, | ||
| bcm_pin_number: Option<u8>, | ||
| pub name: &'static str, | ||
| options: &'static[PinFunction], // The set of functions the pin can have, chosen by user config | ||
| config: Option<PinFunction>, // The currently selected function for the pin, if any selected | ||
| } | ||
|
|
||
| // Model the 40 pin GPIO connections - including Ground, 3.3V and 5V outputs | ||
| // If no specific config is set on a pin, it will have None | ||
| // I have made array of 40, to the index is "of by one" compared to the [board_pin_number] | ||
| // is not used | ||
| #[derive(Debug, Clone)] | ||
| pub struct GPIOConfig { | ||
| pub pins: [PinConfig; 40], // TODO make private later | ||
| } | ||
|
|
||
| impl Default for GPIOConfig { | ||
| fn default() -> Self { | ||
| GPIOConfig { | ||
| pins: [PIN_1, PIN_2, PIN_3, PIN_4, PIN_5, PIN_6, PIN_7, PIN_8, PIN_9, PIN_10, | ||
| PIN_11, PIN_12, PIN_13, PIN_14, PIN_15, PIN_16, PIN_17, PIN_18, PIN_19, PIN_20, | ||
| PIN_21, PIN_22, PIN_23, PIN_24, PIN_25, PIN_26, PIN_27, PIN_28, PIN_29, PIN_30, | ||
| PIN_31, PIN_32, PIN_33, PIN_34, PIN_35, PIN_36, PIN_37, PIN_38, PIN_39, PIN_40], | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod test { | ||
| use crate::gpio; | ||
|
|
||
| #[test] | ||
| fn create_a_config() { | ||
| let config = gpio::GPIOConfig::default(); | ||
| assert_eq!(config.pins[1].config, None); | ||
| } | ||
| } |
Oops, something went wrong.