fix #228 and initialize io_dir setting at io_expander.rs #257

morgan · 2023-09-04T10:16:14+08:00

morgan commented

2023-09-04 10:16:14 +08:00

SFP0_LED pin is now configured with hw_rev and fix #228
- add io_expander LED and TX_disable pins for hw version v1.1 and v1.0 at io_expander.rs
port direction setting is now initialized at io_expander.rs
- remove io_expander.set_oe() at satman and runtime main.rs to avoid duplicate logic
add self.config["hw_rev"] at kasli_sco.py for hw_rev="version no." cfg
compilation check
- run nix build <variant> -L for kasli-soc master, satellite & standalone and all built successfully
functional check
- veritied with a multimeter that the TX_DISABLE pin of SFP0..3 were driven to false after startup for all 3 variants
- veritied with a multimeter that the VUSB_PRESENT_N was NOT driven to GND after a correct hw_rev is set

Checklist of backporting SFP0..3 LED indication

change write_rustc_cfg_file(soc, filename) to follow artiq repo (PR #254)
change io_expander not to borrow i2c indefinitely and create io_expander0..1 to store out_current data (PR #255)
update io_expander due to pin swap on Kasli-soc v1.1 #228 (This PR)
implement SFP0..3 LED indication (PR #258)

- `SFP0_LED` pin is now configured with `hw_rev` and fix #228 - add `io_expander` LED and TX_disable pins for hw version `v1.1` and `v1.0` at `io_expander.rs` - port direction setting is now initialized at `io_expander.rs` - remove `io_expander.set_oe()` at satman and runtime `main.rs` to avoid duplicate logic - add `self.config["hw_rev"]` at `kasli_sco.py` for `hw_rev="version no."` cfg - compilation check - run `nix build <variant> -L` for kasli-soc master, satellite & standalone and all built successfully - functional check - veritied with a multimeter that the TX_DISABLE pin of SFP0..3 were driven to false after startup for all 3 variants - veritied with a multimeter that the VUSB_PRESENT_N was **NOT** driven to GND after a correct `hw_rev` is set ## Checklist of backporting SFP0..3 LED indication - [X] change write_rustc_cfg_file(soc, filename) to follow artiq repo (PR #254) - [X] change io_expander not to borrow i2c indefinitely and create io_expander0..1 to store out_current data (PR #255) - [X] update io_expander due to pin swap on Kasli-soc v1.1 #228 (This PR) - [x] implement SFP0..3 LED indication (PR #258)

morgan added 1 commit 2023-09-04 10:16:14 +08:00

30a8ec8fbd - ioexpander.rs: use hw_rev to store SFP0LED pin

- ioexpander.rs: now initialize the expander port direction
- main.rs: remove set_oe for io_expander
- kasli_sco.py: add hw_rev for rustc-cfg file

sb10q reviewed 2023-09-04 14:29:39 +08:00

src/satman/src/main.rs Outdated

													
				@ -484,10 +484,6 @@ pub extern fn main_core0() -> i32 {

				            .init(&mut i2c)

				            .expect("I2C I/O expander #1 initialization failed");

				        // Actively drive TX_DISABLE to false on SFP0..3