Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mw320] PR of cherry-pick the merged PR #22915 in the master branch to v1.0-branch #23009

Merged
merged 1 commit into from Oct 4, 2022
Merged

[mw320] PR of cherry-pick the merged PR #22915 in the master branch to v1.0-branch #23009

merged 1 commit into from Oct 4, 2022

Conversation

crlonxp
Copy link
Contributor

@crlonxp crlonxp commented Oct 4, 2022 •
edited by andy31415

Request to cherry-picked commit (PR #22915) which is merged in the master branch to v1.0-branch

@crlonxp @restyled-commits @nxptest
[mw320] Sve2 pr (#22915)
98c767f 
* Add the Software Version Info for TC-BINFO-2.1

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add to save the information of the last connected AP

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add to support "Manual controlled feature" for TC-OO-2.2

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Move mw320_sdk initialization to a function

* Add Identify_Timer_Handler() for TC-I-2.2

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add modules: - ConnectivityUtils.* - DeviceInfoProviderImpl.*

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add the implementation of read/write configuration key to flash

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add to report information for TC_DGGEN-3.1

    - entwork interface:
		./chip-tool generaldiagnostics read network-interfaces 1 0
    - reboot count:
		./chip-tool generaldiagnostics read reboot-count 1 0

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add the missing functions for handling tc-wifidiag-3.1 Some of them are incompleted yet that hard-coded value are used

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Restyled by clang-format

* Restyled by gn

* Implement the functions for WiFiDiagnostics / Generic Diagnostics * wifi diagnostics commands: ./chip-tool wifinetworkdiagnostics read bssid 1 0 ./chip-tool wifinetworkdiagnostics read security-type 1 0 ./chip-tool wifinetworkdiagnostics read wi-fi-version 1 0 ./chip-tool wifinetworkdiagnostics read channel-number 1 0 ./chip-tool wifinetworkdiagnostics read rssi 1 0 ./chip-tool wifinetworkdiagnostics read beacon-lost-count 1 0 ./chip-tool wifinetworkdiagnostics read beacon-rx-count 1 0 ./chip-tool wifinetworkdiagnostics read packet-multicast-rx-count 1 0 ./chip-tool wifinetworkdiagnostics read packet-multicast-tx-count 1 0 ./chip-tool wifinetworkdiagnostics read packet-unicast-rx-count 1 0 ./chip-tool wifinetworkdiagnostics read packet-unicast-tx-count 1 0 ./chip-tool wifinetworkdiagnostics read current-max-rate 1 0 ./chip-tool wifinetworkdiagnostics read overrun-count 1 0

* Generic Diagnostics:
	./chip-tool generaldiagnostics read network-interfaces 1 0
	./chip-tool generaldiagnostics read reboot-count 1 0

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add to support Identify_Time on multiple endpoints Verify: pass TC_I_2.2 for ep#0, ep#1

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add "reset watermark" handler

Verify: pass TC-DGSW-2.3

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add to support Ethernet / WiFi network commissioning Test: pass TC-CNET-x.xx, Ethernet and WiFi cases

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* * Remove unused module: DeviceInfoProviderImpl.cpp/DeviceInfoProviderImpl.h * Change the setting to support the new tiny_crypt implementation

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add to print the version string

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* * Add the Shutdown handler in PlatformMgr() * Add to register the shutdown command - Sent shutdown event - Shutdown the chip stack

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add back DeviceInfoProviderImpl.cpp / DeviceInfoProviderImpl.h to pass TC-LCFG-2.1 Update the version to: mw320-2.9.10-002

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Change to comparing SSID with characters, instead of ASCII code (previous implementation of Matter stack) ref test: TC-CNET-4.4, Scan with SSID: ./chip-tool networkcommissioning scan-networks 1 0 --Ssid hex:6E78705F6D6174746572 --Breadcrumb 2

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Update version number to: mw320-2.9.10-003

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Update README.md

* Correct the printed Rendzvous Information (QR-code, Manual code) from BLE (unsupported) => OnNetwork

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add the function to change the pincode of mw320: Usage: > pincode [pin_code] example: > pincode 20192022 [i] mflash_save_file success Done > config VendorId: 65521 (0xFFF1) ProductId: 32769 (0x8001) HardwareVersion: 0 (0x0) PinCode: 20192022 Discriminator: f01 Done

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Update version number to: mw320-2.9.10-004

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Limit the maximum supported fabric number == 5

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add a shell command to save the ssid / password of the default ap

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Put manual_control implementation into a compile option controlled

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add to dump progressing message on mw320

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Update version number to: mw320-2.9.10-005

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add to support reading the manufacture data from a partition.

    - Creat the project from gn: chip_with_factory_data=1
    example:
        gn gen out/debug --args='treat_warnings_as_errors=false mbedtls_repo="//third_party/connectedhomeip/third_party/nxp/libs/mbedtls" chip_crypto="" chip_with_factory_data=1'
        gn gen out/debug --args='treat_warnings_as_errors=false mbedtls_repo="//third_party/connectedhomeip/third_party/nxp/libs/mbedtls" chip_crypto="tinycrypt" chip_with_factory_data=1'

    pairing command:
        ./chip-tool pairing ethernet 1 14014 1000 [ip_of_dut] 5540 --paa-trust-store-path /home/ubuntu/certs/paa/

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add to support save/get BootReason Verify: step#5 of TC-DGGEN-2.2

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add 2 console commands: * wlan-stat: Show the current dut status > wlan-state * wlan-abort: Abort the current connecting and accept the new request > wlan-abort

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Restyled by whitespace

* Restyled by clang-format

* Restyled by gn

* Disable the chip_detail_logging

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Add a building option, wifi_conn_abort_support, to make it configurable

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>

* Restyled by gn

* update submodule

Signed-off-by: Chin-Ran Lo <chin-ran.lo@nxp.com>
Co-authored-by: Restyled.io <commits@restyled.io>
Co-authored-by: nxptest <68574485+nxptest@users.noreply.github.com>
andy31415
andy31415 previously requested changes Oct 4, 2022
View reviewed changes
Copy link
Contributor

@andy31415 andy31415 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR instructions included please delete instructions and they were not deleted.

@andy31415
Copy link
Contributor

PR instructions included please delete instructions and they were not deleted.

I will do the edit manually. Conflicts still need to be resolved.

@andy31415 andy31415 dismissed their stale review October 4, 2022 15:14

I edited the summary.

andy31415
andy31415 previously requested changes Oct 4, 2022
View reviewed changes
Copy link
Contributor

@andy31415 andy31415 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR seems to try to merge to master.

The title seems to say 'merge into v1.0-branch'. Please update the PR to merge into 1.0 or correct the title.

@andy31415 andy31415 changed the base branch from master to v1.0-branch October 4, 2022 17:42
@andy31415 andy31415 dismissed their stale review October 4, 2022 17:42

Apparently I was allowed to update the base manually. Seeing now if we get conflicts or not.

@andy31415 andy31415 merged commit fc8337e into project-chip:v1.0-branch Oct 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andy31415 andy31415 andy31415 approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@arkq arkq Awaiting requested review from arkq

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@carol-apple carol-apple Awaiting requested review from carol-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@hawk248 hawk248 Awaiting requested review from hawk248

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@kghost kghost Awaiting requested review from kghost

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

Assignees
No one assigned
Labels
app config controller crypto documentation Improvements or additions to documentation esp32 examples github integrations lib platform review - pending scripts shell support workflows
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@crlonxp @andy31415