Skip to content

Commit 1582c7b

Browse files
gmarcosbgmarcosb
authored
Merge branch 'master' into camera-webrtc-server
2 parents f0f8c9e + 2a26841 commit 1582c7b

File tree

7 files changed

+263
-113
lines changed

7 files changed

+263
-113
lines changed

‎config/telink/chip-module/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ set_property(GLOBAL APPEND PROPERTY ZEPHYR_INTERFACE_LIBS chip)
155155

156156
include(${TELINK_COMMON}/common.cmake)
157157

158+
if (CONFIG_CHIP_APP_LOG_LEVEL GREATER_EQUAL 4)
159+
include(${TELINK_COMMON}/build_info.cmake)
160+
endif()
161+
158162
# ==============================================================================
159163
# Define 'process_binaries' target for collecting final binary to flash
160164
# ==============================================================================

‎examples/lighting-app/tizen/src/DBusInterface.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ gboolean DBusInterface::OnColorTemperatureChanged(LightAppColorControl * colorCo
203203
data.colorTemperatureMireds = light_app_color_control_get_color_temperature_mireds(colorControl);
204204

205205
chip::DeviceLayer::StackLock lock;
206-
ColorControlServer::Instance().moveToColorTempCommand(&handler, path, data);
206+
auto status = ColorControlServer::Instance().moveToColorTempCommand(self->mEndpointId, data);
207+
handler.AddStatus(path, status);
207208

208209
return G_DBUS_METHOD_INVOCATION_HANDLED;
209210
}

‎examples/platform/telink/build_info.cmake

+148
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
#
2+
# Copyright (c) 2024 Project CHIP Authors
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
# Matter git info
17+
execute_process(
18+
COMMAND git rev-parse HEAD
19+
OUTPUT_VARIABLE MATTER_COMMIT_HASH
20+
OUTPUT_STRIP_TRAILING_WHITESPACE
21+
)
22+
23+
execute_process(
24+
COMMAND git diff --quiet
25+
RESULT_VARIABLE MATTER_LOCAL_STATUS
26+
)
27+
28+
if(MATTER_LOCAL_STATUS)
29+
set(MATTER_LOCAL_STATUS "-dirty")
30+
else()
31+
set(MATTER_LOCAL_STATUS "")
32+
endif()
33+
34+
execute_process(
35+
COMMAND git rev-parse --abbrev-ref HEAD
36+
OUTPUT_VARIABLE MATTER_BRANCH_NAME
37+
OUTPUT_STRIP_TRAILING_WHITESPACE
38+
)
39+
40+
execute_process(
41+
COMMAND python3 -c "from datetime import datetime; print(datetime.now().strftime('%Y-%m-%d %H:%M:%S'))"
42+
OUTPUT_VARIABLE BUILD_TIMESTAMP
43+
OUTPUT_STRIP_TRAILING_WHITESPACE
44+
)
45+
46+
execute_process(
47+
COMMAND git show -s --format=%cd --date=format:%Y-%m-%d
48+
OUTPUT_VARIABLE MATTER_COMMIT_DATE
49+
OUTPUT_STRIP_TRAILING_WHITESPACE
50+
)
51+
52+
execute_process(
53+
COMMAND git remote get-url origin
54+
OUTPUT_VARIABLE MATTER_REMOTE_URL
55+
OUTPUT_STRIP_TRAILING_WHITESPACE
56+
)
57+
58+
# Zephyr git info
59+
execute_process(
60+
COMMAND git -C ${ZEPHYR_BASE} rev-parse HEAD
61+
OUTPUT_VARIABLE ZEPHYR_COMMIT_HASH
62+
OUTPUT_STRIP_TRAILING_WHITESPACE
63+
)
64+
65+
execute_process(
66+
COMMAND git -C ${ZEPHYR_BASE} rev-parse --abbrev-ref HEAD
67+
OUTPUT_VARIABLE ZEPHYR_BRANCH_NAME
68+
OUTPUT_STRIP_TRAILING_WHITESPACE
69+
)
70+
71+
execute_process(
72+
COMMAND git -C ${ZEPHYR_BASE} show -s --format=%cd --date=format:%Y-%m-%d HEAD
73+
OUTPUT_VARIABLE ZEPHYR_COMMIT_DATE
74+
OUTPUT_STRIP_TRAILING_WHITESPACE
75+
)
76+
77+
execute_process(
78+
COMMAND bash -c "git -C ${ZEPHYR_BASE} remote get-url \$(git -C ${ZEPHYR_BASE} remote | head -n 1)"
79+
OUTPUT_VARIABLE ZEPHYR_REMOTE_URL
80+
OUTPUT_STRIP_TRAILING_WHITESPACE
81+
)
82+
83+
execute_process(
84+
COMMAND git -C ${ZEPHYR_BASE} diff --quiet
85+
RESULT_VARIABLE ZEPHYR_LOCAL_STATUS
86+
)
87+
88+
if(ZEPHYR_LOCAL_STATUS)
89+
set(ZEPHYR_LOCAL_STATUS "-dirty")
90+
else()
91+
set(ZEPHYR_LOCAL_STATUS "")
92+
endif()
93+
94+
# Telink HAL info
95+
execute_process(
96+
COMMAND git -C ${ZEPHYR_BASE}/../modules/hal/telink rev-parse HEAD
97+
OUTPUT_VARIABLE TELINK_HAL_COMMIT_HASH
98+
OUTPUT_STRIP_TRAILING_WHITESPACE
99+
)
100+
101+
execute_process(
102+
COMMAND git -C ${ZEPHYR_BASE}/../modules/hal/telink diff --quiet
103+
RESULT_VARIABLE HAL_LOCAL_STATUS
104+
)
105+
106+
if(TELINK_HAL_LOCAL_STATUS)
107+
set(TELINK_HAL_LOCAL_STATUS "-dirty")
108+
else()
109+
set(TELINK_HAL_LOCAL_STATUS "")
110+
endif()
111+
112+
execute_process(
113+
COMMAND git -C ${ZEPHYR_BASE}/../modules/hal/telink show -s --format=%cd --date=format:%Y-%m-%d
114+
OUTPUT_VARIABLE TELINK_HAL_COMMIT_DATE
115+
OUTPUT_STRIP_TRAILING_WHITESPACE
116+
)
117+
118+
target_compile_definitions(app PRIVATE
119+
MATTER_COMMIT_HASH="${MATTER_COMMIT_HASH}"
120+
MATTER_BRANCH="${MATTER_BRANCH_NAME}"
121+
BUILD_TIMESTAMP="${BUILD_TIMESTAMP}"
122+
MATTER_COMMIT_DATE="${MATTER_COMMIT_DATE}"
123+
MATTER_REMOTE_URL="${MATTER_REMOTE_URL}"
124+
MATTER_LOCAL_STATUS="${MATTER_LOCAL_STATUS}"
125+
126+
ZEPHYR_COMMIT_HASH="${ZEPHYR_COMMIT_HASH}"
127+
ZEPHYR_BRANCH="${ZEPHYR_BRANCH_NAME}"
128+
ZEPHYR_COMMIT_DATE="${ZEPHYR_COMMIT_DATE}"
129+
ZEPHYR_REMOTE_URL="${ZEPHYR_REMOTE_URL}"
130+
ZEPHYR_LOCAL_STATUS="${ZEPHYR_LOCAL_STATUS}"
131+
132+
TELINK_HAL_COMMIT_HASH="${TELINK_HAL_COMMIT_HASH}"
133+
TELINK_HAL_LOCAL_STATUS="${TELINK_HAL_LOCAL_STATUS}"
134+
TELINK_HAL_COMMIT_DATE="${TELINK_HAL_COMMIT_DATE}"
135+
)
136+
137+
message(STATUS "Matter revision:")
138+
message(STATUS " board: ${CONFIG_BOARD}")
139+
message(STATUS " branch: ${MATTER_BRANCH_NAME} ${MATTER_COMMIT_HASH} ${MATTER_COMMIT_DATE}")
140+
message(STATUS " remote: ${MATTER_REMOTE_URL}")
141+
message(STATUS " build timestamp: ${BUILD_TIMESTAMP}")
142+
143+
message(STATUS "Zephyr revision:")
144+
message(STATUS " branch: ${ZEPHYR_BRANCH_NAME} ${ZEPHYR_COMMIT_HASH} ${ZEPHYR_COMMIT_DATE}")
145+
message(STATUS " remote: ${ZEPHYR_REMOTE_URL}")
146+
147+
message(STATUS "HAL revision:")
148+
message(STATUS " commit: ${TELINK_HAL_COMMIT_HASH} ${TELINK_HAL_COMMIT_DATE}")

‎examples/platform/telink/common/include/AppTaskCommon.h

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ class AppTaskCommon
8484

8585
protected:
8686
CHIP_ERROR InitCommonParts(void);
87+
void PrintFirmwareInfo(void);
8788

8889
void DispatchEvent(AppEvent * event);
8990
void GetEvent(AppEvent * aEvent);

‎examples/platform/telink/common/src/AppTaskCommon.cpp

+18-1
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,28 @@ CHIP_ERROR AppTaskCommon::StartApp(void)
240240
DispatchEvent(&event);
241241
}
242242
}
243+
void AppTaskCommon::PrintFirmwareInfo(void)
244+
{
245+
LOG_INF("SW Version: %u, %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION, CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
243246

247+
#if CONFIG_CHIP_APP_LOG_LEVEL > 3
248+
LOG_DBG("Matter revision: ");
249+
LOG_DBG("\t board: %s", CONFIG_BOARD);
250+
LOG_DBG("\t branch: %s %.8s%s %s", MATTER_BRANCH, MATTER_COMMIT_HASH, MATTER_LOCAL_STATUS, MATTER_COMMIT_DATE);
251+
LOG_DBG("\t remote: %s", MATTER_REMOTE_URL);
252+
LOG_DBG("\t build timestamp: %s", BUILD_TIMESTAMP);
253+
254+
LOG_DBG("Zephyr revision: ");
255+
LOG_DBG("\t branch: %s %.8s%s %s", ZEPHYR_BRANCH, ZEPHYR_COMMIT_HASH, ZEPHYR_LOCAL_STATUS, ZEPHYR_COMMIT_DATE);
256+
LOG_DBG("\t remote: %s", ZEPHYR_REMOTE_URL);
257+
LOG_DBG("\t HAL commit: %.8s%s %s", TELINK_HAL_COMMIT_HASH, TELINK_HAL_LOCAL_STATUS, TELINK_HAL_COMMIT_DATE);
258+
#endif
259+
}
244260
CHIP_ERROR AppTaskCommon::InitCommonParts(void)
245261
{
246262
CHIP_ERROR err;
247-
LOG_INF("SW Version: %u, %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION, CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
263+
264+
PrintFirmwareInfo();
248265

249266
InitLeds();
250267
UpdateStatusLED();

0 commit comments

Comments
 (0)