Skip to content

Commit

Permalink
[python] Fix Python device library build (#20043)
Browse files Browse the repository at this point in the history
* Drop chip_use_clusters_for_ip_commissioning

It has been removed from build_python.sh already a while ago in
3a46649.

* Drop unused variables
  • Loading branch information
agners authored and pull[bot] committed Jun 29, 2022
1 parent 34196aa commit 2923041
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
9 changes: 1 addition & 8 deletions scripts/build_python_device.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ ENVIRONMENT_ROOT="$CHIP_ROOT/out/python_env"
declare chip_detail_logging=false
declare enable_pybindings=false
declare chip_mdns
declare clusters=true

help() {

Expand All @@ -54,8 +53,6 @@ Input Options:
By default it is false.
-m, --chip_mdns ChipMDNSValue Specify ChipMDNSValue as platform or minimal.
By default it is minimal.
-c, --clusters_for_ip_commissioning true/false Specify whether to use clusters for IP commissioning.
By default it is true.
-p, --enable_pybindings EnableValue Specify whether to enable pybindings as python controller.
"
}
Expand All @@ -76,10 +73,6 @@ while (($#)); do
chip_mdns=$2
shift
;;
--clusters_for_ip_commissioning | -c)
clusters=$2
shift
;;
--enable_pybindings | -p)
enable_pybindings=$2
shift
Expand All @@ -104,7 +97,7 @@ source "$CHIP_ROOT/scripts/activate.sh"

chip_data_model_arg="chip_data_model=\"///examples/lighting-app/lighting-common\""

gn --root="$CHIP_ROOT" gen "$OUTPUT_ROOT" --args="chip_detail_logging=$chip_detail_logging enable_pylib=$enable_pybindings enable_rtti=$enable_pybindings chip_use_clusters_for_ip_commissioning=$clusters $chip_mdns_arg chip_controller=false $chip_data_model_arg"
gn --root="$CHIP_ROOT" gen "$OUTPUT_ROOT" --args="chip_detail_logging=$chip_detail_logging enable_pylib=$enable_pybindings enable_rtti=$enable_pybindings $chip_mdns_arg chip_controller=false $chip_data_model_arg"

# Compiles python files
# Check pybindings was requested
Expand Down
3 changes: 0 additions & 3 deletions src/controller/python/chip/server/ServerInit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,6 @@ void pychip_server_native_init()

// parts from ChipLinuxAppMainLoop

uint16_t securePort = CHIP_PORT;
uint16_t unsecurePort = CHIP_UDC_PORT;

// Init ZCL Data Model and CHIP App Server
static chip::CommonCaseDeviceServerInitParams initParams;
(void) initParams.InitializeStaticResourcesBeforeServerInit();
Expand Down

0 comments on commit 2923041

Please sign in to comment.