polymachine/b-parasite-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes GitHub actions to use board revisions

Browse source
This commit is contained in:
rbaron 2022-12-03 11:04:20 +01:00
parent f476e69229
commit 6969d74a8c
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/actions/build/action.yml vendored
View file

@ -7,6 +7,9 @@ inputs:
board: board:
description: 'Board definition to use' description: 'Board definition to use'
default: bparasite_nrf52840 default: bparasite_nrf52840
revision:
description: 'Board revision use'
default: '1.2.0'
cmake-extra: cmake-extra:
description: 'Extra CMake arguments' description: 'Extra CMake arguments'
default: '' default: ''
@ -19,5 +22,6 @@ runs:
args: args:
- ${{ inputs.sample-dir }} - ${{ inputs.sample-dir }}
- ${{ inputs.board }} - ${{ inputs.board }}
- ${{ inputs.revision }}
- ${{ inputs.cmake-extra }} - ${{ inputs.cmake-extra }}
- ${{ inputs.output-bin }} - ${{ inputs.output-bin }}

7
.github/actions/build/build.sh vendored
View file

@ -3,11 +3,12 @@ set -eux -o pipefail
SAMPLE_DIR=$1 SAMPLE_DIR=$1
BOARD=$2 BOARD=$2
CMAKE_EXTRA=$3 REVISION=$3
OUTPUT_BIN=$4 CMAKE_EXTRA=$4
OUTPUT_BIN=$5
cd "${GITHUB_WORKSPACE}/${SAMPLE_DIR}" cd "${GITHUB_WORKSPACE}/${SAMPLE_DIR}"
west build --build-dir ./build --pristine --board "${BOARD}" -- $CMAKE_EXTRA west build --build-dir ./build --pristine --board "${BOARD}@${REVISION}" -- $CMAKE_EXTRA
mv build/zephyr/zephyr.hex build/zephyr/"${OUTPUT_BIN}" mv build/zephyr/zephyr.hex build/zephyr/"${OUTPUT_BIN}"

2
code/nrf-connect/samples/soil_read_loop/src/main.c
View file

@ -18,7 +18,7 @@ static const struct adc_dt_spec adc_soil_spec =
ADC_DT_SPEC_GET_BY_IDX(DT_PATH(zephyr_user), 0); ADC_DT_SPEC_GET_BY_IDX(DT_PATH(zephyr_user), 0);
static const struct adc_dt_spec adc_batt_spec = static const struct adc_dt_spec adc_batt_spec =
ADC_DT_SPEC_GET_BY_IDX(DT_PATH(zephyr_user), 2); ADC_DT_SPEC_GET_BY_IDX(DT_PATH(zephyr_user), 1);
static int16_t soil_buf; static int16_t soil_buf;
static struct adc_sequence soil_sequence = { static struct adc_sequence soil_sequence = {