Skip to content

Commit c49a75e

Browse files
restyled-commitswy-hh
authored andcommitted
Restyled by gn
1 parent a531c2a commit c49a75e

File tree

5 files changed

+19
-30
lines changed

5 files changed

+19
-30
lines changed

examples/contact-sensor-app/bouffalolab/bl702l/app_pds.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ extern "C" void vApplicationSleep(TickType_t xExpectedIdleTime)
6161
{
6262
extern void * pxCurrentTCB;
6363

64-
ChipLogProgress(NotSpecified, "wakeup source: rtc. %lu vs %lu ms @ %lu\r\n", xExpectedIdleTime,
65-
(uint32_t) (bl_rtc_get_timestamp_ms() - sleep_before), (uint32_t) bl_rtc_get_timestamp_ms());
64+
// ChipLogProgress(NotSpecified, "wakeup source: rtc. %lu vs %lu ms @ %lu\r\n", xExpectedIdleTime,
65+
// (uint32_t) (bl_rtc_get_timestamp_ms() - sleep_before), (uint32_t) bl_rtc_get_timestamp_ms());
6666

67-
ChipLogProgress(NotSpecified, "application_sleep; %lu, %lu, %lu\r\n", (uint32_t) sleep_calling_time, (uint32_t) sleep_time,
68-
(uint32_t) wakeup_time);
67+
// ChipLogProgress(NotSpecified, "application_sleep; %lu, %lu, %lu\r\n", (uint32_t) sleep_calling_time, (uint32_t) sleep_time,
68+
// (uint32_t) wakeup_time);
6969
}
7070
else if (app_pds_wakeup_source == PDS_WAKEUP_BY_GPIO)
7171
{
@@ -80,9 +80,9 @@ extern "C" void vApplicationSleep(TickType_t xExpectedIdleTime)
8080
app_pds_irq_handler(&gpio_contact);
8181
}
8282

83-
ChipLogProgress(NotSpecified, "wakeup source: gpio -> 0x%08lX. %lu vs %lu ms @ %lu\r\n", app_pds_wakeup_pin,
84-
xExpectedIdleTime, (uint32_t) (bl_rtc_get_timestamp_ms() - sleep_before),
85-
(uint32_t) bl_rtc_get_timestamp_ms());
83+
// ChipLogProgress(NotSpecified, "wakeup source: gpio -> 0x%08lX. %lu vs %lu ms @ %lu\r\n", app_pds_wakeup_pin,
84+
// xExpectedIdleTime, (uint32_t) (bl_rtc_get_timestamp_ms() - sleep_before),
85+
// (uint32_t) bl_rtc_get_timestamp_ms());
8686
}
8787

8888
app_pds_wakeup_source = -1;

examples/lighting-app/bouffalolab/bl602/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ bouffalolab_executable("lighting_app") {
232232
inputs = [ ldscript ]
233233

234234
if (chip_print_memory_usage) {
235-
236235
if (enable_lwip_pbuf_ram) {
237236
ldflags += [ "-Wl,--defsym=__RAM_PBUF_POOL=0" ]
238237
}

examples/lighting-app/bouffalolab/bl616/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ bouffalolab_executable("lighting_app") {
126126
if (enable_lwip_pbuf_ram) {
127127
defines += [ "CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM=1" ]
128128
}
129-
129+
130130
defines += [ "BL616DK" ]
131131

132132
sources = [

third_party/bouffalolab/bl602/bl_iot_sdk.gni

+4-8
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ template("bl_iot_sdk") {
6565
rebase_path("${invoker.freertos_config}", root_build_dir),
6666
]
6767

68-
if (defined(invoker.enable_lwip_pbuf_ram) &&
69-
invoker.enable_lwip_pbuf_ram) {
68+
if (defined(invoker.enable_lwip_pbuf_ram) && invoker.enable_lwip_pbuf_ram) {
7069
defines += [ "CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM=1" ]
7170
}
7271
}
@@ -912,8 +911,7 @@ template("bl_iot_sdk") {
912911
"${bl_iot_sdk_root}/components/network/lwip_dhcpd",
913912
]
914913

915-
if (defined(invoker.enable_lwip_pbuf_ram) &&
916-
invoker.enable_lwip_pbuf_ram) {
914+
if (defined(invoker.enable_lwip_pbuf_ram) && invoker.enable_lwip_pbuf_ram) {
917915
include_dirs += [ "${bouffalolab_iot_sdk_build_root}/patches/lwip" ]
918916
}
919917

@@ -951,11 +949,9 @@ template("bl_iot_sdk") {
951949
"${bl_iot_sdk_root}/components/network/lwip/src/core/udp.c",
952950
]
953951

954-
if (defined(invoker.enable_lwip_pbuf_ram) &&
955-
invoker.enable_lwip_pbuf_ram) {
952+
if (defined(invoker.enable_lwip_pbuf_ram) && invoker.enable_lwip_pbuf_ram) {
956953
sources += [ "${bouffalolab_iot_sdk_build_root}/patches/lwip/mem.c" ]
957-
}
958-
else {
954+
} else {
959955
sources += [ "${bl_iot_sdk_root}/components/network/lwip/src/core/mem.c" ]
960956
}
961957

third_party/bouffalolab/bl616/bouffalo_sdk.gni

+7-13
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ template("bouffalo_sdk") {
7474
defines += invoker.defines
7575
}
7676

77-
if (defined(invoker.enable_lwip_pbuf_ram) &&
78-
invoker.enable_lwip_pbuf_ram) {
77+
if (defined(invoker.enable_lwip_pbuf_ram) && invoker.enable_lwip_pbuf_ram) {
7978
defines += [ "CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM=1" ]
8079
}
8180
}
@@ -418,6 +417,7 @@ template("bouffalo_sdk") {
418417
include_dirs = [ "${bouffalo_sdk_root}/components/libc" ]
419418

420419
sources = [
420+
"${bouffalo_sdk_root}/components/libc/assert.c",
421421
"${bouffalo_sdk_root}/components/libc/newlib/port_init_fini.c",
422422
"${bouffalo_sdk_root}/components/libc/newlib/port_memory.c",
423423
"${bouffalo_sdk_root}/components/libc/newlib/syscalls_nosys.c",
@@ -463,7 +463,6 @@ template("bouffalo_sdk") {
463463
"${bouffalo_sdk_root}/components/libc/nuttx/libc/string/lib_strtok.c",
464464
"${bouffalo_sdk_root}/components/libc/nuttx/libc/string/lib_strtokr.c",
465465
"${bouffalo_sdk_root}/components/libc/nuttx/libc/string/lib_vikmemcpy.c",
466-
"${bouffalo_sdk_root}/components/libc/assert.c",
467466
"${bouffalo_sdk_root}/components/libc/printf.c",
468467
"${bouffalo_sdk_root}/components/libc/snprintf.c",
469468
"${bouffalo_sdk_root}/components/libc/sprintf.c",
@@ -902,8 +901,7 @@ template("bouffalo_sdk") {
902901
include_dirs +=
903902
[ "${bouffalo_sdk_root}/components/net/lwip/lwip/src/apps/dhcpd" ]
904903

905-
if (defined(invoker.enable_lwip_pbuf_ram) &&
906-
invoker.enable_lwip_pbuf_ram) {
904+
if (defined(invoker.enable_lwip_pbuf_ram) && invoker.enable_lwip_pbuf_ram) {
907905
include_dirs += [ "${bouffalolab_iot_sdk_build_root}/patches/lwip" ]
908906
}
909907

@@ -964,14 +962,10 @@ template("bouffalo_sdk") {
964962
]
965963

966964
if (defined(invoker.enable_lwip_pbuf_ram) && invoker.enable_lwip_pbuf_ram) {
967-
sources += [
968-
"${bouffalolab_iot_sdk_build_root}/patches/lwip/mem.c",
969-
]
970-
}
971-
else {
972-
sources += [
973-
"${bouffalo_sdk_root}/components/net/lwip/lwip/src/core/mem.c",
974-
]
965+
sources += [ "${bouffalolab_iot_sdk_build_root}/patches/lwip/mem.c" ]
966+
} else {
967+
sources +=
968+
[ "${bouffalo_sdk_root}/components/net/lwip/lwip/src/core/mem.c" ]
975969
}
976970

977971
sources += [

0 commit comments

Comments
 (0)