diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 66796ce..1130965 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -7,6 +7,9 @@ inputs: board: description: 'Board definition to use' default: bparasite_nrf52840 + revision: + description: 'Board revision use' + default: '1.2.0' cmake-extra: description: 'Extra CMake arguments' default: '' @@ -19,5 +22,6 @@ runs: args: - ${{ inputs.sample-dir }} - ${{ inputs.board }} + - ${{ inputs.revision }} - ${{ inputs.cmake-extra }} - ${{ inputs.output-bin }} diff --git a/.github/actions/build/build.sh b/.github/actions/build/build.sh index 9cb755a..5a8f8fc 100755 --- a/.github/actions/build/build.sh +++ b/.github/actions/build/build.sh @@ -3,11 +3,12 @@ set -eux -o pipefail SAMPLE_DIR=$1 BOARD=$2 -CMAKE_EXTRA=$3 -OUTPUT_BIN=$4 +REVISION=$3 +CMAKE_EXTRA=$4 +OUTPUT_BIN=$5 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}" \ No newline at end of file diff --git a/code/nrf-connect/samples/soil_read_loop/src/main.c b/code/nrf-connect/samples/soil_read_loop/src/main.c index 39ad90d..22a48f8 100644 --- a/code/nrf-connect/samples/soil_read_loop/src/main.c +++ b/code/nrf-connect/samples/soil_read_loop/src/main.c @@ -18,7 +18,7 @@ static const struct adc_dt_spec adc_soil_spec = ADC_DT_SPEC_GET_BY_IDX(DT_PATH(zephyr_user), 0); 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 struct adc_sequence soil_sequence = {