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.

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

Upmerge 16.05.2024 #15351

Merged
merged 39 commits into from
May 28, 2024
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
ca49f68
manifest: Pull upmerged repositories
rlubos May 16, 2024
a6b21d7
doc: mcuboot: Make sure PORTING.md is visible
rlubos May 16, 2024
ae5208f
bluetooth: Don't reference removed Kconfig symbols
rlubos May 16, 2024
3dbff88
bluetooth: Remove CONFIG_BT_HCI_RAW_RESERVE
MarekPieta May 17, 2024
f2e2c53
sample: wifi: ble_coex: Ignore zperf periodic results
rlubos May 17, 2024
bf2a4f6
net: lwm2m: Align with lwm2m_engine_set_data_cb_t API change
rlubos May 17, 2024
c2066c7
kernel: Remove NCS boot banner dependency
rlubos May 17, 2024
38517da
nrf_security: Fix incompatibility with MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
rlubos May 17, 2024
2ad82ec
samples: net: mqtt: Align with SFM_CREATE_STATE API changes
rlubos May 17, 2024
86b881c
bluetooth: Remove bt_read_static_addr() "hack"
MarekPieta May 17, 2024
f3ddf95
bluetooth: controller: Merge BT_HCI_VS_EXT into BT_HCI_VS
MarekPieta May 17, 2024
6aafb28
lib: fatal_error: Don't enable fatal handler by default globally
rlubos May 20, 2024
956e61f
applications: nrf_desktop: Disable NCS boot banner
MarekPieta May 20, 2024
d1b0c9f
modules: memfault: Override MEMFAULT_HTTP_USES_MBEDTLS config default
rlubos May 20, 2024
5027929
samples: matter: Renamed rram0 label for nRF54l15pdk
kkasperczyk-no May 21, 2024
8734032
boards: shields: disable NCS_BOOT_BANNER for nRF22xx shields
May 21, 2024
c6ebff7
debug: etb_trace: Covert SOC_ON_EXIT_CPU_IDLE handler to C
rlubos May 21, 2024
80db85c
samples: wifi: sta: Fix RAM overflow for nRF52840
krish2718 May 21, 2024
62b36e8
scripts: Quarantine Wi-Fi on nRF54L15
krish2718 May 21, 2024
44b6c2a
applications: nrf_desktop: Align RRAM configuration for nRF54L15 PDK
MarekPieta May 21, 2024
c052a60
Applications: nrf5340_audio: Upmerge fixes
koffes May 21, 2024
8d3647f
scripts: Extend Zephyr tests/samples quarantine
rlubos May 21, 2024
50b0fed
samples: wifi: shell: Increase net management buffers
krish2718 May 22, 2024
3fedac2
boards: 54l: ns: Delete the deprecated nrf54l15_cpuapp_ns.dtsi
SebastianBoe May 22, 2024
88b4d53
Applications: nrf5340_audio: Upmerge fixes2
koffes May 22, 2024
48493db
requirements: Updated pylint version
PerMac May 22, 2024
a55423b
samples: cellular: fmfu_smp_svr: Enable CRC in the sample
rlubos May 23, 2024
8ea9e77
samples: Use default nrf54l15pdk/nrf54l15/cpuapp revision in twister
rlubos May 23, 2024
72d9ef5
applications: nrf_desktop: Change watchdog instance for nrf54l15
rlubos May 23, 2024
6c477e0
scripts: Qurantine nRF54H Wi-Fi test
krish2718 May 23, 2024
c30ea28
lib: net: softap_wifi_provision: Align with SFM API changes
rlubos May 24, 2024
ec5957f
suit: flash_companion: Adjust minimal configuration
tomchy May 24, 2024
540f98f
samples: matter: Disabled NCS boot banner in the sysbuild mcuboot
kkasperczyk-no May 24, 2024
a50bde9
samples: Don't use deprecated NET_SOCKETS_POSIX_NAMES
rlubos May 25, 2024
24ddd07
samples: fast_pair: input_device: Fix build failures on nRF5340 DK
MarekPieta May 24, 2024
a76b81c
samples: bluetooth: Remove uses of auto name in advertising
grochu May 27, 2024
38309fe
doc: release-notes-changelog: Update Zephyr SHAs used in the upmerge
rlubos May 27, 2024
cf31f50
scripts: Quarantine iso_time_sync on nrf54l15pdk
rlubos May 27, 2024
0d202c3
samples: bluetooth: connection_event_trigger: Increase BT_RX_STACK_SIZE
rlubos May 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c
Original file line number Diff line number Diff line change
Expand Up @@ -798,22 +798,24 @@ static void reset_entry(void *o)
static const struct smf_state state[] = {
[STATE_INIT] = SMF_CREATE_STATE(init_entry,
init_run,
NULL),
NULL, NULl, NULl),
Copy link
Contributor

Choose a reason for hiding this comment

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

Argh. Sorry. I was reviewing as you merged, just noticed this.

It seems these NULLs have a lower-case L

Copy link
Contributor Author

Choose a reason for hiding this comment

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

How in the world CI didn't catch this... Will fix

[STATE_UNPROVISIONED] = SMF_CREATE_STATE(unprovisioned_entry,
unprovisioned_run,
unprovisioned_exit),
unprovisioned_exit,
NULl, NULl),
[STATE_PROVISIONING] = SMF_CREATE_STATE(provisioning_entry,
provisioning_run,
provisioning_exit),
provisioning_exit,
NULl, NULl),
[STATE_PROVISIONED] = SMF_CREATE_STATE(NULL,
provisioned_run,
provisioned_exit),
provisioned_exit,
NULl, NULl),
[STATE_FINISHED] = SMF_CREATE_STATE(finished_entry,
finished_run,
NULL),
NULL, NULl, NULl),
[STATE_RESET] = SMF_CREATE_STATE(reset_entry,
NULL,
NULL),
NULL, NULL, NULl, NULl),
};

static int send_response(struct http_req *request, char *response, size_t len, int socket)
Expand Down