Skip to content

Commit b45f3e8

Browse files
j-ororkej-ororke
authored
Merge branch 'master' into commissioning_failover_check
2 parents 35d84c5 + 3418614 commit b45f3e8

25 files changed

+517
-309
lines changed

‎.github/actions/bootstrap/action.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ runs:
2626
# because the bootstrapped Pigweed environment contains absolute paths.
2727
echo "Calculating bootstrap cache key for '$PWD'"
2828
FILES_HASH="${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}"
29-
FINAL_HASH="$(echo "$PWD:$FILES_HASH" | shasum -a 256 | cut -d' ' -f1)"
29+
case "$RUNNER_OS" in
30+
macOS) OS_HASH="$(sw_vers | shasum -a 256 | cut -d' ' -f1)";;
31+
*) OS_HASH="$(shasum -a 256 /etc/lsb-release | cut -d' ' -f1)";;
32+
esac
33+
PYTHON_HASH="$(python --version | shasum -a 256 | cut -d' ' -f1)"
34+
FINAL_HASH="$(echo "$PWD:$FILES_HASH:$OS_HASH:$PYTHON_HASH" | shasum -a 256 | cut -d' ' -f1)"
3035
echo key="${RUNNER_OS}-${RUNNER_ARCH}-${{ inputs.platform }}-${FINAL_HASH}" | tee -a "$GITHUB_OUTPUT"
3136
3237
# Split caches across backends

‎.github/workflows/examples-asr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-asr:54
39+
image: ghcr.io/project-chip/chip-build-asr:65
4040
options: --user root
4141

4242
steps:

‎.github/workflows/examples-efr32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-efr32:56
43+
image: ghcr.io/project-chip/chip-build-efr32:65
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/examples-mbed.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
if: github.actor != 'restyled-io[bot]'
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build-mbed-os:54
45+
image: ghcr.io/project-chip/chip-build-mbed-os:65
4646
volumes:
4747
- "/tmp/bloat_reports:/tmp/bloat_reports"
4848

‎.github/workflows/examples-nuttx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: github.actor != 'restyled-io[bot]'
3636

3737
container:
38-
image: ghcr.io/project-chip/chip-build-nuttx:54
38+
image: ghcr.io/project-chip/chip-build-nuttx:65
3939
volumes:
4040
- "/tmp/bloat_reports:/tmp/bloat_reports"
4141
steps:

‎.github/workflows/examples-nxp.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: github.actor != 'restyled-io[bot]'
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build-k32w:54
42+
image: ghcr.io/project-chip/chip-build-k32w:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:
@@ -104,7 +104,7 @@ jobs:
104104
if: github.actor != 'restyled-io[bot]'
105105

106106
container:
107-
image: ghcr.io/project-chip/chip-build-nxp-zephyr:64
107+
image: ghcr.io/project-chip/chip-build-nxp-zephyr:65
108108

109109
steps:
110110
- name: Checkout

‎.github/workflows/examples-openiotsdk.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-openiotsdk:54
43+
image: ghcr.io/project-chip/chip-build-openiotsdk:65
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
options: --privileged

‎.github/workflows/examples-rw61x.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: github.actor != 'restyled-io[bot]'
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build-rw61x:54
42+
image: ghcr.io/project-chip/chip-build-rw61x:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-telink.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-telink:57
41+
image: ghcr.io/project-chip/chip-build-telink:65
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444

‎.github/workflows/examples-tizen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-tizen:54
39+
image: ghcr.io/project-chip/chip-build-tizen:65
4040
options: --user root
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"

‎.github/workflows/full-android.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-android:54
41+
image: ghcr.io/project-chip/chip-build-android:65
4242
volumes:
4343
- "/tmp/log_output:/tmp/test_logs"
4444

‎.github/workflows/minimal-build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434

3535
container:
36-
image: ghcr.io/project-chip/chip-build-minimal:54
36+
image: ghcr.io/project-chip/chip-build-minimal:65
3737

3838
steps:
3939
- name: Checkout
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656

5757
container:
58-
image: ghcr.io/project-chip/chip-build-minimal:54
58+
image: ghcr.io/project-chip/chip-build-minimal:65
5959

6060
steps:
6161
- name: Checkout

‎.github/workflows/smoketest-android.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-android:54
40+
image: ghcr.io/project-chip/chip-build-android:65
4141
volumes:
4242
- "/:/runner-root-volume"
4343
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,7 @@ jobs:
583583
scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'
584584
scripts/run_in_python_env.sh out/venv './src/python_testing/test_testing/test_TC_ICDM_2_1.py'
585585
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestIdChecks.py'
586+
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestSpecParsingDeviceType.py'
586587
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceSupport.py'
587588
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_IDM_10_4.py'
588589

‎examples/window-app/nrfconnect/main/WindowCovering.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ void WindowCovering::DriveCurrentLiftPosition(intptr_t)
5959
NPercent100ths positionToSet{};
6060

6161
VerifyOrReturn(Attributes::CurrentPositionLiftPercent100ths::Get(Endpoint(), current) ==
62-
Protocols::InteractionModel::Status::Success);
62+
chip::Protocols::InteractionModel::Status::Success);
6363
VerifyOrReturn(Attributes::TargetPositionLiftPercent100ths::Get(Endpoint(), target) ==
64-
Protocols::InteractionModel::Status::Success);
64+
chip::Protocols::InteractionModel::Status::Success);
6565

6666
OperationalState state = ComputeOperationalState(target, current);
6767
UpdateOperationalStatus(MoveType::LIFT, state);
@@ -87,7 +87,7 @@ void WindowCovering::DriveCurrentLiftPosition(intptr_t)
8787
Instance().mInLiftMove = false;
8888

8989
VerifyOrReturn(Attributes::CurrentPositionLiftPercent100ths::Get(Endpoint(), current) ==
90-
Protocols::InteractionModel::Status::Success);
90+
chip::Protocols::InteractionModel::Status::Success);
9191

9292
if (!TargetCompleted(MoveType::LIFT, current, target))
9393
{
@@ -103,7 +103,7 @@ void WindowCovering::DriveCurrentLiftPosition(intptr_t)
103103

104104
chip::Percent100ths WindowCovering::CalculateNextPosition(MoveType aMoveType)
105105
{
106-
Protocols::InteractionModel::Status status{};
106+
chip::Protocols::InteractionModel::Status status{};
107107
chip::Percent100ths percent100ths{};
108108
NPercent100ths current{};
109109
OperationalState opState{};
@@ -119,7 +119,7 @@ chip::Percent100ths WindowCovering::CalculateNextPosition(MoveType aMoveType)
119119
opState = OperationalStateGet(Endpoint(), OperationalStatus::kTilt);
120120
}
121121

122-
if ((status == Protocols::InteractionModel::Status::Success) && !current.IsNull())
122+
if ((status == chip::Protocols::InteractionModel::Status::Success) && !current.IsNull())
123123
{
124124
static constexpr auto sPercentDelta{ WC_PERCENT100THS_MAX_CLOSED / 20 };
125125
percent100ths = ComputePercent100thsStep(opState, current.Value(), sPercentDelta);
@@ -171,9 +171,9 @@ void WindowCovering::DriveCurrentTiltPosition(intptr_t)
171171
NPercent100ths positionToSet{};
172172

173173
VerifyOrReturn(Attributes::CurrentPositionTiltPercent100ths::Get(Endpoint(), current) ==
174-
Protocols::InteractionModel::Status::Success);
174+
chip::Protocols::InteractionModel::Status::Success);
175175
VerifyOrReturn(Attributes::TargetPositionTiltPercent100ths::Get(Endpoint(), target) ==
176-
Protocols::InteractionModel::Status::Success);
176+
chip::Protocols::InteractionModel::Status::Success);
177177

178178
OperationalState state = ComputeOperationalState(target, current);
179179
UpdateOperationalStatus(MoveType::TILT, state);
@@ -199,7 +199,7 @@ void WindowCovering::DriveCurrentTiltPosition(intptr_t)
199199
Instance().mInTiltMove = false;
200200

201201
VerifyOrReturn(Attributes::CurrentPositionTiltPercent100ths::Get(Endpoint(), current) ==
202-
Protocols::InteractionModel::Status::Success);
202+
chip::Protocols::InteractionModel::Status::Success);
203203

204204
if (!TargetCompleted(MoveType::TILT, current, target))
205205
{
@@ -261,7 +261,7 @@ void WindowCovering::UpdateOperationalStatus(MoveType aMoveType, OperationalStat
261261

262262
void WindowCovering::SetTargetPosition(OperationalState aDirection, chip::Percent100ths aPosition)
263263
{
264-
Protocols::InteractionModel::Status status{};
264+
chip::Protocols::InteractionModel::Status status{};
265265
if (Instance().mCurrentUIMoveType == MoveType::LIFT)
266266
{
267267
status = Attributes::TargetPositionLiftPercent100ths::Set(Endpoint(), aPosition);
@@ -271,29 +271,29 @@ void WindowCovering::SetTargetPosition(OperationalState aDirection, chip::Percen
271271
status = Attributes::TargetPositionTiltPercent100ths::Set(Endpoint(), aPosition);
272272
}
273273

274-
if (status != Protocols::InteractionModel::Status::Success)
274+
if (status != chip::Protocols::InteractionModel::Status::Success)
275275
{
276276
LOG_ERR("Cannot set the target position. Error: %d", static_cast<uint8_t>(status));
277277
}
278278
}
279279

280280
void WindowCovering::PositionLEDUpdate(MoveType aMoveType)
281281
{
282-
Protocols::InteractionModel::Status status{};
282+
chip::Protocols::InteractionModel::Status status{};
283283
NPercent100ths currentPosition{};
284284

285285
if (aMoveType == MoveType::LIFT)
286286
{
287287
status = Attributes::CurrentPositionLiftPercent100ths::Get(Endpoint(), currentPosition);
288-
if (Protocols::InteractionModel::Status::Success == status && !currentPosition.IsNull())
288+
if (chip::Protocols::InteractionModel::Status::Success == status && !currentPosition.IsNull())
289289
{
290290
Instance().SetBrightness(MoveType::LIFT, currentPosition.Value());
291291
}
292292
}
293293
else if (aMoveType == MoveType::TILT)
294294
{
295295
status = Attributes::CurrentPositionTiltPercent100ths::Get(Endpoint(), currentPosition);
296-
if (Protocols::InteractionModel::Status::Success == status && !currentPosition.IsNull())
296+
if (chip::Protocols::InteractionModel::Status::Success == status && !currentPosition.IsNull())
297297
{
298298
Instance().SetBrightness(MoveType::TILT, currentPosition.Value());
299299
}

0 commit comments

Comments
 (0)