rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
rusefillc 2021-01-28 20:43:39 -05:00
parent 5d1c248e4d c56f34adc1
commit 3490cdc968
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/gen-docs.yaml vendored
View File

@ -14,15 +14,16 @@ jobs:
submodules: recursive
fetch-depth: 0
- name: Install ncftp, kicad, xvfb, and doxygen
- name: Install ncftp, kicad, and doxygen
run: |
sudo add-apt-repository ppa:js-reynaud/kicad-5.1
sudo add-apt-repository ppa:kicad/kicad-5.1-releases
sudo apt-get update
sudo apt-get install ncftp kicad doxygen xvfb
sudo apt-get install ncftp kicad doxygen
- name: Set FTP variables
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
INTERACTIVE_HTML_BOM_NO_DISPLAY: 'true'
run: |
if [ "${{github.event_name}}" = "push" ] && [ "${{github.ref}}" = "refs/heads/master" ]; then
echo "::set-env name=RUSEFI_FTP_SERVER::${{secrets.RUSEFI_FTP_SERVER}}";
@ -31,4 +32,4 @@ jobs:
fi
- name: Generate documentation
run: xvfb-run bash ./misc/jenkins/generate_doxygen/gen_upload_docs.sh
run: bash ./misc/jenkins/generate_doxygen/gen_upload_docs.sh

2
firmware/controllers/date_stamp.h
View File

@ -1,2 +1,2 @@
#pragma once
#define VCS_DATE 20210128
#define VCS_DATE 20210129

2
hardware/InteractiveHtmlBom

@ -1 +1 @@
Subproject commit 213b6b6ebe3b9c5252b4de0a3f430d3b182c3996
Subproject commit 7dacae0c1d09b445baf7cdc6b61495dc3bd873bb

18
misc/jenkins/InteractiveHtmlBom/run.sh
View File

@ -1,18 +1,16 @@
#!/bin/bash
INTERACTIVE_HTML_BOM_NO_DISPLAY="true"
IBOM_CMD="python3 hardware/InteractiveHtmlBom/InteractiveHtmlBom/generate_interactive_bom.py --no-browser --name-format \"%f_latest\" --dest-dir ../ibom"
IBOM_CMD="python3 hardware/InteractiveHtmlBom/InteractiveHtmlBom/generate_interactive_bom.py --no-browser --name-format \"%f_latest\" --dest-dir ../ibom --include-nets"
echo "IBOM_CMD=$IBOM_CMD"
pwd
[ -e hardware/frankenso/frankenso.kicad_pcb ] || { echo "hardware/frankenso/frankenso.kicad_pcb not found. Was this invoked from wrong folder?"; exit -1; }
$IBOM_CMD hardware/Common_Rail_MC33816/Common_Rail_MC33816.kicad_pcb
$IBOM_CMD hardware/brain_board/brain_board_STM32F407.kicad_pcb
$IBOM_CMD hardware/brain_board_176-pin/176-pin_board.kicad_pcb
$IBOM_CMD --extra-fields "mfg,mfg#,vend1,vend1#" hardware/CJ125_board/O2_input_CJ125.kicad_pcb --netlist-file hardware/CJ125_board/O2_input_CJ125.net
$IBOM_CMD --extra-fields "MFG,MFG#,VEND1,VEND1#" hardware/frankenso/frankenso.kicad_pcb --netlist-file hardware/frankenso/frankenso.net
$IBOM_CMD --extra-fields "mfg,mfg#,vend1,vend1#" hardware/frankenstein/frankenstein.kicad_pcb --netlist-file hardware/frankenstein/frankenstein.net
$IBOM_CMD hardware/mini48-stm32/mini48-stm32.kicad_pcb
$IBOM_CMD hardware/HighSideSwitch/VN750PS_E.kicad_pcb
$IBOM_CMD hardware/can_board/can_brd_1.kicad_pcb
for f in $(ls hardware/*/*.kicad_pcb); do
if ls $(dirname $f)/$(basename $f .kicad_pcb).net 2>/dev/null; then
$IBOM_CMD --netlist-file $(ls $(dirname $f)/$(basename $f .kicad_pcb).net) $f
else
$IBOM_CMD $f
fi
done