Skip to content

Commit

Permalink
Sample backport: chef wifi fix and RPC improvement (#18044)
Browse files Browse the repository at this point in the history
* Chef - Extended Pigweed RPC support (#17781)

* Build flash_script package for ESP32

Change-Id: I4e0375c9b9837b3b9f8a3d2570635536e7e34e42
Reviewed-on: https://team-review.git.corp.google.com/c/npe-tse-chip-sdk/third_party/connectedhomeip/+/1419520
Reviewed-by: Doug Ferraz <[email protected]>

* new: Wifi and Descriptor clusters on ESP32

Change-Id: I37b61425a55d8210c2286becce47917fddf54a3f
Reviewed-on: https://team-review.git.corp.google.com/c/npe-tse-chip-sdk/third_party/connectedhomeip/+/1418359
Reviewed-by: Rob Oliver <[email protected]>
Reviewed-by: Kevin Cheung <[email protected]>
Reviewed-by: Jerry Lee <[email protected]>

* new: added stub file. Included callbacks for successful operation of lock/unlock commands

Change-Id: I9f4d601feb3b043d3c6689775bcaf40a8c5564d2
Reviewed-on: https://team-review.git.corp.google.com/c/npe-tse-chip-sdk/third_party/connectedhomeip/+/1420959
Reviewed-by: Michael Spang <[email protected]>
Reviewed-by: Jerry Lee <[email protected]>

* Enable PW RPC server on chef-built virtual device app

Change-Id: I878955e9df26e893c136650654019a8fa14e2a8b
Reviewed-on: https://team-review.git.corp.google.com/c/npe-tse-chip-sdk/third_party/connectedhomeip/+/1417979
Reviewed-by: Doug Ferraz <[email protected]>

* cosmetic change

Change-Id: Ia2063a395a8d3f16965356d4a76b0d9df0834e57

* changes to linux pigweed dependencies. Still has issues building Pigweed

Change-Id: I2be4e81f6c2e14112e31a0803813ef56d012b206

* Fix nrfconnect compilation errors (#17713)

* Fix nrfconnect compilation errors

* Chef: fix arguments for clean build

* Build flash_script package for ESP32

Change-Id: I4e0375c9b9837b3b9f8a3d2570635536e7e34e42
Reviewed-on: https://team-review.git.corp.google.com/c/npe-tse-chip-sdk/third_party/connectedhomeip/+/1419520
Reviewed-by: Doug Ferraz <[email protected]>

* new: Wifi and Descriptor clusters on ESP32

Change-Id: I37b61425a55d8210c2286becce47917fddf54a3f
Reviewed-on: https://team-review.git.corp.google.com/c/npe-tse-chip-sdk/third_party/connectedhomeip/+/1418359
Reviewed-by: Rob Oliver <[email protected]>
Reviewed-by: Kevin Cheung <[email protected]>
Reviewed-by: Jerry Lee <[email protected]>

* new: added stub file. Included callbacks for successful operation of lock/unlock commands

Change-Id: I9f4d601feb3b043d3c6689775bcaf40a8c5564d2
Reviewed-on: https://team-review.git.corp.google.com/c/npe-tse-chip-sdk/third_party/connectedhomeip/+/1420959
Reviewed-by: Michael Spang <[email protected]>
Reviewed-by: Jerry Lee <[email protected]>

* Enable PW RPC server on chef-built virtual device app

Change-Id: I878955e9df26e893c136650654019a8fa14e2a8b
Reviewed-on: https://team-review.git.corp.google.com/c/npe-tse-chip-sdk/third_party/connectedhomeip/+/1417979
Reviewed-by: Doug Ferraz <[email protected]>

* cosmetic change

Change-Id: Ia2063a395a8d3f16965356d4a76b0d9df0834e57

* changes to linux pigweed dependencies. Still has issues building Pigweed

Change-Id: I2be4e81f6c2e14112e31a0803813ef56d012b206

* Restyled by gn

* Restyled by autopep8

* Restyled by gn

Co-authored-by: Sebastian Mauer <[email protected]>
Co-authored-by: MT Tsai <[email protected]>
Co-authored-by: vinitg1 <[email protected]>
Co-authored-by: Restyled.io <[email protected]>

* fix: added initialization to platform wifi network commissioning instance (#17983)

Change-Id: I03b6b523d4c4557ab6cc432216e48b6d6b2b6964

Co-authored-by: Sebastian Mauer <[email protected]>
Co-authored-by: MT Tsai <[email protected]>
Co-authored-by: vinitg1 <[email protected]>
Co-authored-by: Restyled.io <[email protected]>
  • Loading branch information
5 people authored May 4, 2022
1 parent cfc3595 commit d7c2dd2
Show file tree
Hide file tree
Showing 10 changed files with 7,679 additions and 1,009 deletions.
13 changes: 12 additions & 1 deletion examples/chef/chef.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,11 @@ def main(argv):
queueCommand(f"rm -rf {paths['rootSampleFolder']}/esp32/build")
queueCommand("idf.py fullclean")
queueCommand("idf.py build")
queueCommand("idf.py build flashing_script")
queueCommand(
f"(cd build/ && tar cJvf $(git rev-parse HEAD)-{options.sampleDeviceTypeName}.tar.xz --files-from=chip-shell.flashbundle.txt)")
queueCommand(
f"cp build/$(git rev-parse HEAD)-{options.sampleDeviceTypeName}.tar.xz {paths['scriptFolder']}")
elif options.buildTarget == "nrfconnect":
queueCommand(f"cd {paths['rootSampleFolder']}/nrfconnect")
if options.doClean:
Expand All @@ -364,6 +369,8 @@ def main(argv):
import("//build_overrides/chip.gni")
import("\\${{chip_root}}/config/standalone/args.gni")
chip_shell_cmd_server = false
chip_build_libshell = true
chip_config_network_layer_ble = false
target_defines = ["CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID={options.vid}", "CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID={options.pid}", "CONFIG_ENABLE_PW_RPC={'1' if options.doRPC else '0'}"]
EOF
Expand All @@ -374,7 +381,11 @@ def main(argv):
true''')
if options.doClean:
queueCommand(f"rm -rf out")
queueCommand("gn gen out")
if options.doRPC:
queueCommand(
"gn gen out --args='import(\"//with_pw_rpc.gni\")'")
else:
queueCommand("gn gen out --args=''")
queueCommand("ninja -C out")

#
Expand Down
16 changes: 16 additions & 0 deletions examples/chef/common/stubs.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#include <app-common/zap-generated/attribute-id.h>
#include <app-common/zap-generated/attribute-type.h>
#include <app-common/zap-generated/attributes/Accessors.h>
#include <app-common/zap-generated/callback.h>
#include <app-common/zap-generated/cluster-id.h>
#include <app-common/zap-generated/command-id.h>

bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, chip::Optional<chip::ByteSpan> pinCode)
{
return true;
}

bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, chip::Optional<chip::ByteSpan> pinCode)
{
return true;
}
Loading

0 comments on commit d7c2dd2

Please sign in to comment.