From 2715ccd55aa859ecf0577d7c30f65568d1cf8e9d Mon Sep 17 00:00:00 2001 From: David Holdeman Date: Fri, 10 Feb 2023 04:01:05 -0600 Subject: [PATCH] update interactive-pinout, update yamls (#5049) --- .github/workflows/gen-pinouts.yaml | 2 +- firmware/config/boards/48way/connectors/main.yaml | 3 +++ firmware/config/boards/BB_V2/connectors/main.yaml | 7 ++----- firmware/config/boards/BB_V3/connectors/main.yaml | 7 ++----- .../boards/Benelli_Walbro/connectors/Benelli_Walbro.yaml | 3 ++- firmware/config/boards/GDI4/connectors/gdi4.yaml | 1 + firmware/config/boards/core8/connectors/main.yaml | 3 ++- firmware/config/boards/coreECU/connectors/main.yaml | 7 ++----- firmware/config/boards/frankenso/connectors/main.yaml | 3 ++- .../config/boards/hellen/alphax-2chan/connectors/main.yaml | 1 + .../config/boards/hellen/alphax-4chan/connectors/main.yaml | 1 + .../boards/hellen/alphax-8chan/connectors/8chan-D.yaml | 1 + .../config/boards/hellen/harley81/connectors/harley81.yaml | 1 + .../boards/hellen/hellen-112-17/connectors/main.yaml | 3 ++- .../boards/hellen/hellen-gm-e67/connectors/main.yaml | 3 ++- .../boards/hellen/hellen-honda-k/connectors/main.yaml | 5 +++-- .../config/boards/hellen/hellen-nb1/connectors/main.yaml | 1 + .../boards/hellen/hellen121nissan/connectors/main.yaml | 1 + .../config/boards/hellen/hellen121vag/connectors/main.yaml | 1 + .../config/boards/hellen/hellen128/connectors/main.yaml | 3 ++- .../boards/hellen/hellen154_9.7/connectors/main.yaml | 1 + .../boards/hellen/hellen154hyundai/connectors/main.yaml | 1 + .../hellen/hellen64_miataNA6_94/connectors/main.yaml | 1 + .../config/boards/hellen/hellen72/connectors/main.yaml | 1 + .../config/boards/hellen/hellen81/connectors/main.yaml | 1 + .../config/boards/hellen/hellen88bmw/connectors/main.yaml | 2 +- .../config/boards/hellen/hellenNA8_96/connectors/main.yaml | 1 + firmware/config/boards/lambda-x2/connectors/main.yaml | 1 + firmware/config/boards/microrusefi/connectors/main.yaml | 3 ++- firmware/config/boards/proteus/connectors/black23.yaml | 3 ++- firmware/config/boards/proteus/connectors/black35.yaml | 2 +- firmware/config/boards/proteus/connectors/white35.yaml | 2 +- firmware/config/boards/s105/connectors/s105.yaml | 1 + firmware/config/boards/skeleton/connectors/main.yaml | 3 +++ firmware/config/boards/subaru_eg33/connectors/C-B61.yaml | 3 +++ firmware/config/boards/tdg-pdm8/connectors/main.yaml | 3 ++- firmware/config/boards/tdg-pdm8/connectors/x3.yaml | 2 +- 37 files changed, 57 insertions(+), 31 deletions(-) diff --git a/.github/workflows/gen-pinouts.yaml b/.github/workflows/gen-pinouts.yaml index 8e66cad69e..8aa55a0af8 100644 --- a/.github/workflows/gen-pinouts.yaml +++ b/.github/workflows/gen-pinouts.yaml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - name: Generate Pinouts - uses: chuckwagoncomputing/interactive-pinout@1.2 + uses: chuckwagoncomputing/interactive-pinout@2.0 with: mapping-path: ./firmware/config/boards/*/connectors/*.yaml warnings: "false" diff --git a/firmware/config/boards/48way/connectors/main.yaml b/firmware/config/boards/48way/connectors/main.yaml index c25aa270e7..70b68b82a7 100755 --- a/firmware/config/boards/48way/connectors/main.yaml +++ b/firmware/config/boards/48way/connectors/main.yaml @@ -107,3 +107,6 @@ pins: - id: B14 class: outputs ts_name: Ignition 4 Output (B14) + +info: + directory: 48way diff --git a/firmware/config/boards/BB_V2/connectors/main.yaml b/firmware/config/boards/BB_V2/connectors/main.yaml index b78badb0ee..da1f5be372 100644 --- a/firmware/config/boards/BB_V2/connectors/main.yaml +++ b/firmware/config/boards/BB_V2/connectors/main.yaml @@ -284,9 +284,6 @@ pins: type: hall ts_name: Digital input 2 - - - - - +info: + directory: BB_V2 diff --git a/firmware/config/boards/BB_V3/connectors/main.yaml b/firmware/config/boards/BB_V3/connectors/main.yaml index 8df277c930..f443439959 100644 --- a/firmware/config/boards/BB_V3/connectors/main.yaml +++ b/firmware/config/boards/BB_V3/connectors/main.yaml @@ -297,9 +297,6 @@ pins: type: hall ts_name: Digital input 2 - - - - - +info: + directory: BB_V3 diff --git a/firmware/config/boards/Benelli_Walbro/connectors/Benelli_Walbro.yaml b/firmware/config/boards/Benelli_Walbro/connectors/Benelli_Walbro.yaml index b5da843182..8b1abe7098 100644 --- a/firmware/config/boards/Benelli_Walbro/connectors/Benelli_Walbro.yaml +++ b/firmware/config/boards/Benelli_Walbro/connectors/Benelli_Walbro.yaml @@ -278,7 +278,8 @@ pins: info: # todo: trigger build after PR - title: Benelli_Walbro + title: Benelli_Walbro + directory: Benelli_Walbro name: 'Benelli_Walbro !! NOTE: status is DRAFT !! - there a unknown and potential wrong pin assignments, these are flagged with "??" and "ToDo:"!!' board_url: https://rusefi.com/s/Benelli_Walbro image: diff --git a/firmware/config/boards/GDI4/connectors/gdi4.yaml b/firmware/config/boards/GDI4/connectors/gdi4.yaml index 4f8b47d7af..ed5ce3bcb2 100644 --- a/firmware/config/boards/GDI4/connectors/gdi4.yaml +++ b/firmware/config/boards/GDI4/connectors/gdi4.yaml @@ -108,6 +108,7 @@ info: title: GDI4 name: GDI4 board_url: https://rusefi.com/s/gdi4 + directory: GDI4 image: file: 121pin.jpg #copy-paste of firmware/config/boards/hellen/hellen121vag/connectors/ yaml file diff --git a/firmware/config/boards/core8/connectors/main.yaml b/firmware/config/boards/core8/connectors/main.yaml index 12543451df..5a786578e1 100644 --- a/firmware/config/boards/core8/connectors/main.yaml +++ b/firmware/config/boards/core8/connectors/main.yaml @@ -289,5 +289,6 @@ pins: info: title: Core8 + directory: core8 name: Core8 - board_url: https://rusefi.com/s/core8 \ No newline at end of file + board_url: https://rusefi.com/s/core8 diff --git a/firmware/config/boards/coreECU/connectors/main.yaml b/firmware/config/boards/coreECU/connectors/main.yaml index d7e46675e8..05d7dfe3b1 100644 --- a/firmware/config/boards/coreECU/connectors/main.yaml +++ b/firmware/config/boards/coreECU/connectors/main.yaml @@ -324,8 +324,5 @@ pins: type: hall ts_name: Digital Input 4 - - - - - +info: + directory: coreECU diff --git a/firmware/config/boards/frankenso/connectors/main.yaml b/firmware/config/boards/frankenso/connectors/main.yaml index 1b37bbe086..189454bf4b 100644 --- a/firmware/config/boards/frankenso/connectors/main.yaml +++ b/firmware/config/boards/frankenso/connectors/main.yaml @@ -224,4 +224,5 @@ pins: function: Injector #4 info: - id: Frankenso \ No newline at end of file + cid: Frankenso + directory: frankenso diff --git a/firmware/config/boards/hellen/alphax-2chan/connectors/main.yaml b/firmware/config/boards/hellen/alphax-2chan/connectors/main.yaml index 291cf5bc0e..84e45bfce6 100644 --- a/firmware/config/boards/hellen/alphax-2chan/connectors/main.yaml +++ b/firmware/config/boards/hellen/alphax-2chan/connectors/main.yaml @@ -207,6 +207,7 @@ info: title: AlphaX 2chan name: AlphaX 2chan board_url: https://rusefi.com/s/2chan + directory: hellen/alphax-2chan image: file: alphax-2chan.jpg pins: diff --git a/firmware/config/boards/hellen/alphax-4chan/connectors/main.yaml b/firmware/config/boards/hellen/alphax-4chan/connectors/main.yaml index 04ea6f97a9..54ce5efb4f 100644 --- a/firmware/config/boards/hellen/alphax-4chan/connectors/main.yaml +++ b/firmware/config/boards/hellen/alphax-4chan/connectors/main.yaml @@ -406,6 +406,7 @@ info: title: AlphaX 4chan name: AlphaX 4chan board_url: https://rusefi.com/s/4chan + directory: hellen/alphax-4chan image: file: alphax-4chan.jpg pins: diff --git a/firmware/config/boards/hellen/alphax-8chan/connectors/8chan-D.yaml b/firmware/config/boards/hellen/alphax-8chan/connectors/8chan-D.yaml index c1bd458adb..0d3961fcd2 100644 --- a/firmware/config/boards/hellen/alphax-8chan/connectors/8chan-D.yaml +++ b/firmware/config/boards/hellen/alphax-8chan/connectors/8chan-D.yaml @@ -58,6 +58,7 @@ pins: info: title: AlphaX 8chan + directory: hellen/alphax-8chan name: AlphaX 8chan image: file: 8chan-D.jpg diff --git a/firmware/config/boards/hellen/harley81/connectors/harley81.yaml b/firmware/config/boards/hellen/harley81/connectors/harley81.yaml index 0c521c54e0..7f28c1fb92 100644 --- a/firmware/config/boards/hellen/harley81/connectors/harley81.yaml +++ b/firmware/config/boards/hellen/harley81/connectors/harley81.yaml @@ -260,6 +260,7 @@ info: title: Hellen Harley 81 name: Hellen Harley 81 board_url: https://rusefi.com/s/harley81 + directory: hellen/harley81 image: file: harley81.jpg pins: diff --git a/firmware/config/boards/hellen/hellen-112-17/connectors/main.yaml b/firmware/config/boards/hellen/hellen-112-17/connectors/main.yaml index f94b70ed2c..cffc0ee214 100644 --- a/firmware/config/boards/hellen/hellen-112-17/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen-112-17/connectors/main.yaml @@ -163,8 +163,9 @@ pins: info: - id: H-112 + cid: H-112 title: H-112 + directory: hellen/hellen-112-17 name: H-112 image: file: main.jpg diff --git a/firmware/config/boards/hellen/hellen-gm-e67/connectors/main.yaml b/firmware/config/boards/hellen/hellen-gm-e67/connectors/main.yaml index c82d1a26d4..0311bbaebf 100644 --- a/firmware/config/boards/hellen/hellen-gm-e67/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen-gm-e67/connectors/main.yaml @@ -491,10 +491,11 @@ pins: # info: - id: GM-E67 + cid: GM-E67 title: Hellen GM E67 name: Hellen GM E67 board_url: https://rusefi.com/s/gm-e67 + directory: hellen/hellen-gm-e67 image: file: main.jpg pins: diff --git a/firmware/config/boards/hellen/hellen-honda-k/connectors/main.yaml b/firmware/config/boards/hellen/hellen-honda-k/connectors/main.yaml index 73b07e11a3..fe5a73fb06 100644 --- a/firmware/config/boards/hellen/hellen-honda-k/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen-honda-k/connectors/main.yaml @@ -323,10 +323,11 @@ pins: function: Check Engine info: - id: Honda-K + cid: Honda-K title: Hellen Honda K name: Hellen Honda K board_url: https://rusefi.com/s/honda-k + directory: hellen/hellen-honda-k image: file: hellen-k.jpg pins: @@ -572,4 +573,4 @@ info: - pin: E31 x: 1597 - y: 200 \ No newline at end of file + y: 200 diff --git a/firmware/config/boards/hellen/hellen-nb1/connectors/main.yaml b/firmware/config/boards/hellen/hellen-nb1/connectors/main.yaml index 23ef261832..852f5c6abd 100644 --- a/firmware/config/boards/hellen/hellen-nb1/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen-nb1/connectors/main.yaml @@ -363,6 +363,7 @@ pins: info: title: Hellen Miata NB1 + directory: hellen/hellen-nb1 image: file: main.jpg pins: diff --git a/firmware/config/boards/hellen/hellen121nissan/connectors/main.yaml b/firmware/config/boards/hellen/hellen121nissan/connectors/main.yaml index 09e0a6b88d..f6b295db95 100644 --- a/firmware/config/boards/hellen/hellen121nissan/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen121nissan/connectors/main.yaml @@ -374,6 +374,7 @@ info: title: Hellen 121 Nissan name: Hellen 121 Nissan board_url: https://github.com/rusefi/rusefi/wiki/Hellen-121-Nissan + directory: hellen/hellen121nissan image: file: 121pin.jpg pins: diff --git a/firmware/config/boards/hellen/hellen121vag/connectors/main.yaml b/firmware/config/boards/hellen/hellen121vag/connectors/main.yaml index 7ba10cc450..e303a53965 100644 --- a/firmware/config/boards/hellen/hellen121vag/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen121vag/connectors/main.yaml @@ -414,6 +414,7 @@ info: title: Hellen 121 VAG name: Hellen 121 VAG board_url: https://github.com/rusefi/rusefi/wiki/Hellen121VAG + directory: hellen/hellen121vag image: file: 121pin.jpg pins: diff --git a/firmware/config/boards/hellen/hellen128/connectors/main.yaml b/firmware/config/boards/hellen/hellen128/connectors/main.yaml index 1d08f8f6c0..65fcd760a3 100644 --- a/firmware/config/boards/hellen/hellen128/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen128/connectors/main.yaml @@ -670,10 +670,11 @@ pins: type: ign info: - id: Hellen-128 + cid: Hellen-128 title: Hellen 128 Mercedes name: Hellen 128 Mercedes board_url: https://rusefi.com/s/hellen128merc + directory: hellen/hellen128 image: file: main.jpg pins: diff --git a/firmware/config/boards/hellen/hellen154_9.7/connectors/main.yaml b/firmware/config/boards/hellen/hellen154_9.7/connectors/main.yaml index bd193f9898..474a5eceee 100644 --- a/firmware/config/boards/hellen/hellen154_9.7/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen154_9.7/connectors/main.yaml @@ -67,6 +67,7 @@ pins: info: title: Hellen 154 VAG GDI + directory: hellen/hellen154_9.7 image: file: main.jpg pins: diff --git a/firmware/config/boards/hellen/hellen154hyundai/connectors/main.yaml b/firmware/config/boards/hellen/hellen154hyundai/connectors/main.yaml index 08a86a8d3a..4852106c52 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen154hyundai/connectors/main.yaml @@ -411,6 +411,7 @@ pins: info: board_url: https://github.com/rusefi/rusefi/wiki/Hellen-154-Hyundai + directory: hellen/hellen154hyundai title: Hellen 154 Hyundai image: file: main.jpg diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/connectors/main.yaml b/firmware/config/boards/hellen/hellen64_miataNA6_94/connectors/main.yaml index bb4dfaef51..7f33edf6ab 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/connectors/main.yaml @@ -372,6 +372,7 @@ pins: info: title: Hellen Miata NA6 + directory: hellen/hellen64_miataNA6_94 image: file: main.jpg pins: diff --git a/firmware/config/boards/hellen/hellen72/connectors/main.yaml b/firmware/config/boards/hellen/hellen72/connectors/main.yaml index 51ae7a663c..eb388928f6 100644 --- a/firmware/config/boards/hellen/hellen72/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen72/connectors/main.yaml @@ -604,6 +604,7 @@ pins: info: title: Hellen Miata NB2 + directory: hellen/hellen72 image: file: main.jpg pins: diff --git a/firmware/config/boards/hellen/hellen81/connectors/main.yaml b/firmware/config/boards/hellen/hellen81/connectors/main.yaml index 4e394205c7..6d807ba776 100644 --- a/firmware/config/boards/hellen/hellen81/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen81/connectors/main.yaml @@ -513,6 +513,7 @@ pins: info: title: Hellen 81 + directory: hellen/hellen81 image: file: main.jpg pins: diff --git a/firmware/config/boards/hellen/hellen88bmw/connectors/main.yaml b/firmware/config/boards/hellen/hellen88bmw/connectors/main.yaml index 6b185a26a2..4a067bc514 100644 --- a/firmware/config/boards/hellen/hellen88bmw/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen88bmw/connectors/main.yaml @@ -225,4 +225,4 @@ pins: info: title: Hellen 88 BMW - pins: + directory: hellen/hellen88bmw diff --git a/firmware/config/boards/hellen/hellenNA8_96/connectors/main.yaml b/firmware/config/boards/hellen/hellenNA8_96/connectors/main.yaml index e3fc9df02e..f26c62ad06 100644 --- a/firmware/config/boards/hellen/hellenNA8_96/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellenNA8_96/connectors/main.yaml @@ -321,6 +321,7 @@ pins: info: title: Hellen Miata NB1 + directory: hellen/hellenNA8_96 image: file: main.jpg pins: diff --git a/firmware/config/boards/lambda-x2/connectors/main.yaml b/firmware/config/boards/lambda-x2/connectors/main.yaml index fba3d5630f..3a0f664ca2 100644 --- a/firmware/config/boards/lambda-x2/connectors/main.yaml +++ b/firmware/config/boards/lambda-x2/connectors/main.yaml @@ -93,6 +93,7 @@ info: title: lambda-x2 name: lambda-x2 board_url: https://github.com/rusefi/rusefi-hardware/tree/main/lambda-x2 + directory: lambda-x2 image: file: alphax-2chan.jpg pins: diff --git a/firmware/config/boards/microrusefi/connectors/main.yaml b/firmware/config/boards/microrusefi/connectors/main.yaml index 647fb86f99..62a8c14d11 100644 --- a/firmware/config/boards/microrusefi/connectors/main.yaml +++ b/firmware/config/boards/microrusefi/connectors/main.yaml @@ -363,7 +363,8 @@ info: title: microRusEFI name: Main Connector board_url: https://rusefi.com/s/microrusefi - id: main + directory: microrusefi + cid: main order: 0 image: file: main.jpg diff --git a/firmware/config/boards/proteus/connectors/black23.yaml b/firmware/config/boards/proteus/connectors/black23.yaml index d9f6965b9a..e9836162a1 100644 --- a/firmware/config/boards/proteus/connectors/black23.yaml +++ b/firmware/config/boards/proteus/connectors/black23.yaml @@ -152,7 +152,8 @@ info: title: Proteus name: Black23 board_url: "https://wiki.rusefi.com/Hardware/Proteus/Proteus/" - id: black23 + directory: proteus + cid: black23 image: file: black23.jpg pins: diff --git a/firmware/config/boards/proteus/connectors/black35.yaml b/firmware/config/boards/proteus/connectors/black35.yaml index 40cfdd28c7..bc110625a5 100644 --- a/firmware/config/boards/proteus/connectors/black35.yaml +++ b/firmware/config/boards/proteus/connectors/black35.yaml @@ -238,7 +238,7 @@ pins: info: title: Proteus name: Black35 - id: black23 + cid: black23 image: file: black35.jpg pins: diff --git a/firmware/config/boards/proteus/connectors/white35.yaml b/firmware/config/boards/proteus/connectors/white35.yaml index 697be2ec29..eab8af79e7 100644 --- a/firmware/config/boards/proteus/connectors/white35.yaml +++ b/firmware/config/boards/proteus/connectors/white35.yaml @@ -185,7 +185,7 @@ pins: info: title: Proteus name: White35 - id: white35 + cid: white35 image: file: white35.jpg pins: diff --git a/firmware/config/boards/s105/connectors/s105.yaml b/firmware/config/boards/s105/connectors/s105.yaml index 981d88bf2a..42c6e37c96 100644 --- a/firmware/config/boards/s105/connectors/s105.yaml +++ b/firmware/config/boards/s105/connectors/s105.yaml @@ -352,6 +352,7 @@ pins: info: title: S105 + directory: s105 name: S105 image: file: 121pin.jpg diff --git a/firmware/config/boards/skeleton/connectors/main.yaml b/firmware/config/boards/skeleton/connectors/main.yaml index 7ede2da947..491ccb3172 100644 --- a/firmware/config/boards/skeleton/connectors/main.yaml +++ b/firmware/config/boards/skeleton/connectors/main.yaml @@ -268,3 +268,6 @@ pins: function: Crank VR+/hall ts_name: 45 - VR/Hall Crank type: vr hall + +info: + directory: skeleton diff --git a/firmware/config/boards/subaru_eg33/connectors/C-B61.yaml b/firmware/config/boards/subaru_eg33/connectors/C-B61.yaml index 66892a92ef..fe654d2d94 100644 --- a/firmware/config/boards/subaru_eg33/connectors/C-B61.yaml +++ b/firmware/config/boards/subaru_eg33/connectors/C-B61.yaml @@ -84,3 +84,6 @@ pins: function: Tacho out ts_name: C16 - Tacho out type: gp_low + +info: + directory: subaru_eg33 diff --git a/firmware/config/boards/tdg-pdm8/connectors/main.yaml b/firmware/config/boards/tdg-pdm8/connectors/main.yaml index 702fb4239f..c2b16391c4 100644 --- a/firmware/config/boards/tdg-pdm8/connectors/main.yaml +++ b/firmware/config/boards/tdg-pdm8/connectors/main.yaml @@ -128,8 +128,9 @@ pins: ts_name: Sense 1 info: - id: tdg-pdm8 + cid: tdg-pdm8 title: tdg-pdm8 + directory: tdg-pdm8 name: tdg-pdm8 image: file: tdg-pdm8.jpg diff --git a/firmware/config/boards/tdg-pdm8/connectors/x3.yaml b/firmware/config/boards/tdg-pdm8/connectors/x3.yaml index 81787521f6..3b17528c38 100644 --- a/firmware/config/boards/tdg-pdm8/connectors/x3.yaml +++ b/firmware/config/boards/tdg-pdm8/connectors/x3.yaml @@ -12,7 +12,7 @@ pins: function: SWDIO info: - id: tdg-pdm8-x3 + cid: tdg-pdm8-x3 title: tdg-pdm8-x3 name: tdg-pdm8-x3 image: