diff --git a/.github/workflows/build_ports.yml b/.github/workflows/build_ports.yml index bc80d7889..059a3de18 100644 --- a/.github/workflows/build_ports.yml +++ b/.github/workflows/build_ports.yml @@ -41,6 +41,7 @@ jobs: make -C porting/examples/dummy/ clean all make -C porting/examples/linux/ clean all make -C porting/examples/linux_blemesh/ clean all + make -C porting/examples/linux_blemesh_shell/ clean all make -C porting/npl/linux/test/ clean all test - name: Build RIOT port shell: bash diff --git a/.github/workflows/codeql-buildscript.sh b/.github/workflows/codeql-buildscript.sh index 46f73397f..7b11cae6b 100644 --- a/.github/workflows/codeql-buildscript.sh +++ b/.github/workflows/codeql-buildscript.sh @@ -6,3 +6,4 @@ sudo apt-get install -y make ccache gcc-multilib g++-multilib make -C porting/examples/dummy/ clean all make -C porting/examples/linux/ clean all make -C porting/examples/linux_blemesh/ clean all +make -C porting/examples/linux_blemesh_shell/ clean all diff --git a/.github/workflows/ports_syscfg_check.yml b/.github/workflows/ports_syscfg_check.yml index c7acb5ced..2fdabf8d1 100644 --- a/.github/workflows/ports_syscfg_check.yml +++ b/.github/workflows/ports_syscfg_check.yml @@ -81,6 +81,7 @@ jobs: git diff --name-only cp porting/examples/linux/include/syscfg/syscfg.h ../../../porting/examples/linux/include/syscfg/syscfg.h cp porting/examples/linux_blemesh/include/syscfg/syscfg.h ../../../porting/examples/linux_blemesh/include/syscfg/syscfg.h + cp porting/examples/linux_blemesh_shell/include/syscfg/syscfg.h ../../../porting/examples/linux_blemesh_shell/include/syscfg/syscfg.h cp porting/examples/nuttx/include/syscfg/syscfg.h ../../../porting/examples/nuttx/include/syscfg/syscfg.h cp porting/nimble/include/syscfg/syscfg.h ../../../porting/nimble/include/syscfg/syscfg.h cp porting/npl/riot/include/syscfg/syscfg.h ../../../porting/npl/riot/include/syscfg/syscfg.h diff --git a/.gitignore b/.gitignore index 66b3d7541..df39c35f7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,6 @@ porting/examples/dummy/dummy porting/examples/linux/nimble-linux porting/examples/linux_blemesh/nimble-linux-blemesh +porting/examples/linux_blemesh_shell/nimble-linux-blemesh-shell porting/npl/linux/test/.depend porting/npl/linux/test/*.exe diff --git a/porting/targets/linux_blemesh_shell/pkg.yml b/porting/targets/linux_blemesh_shell/pkg.yml new file mode 100644 index 000000000..0b3c5cdd4 --- /dev/null +++ b/porting/targets/linux_blemesh_shell/pkg.yml @@ -0,0 +1,40 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +pkg.name: "porting/targets/linux_blemesh_shell" +pkg.type: "target" +pkg.description: This target is used to generate syscfg.h file and other artifacts for linux_blemesh_shell example app. +pkg.author: +pkg.homepage: + +pkg.deps: + - "@apache-mynewt-core/kernel/os" + - "@apache-mynewt-core/sys/console/stub" + - "@apache-mynewt-core/sys/log/stub" + - "@apache-mynewt-core/sys/stats/stub" + - "@apache-mynewt-nimble/nimble/host" + - "@apache-mynewt-nimble/nimble/transport" + - "@apache-mynewt-nimble/nimble/host/services/ans" + - "@apache-mynewt-nimble/nimble/host/services/bas" + - "@apache-mynewt-nimble/nimble/host/services/dis" + - "@apache-mynewt-nimble/nimble/host/services/gap" + - "@apache-mynewt-nimble/nimble/host/services/gatt" + - "@apache-mynewt-nimble/nimble/host/services/ias" + - "@apache-mynewt-nimble/nimble/host/services/ipss" + - "@apache-mynewt-nimble/nimble/host/services/lls" + - "@apache-mynewt-nimble/nimble/host/services/tps" diff --git a/porting/targets/linux_blemesh_shell/syscfg.yml b/porting/targets/linux_blemesh_shell/syscfg.yml new file mode 100644 index 000000000..aac501aa3 --- /dev/null +++ b/porting/targets/linux_blemesh_shell/syscfg.yml @@ -0,0 +1,51 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +syscfg.vals: + MSYS_1_BLOCK_COUNT: 80 + + BLE_MESH_ADV_BUF_COUNT: 20 + BLE_MESH_TX_SEG_MAX: 6 + + BLE_MESH: 1 + BLE_MESH_SHELL: 1 + BLE_MESH_PROV: 1 + BLE_MESH_RELAY: 1 + BLE_MESH_PB_ADV: 1 + BLE_MESH_PB_GATT: 1 + BLE_MESH_LOW_POWER: 1 + BLE_MESH_LPN_AUTO: 0 + BLE_MESH_GATT_PROXY: 1 + BLE_MESH_LABEL_COUNT: 2 + BLE_MESH_SUBNET_COUNT: 2 + BLE_MESH_MODEL_GROUP_COUNT: 2 + BLE_MESH_MODEL_VND_MSG_CID_FORCE: 1 + BLE_MESH_APP_KEY_COUNT: 4 + BLE_MESH_IV_UPDATE_TEST: 1 + BLE_MESH_TESTING: 1 + BLE_MESH_FRIEND: 1 + BLE_MESH_CFG_CLI: 1 + BLE_MESH_SETTINGS: 0 + CONFIG_NFFS: 0 + + BLE_TRANSPORT_LL: socket + BLE_SOCK_TYPE: linux_blue + BLE_SOCK_TASK_PRIO: 3 + BLE_SOCK_STACK_SIZE: 1028 + + LOG_LEVEL: 0 diff --git a/porting/targets/linux_blemesh_shell/target.yml b/porting/targets/linux_blemesh_shell/target.yml new file mode 100644 index 000000000..4b9a4dab8 --- /dev/null +++ b/porting/targets/linux_blemesh_shell/target.yml @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +target.app: "porting/targets/dummy_app" +target.bsp: "@apache-mynewt-core/hw/bsp/native" +target.build_profile: "debug" diff --git a/porting/update_generated_files.sh b/porting/update_generated_files.sh index e5104b63f..da409511b 100755 --- a/porting/update_generated_files.sh +++ b/porting/update_generated_files.sh @@ -26,6 +26,7 @@ declare -A targets=( ["nuttx"]="repos/apache-mynewt-nimble/porting/examples/nuttx/" ["linux"]="repos/apache-mynewt-nimble/porting/examples/linux/" ["linux_blemesh"]="repos/apache-mynewt-nimble/porting/examples/linux_blemesh/" + ["linux_blemesh_shell"]="repos/apache-mynewt-nimble/porting/examples/linux_blemesh_shell/" ["porting_default"]="repos/apache-mynewt-nimble/porting/nimble" ["riot"]="repos/apache-mynewt-nimble/porting/npl/riot/" )