diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..70ae3126 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.associations": { + "oled_demo.h": "c" + } +} \ No newline at end of file diff --git a/README.md b/README.md index aace4646..e3d3d064 100644 --- a/README.md +++ b/README.md @@ -103,13 +103,13 @@ * 预售微店(微信扫码) -![](./figures/Niobe/预售链接.png) +![](./applications/figures/预售链接.png) * Niobe开发板全貌图 -![](./figures/Niobe/全貌图.jpg) +![](./applications/figures/全貌图.jpg) -![](./figures/Niobe/341d541732a8bb7b49afe4859720702.jpg) +![](./applications/figures/341d541732a8bb7b49afe4859720702.jpg) -![](./figures/Niobe/6924eeb198d01b9918c2f6b7187898e.jpg) +![](./applications/figures/6924eeb198d01b9918c2f6b7187898e.jpg) diff --git a/applications/app/BUILD.gn b/applications/app/BUILD.gn index 0cb8cfd2..0caa916f 100644 --- a/applications/app/BUILD.gn +++ b/applications/app/BUILD.gn @@ -25,7 +25,7 @@ lite_component("app") { # "TW101_GPIO_led:gpio_led_example", # "TW102_EXTI_key:exti_key_example", # "TW103_PWM_led:pwm_led_example", - "TW104_ADC_voltage:adc_voltage", + # "TW104_ADC_voltage:adc_voltage", # "TW105_I2C_sht30:i2c_sht30", # "TW106_UART:uart_test", # "TW301_APP_oled:oled_demo", diff --git a/applications/app/TW001_OS_helloworld/BUILD.gn b/applications/app/TW001_OS_helloworld/BUILD.gn index 8e6fb3b9..28d6cec7 100644 --- a/applications/app/TW001_OS_helloworld/BUILD.gn +++ b/applications/app/TW001_OS_helloworld/BUILD.gn @@ -1,3 +1,16 @@ +# Copyright (c) 2021 Talkweb Co.,ltd. +# Licensed 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. + static_library("helloworld"){ sources =[ "hello_world.c" diff --git a/applications/app/TW001_OS_helloworld/README.md b/applications/app/TW001_OS_helloworld/README.md index 465155ce..3df671e1 100644 --- a/applications/app/TW001_OS_helloworld/README.md +++ b/applications/app/TW001_OS_helloworld/README.md @@ -2,12 +2,12 @@ ## Hello World -沿袭程序界的传统,第一个程序都是Hello World。在Sandwich WiFi IoT开发板中,指的是通过开发板串口,在串口日志中输出Hello World字符串。 +沿袭程序界的传统,第一个程序都是Hello World。在Niobe WiFi IoT开发板中,指的是通过开发板串口,在串口日志中输出Hello World字符串。 -在Sandwich WiFi IoT开发板系统代码中,Hello World程序位于applications目录下面,具体路径如下: +在Niobe WiFi IoT开发板系统代码中,Hello World程序位于applications目录下面,具体路径如下: ```tex -applications/sandwich/TW001_OS_helloworld/hello_world.c +applications/app/TW001_OS_helloworld/hello_world.c ``` ## 编译调试 diff --git a/applications/app/TW002_OS_thread/BUILD.gn b/applications/app/TW002_OS_thread/BUILD.gn index 61ca2996..9b6e8ef3 100644 --- a/applications/app/TW002_OS_thread/BUILD.gn +++ b/applications/app/TW002_OS_thread/BUILD.gn @@ -1,3 +1,16 @@ +# Copyright (c) 2021 Talkweb Co.,ltd. +# Licensed 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. + static_library("os_thread_example"){ sources =[ "os_thread_example.c" diff --git a/applications/app/TW002_OS_thread/README.md b/applications/app/TW002_OS_thread/README.md index ba269ee2..2965cb62 100644 --- a/applications/app/TW002_OS_thread/README.md +++ b/applications/app/TW002_OS_thread/README.md @@ -1,7 +1,7 @@ # Niobe WiFi IoT开发板OpenHarmony内核编程开发——Thread多线程 本示例将演示如何在Niobe WiFi IoT开发板上使用cmsis 2.0 接口进行多线程开发 -![Niobe](../../../figures/Niobe/niobe.png) +![Niobe](../../figures/niobe.png) ## Thread API分析 ## osThreadNew() @@ -81,7 +81,7 @@ static void OS_Thread_example(void) ### 修改 BUILD.gn 文件 -修改 `applications`路径下 BUILD.gn 文件,指定 `os_thread_example` 参与编译。 +修改 `applications\app`路径下 BUILD.gn 文件,指定 `os_thread_example` 参与编译。 ```r #"TW001_OS_helloworld:helloworld_example", diff --git a/applications/app/TW003_OS_timer/BUILD.gn b/applications/app/TW003_OS_timer/BUILD.gn index d017b6f1..33d5236a 100644 --- a/applications/app/TW003_OS_timer/BUILD.gn +++ b/applications/app/TW003_OS_timer/BUILD.gn @@ -1,3 +1,16 @@ +# Copyright (c) 2021 Talkweb Co.,ltd. +# Licensed 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. + static_library("os_timer_example"){ sources =[ "os_timer_example.c" diff --git a/applications/app/TW003_OS_timer/README.md b/applications/app/TW003_OS_timer/README.md index 8b98cabc..4d073bd6 100644 --- a/applications/app/TW003_OS_timer/README.md +++ b/applications/app/TW003_OS_timer/README.md @@ -1,7 +1,7 @@ # Niobe开发板OpenHarmony内核编程开发——定时器 -本示例将演示如何在Niobe开发板上使用cmsis 2.0 接口进行定时器开发 +本示例将演示如何在Niobe Wifi IoT开发板上使用cmsis 2.0 接口进行定时器开发 -![Niobe](../../../figures/Niobe/niobe.png) +![Niobe](../../figures/niobe.png) ## Timer API分析 diff --git a/applications/app/TW003_OS_timer/os_timer_example.c b/applications/app/TW003_OS_timer/os_timer_example.c index a41811d8..5cb8ad8d 100644 --- a/applications/app/TW003_OS_timer/os_timer_example.c +++ b/applications/app/TW003_OS_timer/os_timer_example.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Talkweb Co., Ltd. + * Copyright (c) 2021 Talkweb Co., Ltd. * Licensed 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 diff --git a/applications/app/TW004_OS_event/BUILD.gn b/applications/app/TW004_OS_event/BUILD.gn index efe9897d..a3046e15 100644 --- a/applications/app/TW004_OS_event/BUILD.gn +++ b/applications/app/TW004_OS_event/BUILD.gn @@ -1,3 +1,16 @@ +# Copyright (c) 2021 Talkweb Co.,ltd. +# Licensed 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. + static_library("os_event_example"){ sources =[ "os_event_example.c" diff --git a/applications/app/TW004_OS_event/README.md b/applications/app/TW004_OS_event/README.md index 7be278d0..1072db0a 100644 --- a/applications/app/TW004_OS_event/README.md +++ b/applications/app/TW004_OS_event/README.md @@ -1,7 +1,7 @@ # Niobe开发板OpenHarmony内核编程开发——事件标志 -本示例将演示如何在Niobe开发板上使用cmsis 2.0 接口使用事件标志同步线程 +本示例将演示如何在Niobe Wifi IoT开发板上使用cmsis 2.0 接口使用事件标志同步线程 -![Niobe](../../../figures/Niobe/niobe.png) +![Niobe](../../figures/niobe.png) ## EventFlags API分析 diff --git a/applications/app/TW004_OS_event/os_event_example.c b/applications/app/TW004_OS_event/os_event_example.c index c4a6ab0d..10c0b61b 100644 --- a/applications/app/TW004_OS_event/os_event_example.c +++ b/applications/app/TW004_OS_event/os_event_example.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Talkweb Co., Ltd. + * Copyright (c) 2021 Talkweb Co., Ltd. * Licensed 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 diff --git a/applications/app/TW005_OS_mutex/BUILD.gn b/applications/app/TW005_OS_mutex/BUILD.gn index 3ae34693..ee3d2c9a 100644 --- a/applications/app/TW005_OS_mutex/BUILD.gn +++ b/applications/app/TW005_OS_mutex/BUILD.gn @@ -1,3 +1,16 @@ +# Copyright (c) 2021 Talkweb Co.,ltd. +# Licensed 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. + static_library("mutex_example"){ sources =[ "os_mutex_example.c" diff --git a/applications/app/TW005_OS_mutex/README.md b/applications/app/TW005_OS_mutex/README.md index 0ee046d3..aede908e 100644 --- a/applications/app/TW005_OS_mutex/README.md +++ b/applications/app/TW005_OS_mutex/README.md @@ -1,7 +1,7 @@ # Niobe WiFi IoT开发板OpenHarmony内核编程开发——mutex 本示例将演示如何在Niobe WiFi IoT开发板上使用cmsis 2.0 接口进行互斥锁开发 -![Niobe](../../../figures/Niobe/niobe.png) +![Niobe](../../figures/niobe.png) ## mutex API分析 ## osThreadNew() @@ -156,7 +156,7 @@ void os_mutex_example(void) ### 修改 BUILD.gn 文件 -修改 `applications/app/`路径下 BUILD.gn 文件,指定 `mutex_example` 参与编译。 +修改 `applications/app`路径下 BUILD.gn 文件,指定 `mutex_example` 参与编译。 ```r #"TW001_OS_helloworld:helloworld_example", diff --git a/applications/app/TW005_OS_mutex/os_mutex_example.c b/applications/app/TW005_OS_mutex/os_mutex_example.c index 445a2b60..5d1074e7 100644 --- a/applications/app/TW005_OS_mutex/os_mutex_example.c +++ b/applications/app/TW005_OS_mutex/os_mutex_example.c @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2021 Talkweb Co., Ltd. + * Licensed 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. + */ + #include #include #include diff --git a/applications/app/TW006_OS_semp/os_semp_example.c b/applications/app/TW006_OS_semp/os_semp_example.c index 4878c164..577f6645 100644 --- a/applications/app/TW006_OS_semp/os_semp_example.c +++ b/applications/app/TW006_OS_semp/os_semp_example.c @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2021 Talkweb Co., Ltd. + * Licensed 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. + */ + #include #include #include diff --git a/applications/app/TW007_OS_message/README.md b/applications/app/TW007_OS_message/README.md index bdfc70ca..7af4647e 100644 --- a/applications/app/TW007_OS_message/README.md +++ b/applications/app/TW007_OS_message/README.md @@ -1,7 +1,7 @@ # Niobe WiFi IoT开发板OpenHarmony内核编程开发——message 本示例将演示如何在Niobe WiFi IoT开发板上使用cmsis 2.0 接口进行消息队列开发 -![Niobe](../../../figures/Niobe/niobe.png) +![Niobe](../../figures/niobe.png) ## message API分析 ## osThreadNew() @@ -92,7 +92,7 @@ osStatus_t osMessageQueueGet (osMessageQueueId_t mq_id,void *msg_ptr,uint8_t *ms 在Msg_example函数中,通过osThreadNew()函数创建了Thread_MsgQ1、Thread_MsgQ2两个线程,Thread_MsgQ1、Thread_MsgQ2两个线程启动后会输出打印日志。 ```c -void Thread_MsgQ1(void *arg) +void Thread_MsgQueue1(void *arg) { while (1) { @@ -136,15 +136,15 @@ static void Msg_example(void) attr.stack_size = 1024 * 10; attr.priority = 10; - attr.name = "Thread_MsgQ1"; - if (osThreadNew(Thread_MsgQ1, NULL, &attr) == NULL) + attr.name = "Thread_MsgQueue1"; + if (osThreadNew(Thread_MsgQueue1, NULL, &attr) == NULL) { - printf("create Thread_MsgQ1 failed!\n"); + printf("create Thread_MsgQueue1 failed!\n"); } - attr.name = "Thread_MsgQ2"; - if (osThreadNew(Thread_MsgQ2, NULL, &attr) == NULL) + attr.name = "Thread_MsgQueue2"; + if (osThreadNew(Thread_MsgQueue2, NULL, &attr) == NULL) { - printf("create Thread_MsgQ2 failed!\n"); + printf("create Thread_MsgQueue2 failed!\n"); } } diff --git a/applications/app/TW007_OS_message/os_message_example.c b/applications/app/TW007_OS_message/os_message_example.c index cf3ece91..f4cc4e9e 100644 --- a/applications/app/TW007_OS_message/os_message_example.c +++ b/applications/app/TW007_OS_message/os_message_example.c @@ -1,3 +1,17 @@ +/* + * Copyright (c) 2021 Talkweb Co., Ltd. + * Licensed 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. + */ #include #include #include @@ -13,7 +27,7 @@ static char *g_cmsisMessageInfo[] = {"msg1", "msg2", "msg3", "msg4", "msg5", "ms //message queue id osMessageQueueId_t MsgQueue; -void Thread_MsgQ1(void *arg) +void Thread_MsgQueue1(void *arg) { while (1) { @@ -57,15 +71,15 @@ static void Msg_example(void) attr.stack_size = 1024 * 10; attr.priority = 10; - attr.name = "Thread_MsgQ1"; - if (osThreadNew(Thread_MsgQ1, NULL, &attr) == NULL) + attr.name = "Thread_MsgQueue1"; + if (osThreadNew(Thread_MsgQueue1, NULL, &attr) == NULL) { - printf("create Thread_MsgQ1 failed!\n"); + printf("create Thread_MsgQueue1 failed!\n"); } - attr.name = "Thread_MsgQ2"; - if (osThreadNew(Thread_MsgQ2, NULL, &attr) == NULL) + attr.name = "Thread_MsgQueue2"; + if (osThreadNew(Thread_MsgQueue2, NULL, &attr) == NULL) { - printf("create Thread_MsgQ2 failed!\n"); + printf("create Thread_MsgQueue2 failed!\n"); } } diff --git a/applications/app/TW102_EXTI_key/BUILD.gn b/applications/app/TW102_EXTI_key/BUILD.gn index 97f3d75b..b4668393 100644 --- a/applications/app/TW102_EXTI_key/BUILD.gn +++ b/applications/app/TW102_EXTI_key/BUILD.gn @@ -1,3 +1,16 @@ +# Copyright (c) 2021 Talkweb Co., Ltd. +# Licensed 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. + static_library("exti_key_example"){ sources =[ "exti_example.c" diff --git a/applications/app/TW103_PWM_led/BUILD.gn b/applications/app/TW103_PWM_led/BUILD.gn index 0ad7e8f6..c819396b 100644 --- a/applications/app/TW103_PWM_led/BUILD.gn +++ b/applications/app/TW103_PWM_led/BUILD.gn @@ -1,3 +1,16 @@ +# Copyright (c) 2021 Talkweb Co., Ltd. +# Licensed 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. + static_library("pwm_led_example"){ sources =[ "pwm_led_example.c" diff --git a/applications/app/TW104_ADC_voltage/BUILD.gn b/applications/app/TW104_ADC_voltage/BUILD.gn index 0a13b1b5..f5262769 100644 --- a/applications/app/TW104_ADC_voltage/BUILD.gn +++ b/applications/app/TW104_ADC_voltage/BUILD.gn @@ -1,3 +1,16 @@ +# Copyright (c) 2021 Talkweb Co., Ltd. +# Licensed 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. + static_library("adc_voltage"){ sources =[ "adc_voltage.c" diff --git a/applications/app/TW105_I2C_sht30/BUILD.gn b/applications/app/TW105_I2C_sht30/BUILD.gn index f6931f9d..639ef9ab 100644 --- a/applications/app/TW105_I2C_sht30/BUILD.gn +++ b/applications/app/TW105_I2C_sht30/BUILD.gn @@ -1,3 +1,16 @@ +# Copyright (c) 2021 Talkweb Co., Ltd. +# Licensed 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. + static_library("i2c_sht30"){ sources =[ "i2c_sht30.c" diff --git a/applications/app/TW106_UART/BUILD.gn b/applications/app/TW106_UART/BUILD.gn index 3da1caea..88a9a456 100644 --- a/applications/app/TW106_UART/BUILD.gn +++ b/applications/app/TW106_UART/BUILD.gn @@ -1,3 +1,16 @@ +# Copyright (c) 2021 Talkweb Co., Ltd. +# Licensed 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. + static_library("uart_test"){ sources =[ "uart_test.c" diff --git a/applications/app/TW301_APP_oled/BUILD.gn b/applications/app/TW301_APP_oled/BUILD.gn index 8ff87047..ee9649e2 100644 --- a/applications/app/TW301_APP_oled/BUILD.gn +++ b/applications/app/TW301_APP_oled/BUILD.gn @@ -1,3 +1,16 @@ +# Copyright (c) 2021 Talkweb Co., Ltd. +# Licensed 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. + static_library("oled_demo"){ sources =[ "oled_demo.c" diff --git a/applications/app/TW301_APP_oled/oled_demo.c b/applications/app/TW301_APP_oled/oled_demo.c index d9e7b94b..1b7f5f34 100644 --- a/applications/app/TW301_APP_oled/oled_demo.c +++ b/applications/app/TW301_APP_oled/oled_demo.c @@ -1,3 +1,17 @@ +/* + * Copyright (c) 2021 Talkweb Co., Ltd. + * Licensed 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. + */ #include #include "stdio.h" #include "ohos_init.h" @@ -9,7 +23,6 @@ #include #include "oled_demo.h" #include "oledfont.h" -#include "led3_demo.h" #include u8 OLED_GRAM[144][8]; diff --git a/applications/app/TW301_APP_oled/oled_demo.h b/applications/app/TW301_APP_oled/oled_demo.h index 9f92156e..7193d9db 100644 --- a/applications/app/TW301_APP_oled/oled_demo.h +++ b/applications/app/TW301_APP_oled/oled_demo.h @@ -1,3 +1,17 @@ +/* + * Copyright (c) 2021 Talkweb Co., Ltd. + * Licensed 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. + */ #ifndef __OLED_H #define __OLED_H diff --git a/applications/docs/代码获取.md b/applications/docs/代码获取.md index f501d795..47ab85ad 100644 --- a/applications/docs/代码获取.md +++ b/applications/docs/代码获取.md @@ -28,15 +28,15 @@ https://gitee.com/mirrors/pyenv ``` -### 下载代码 +### 下载代码(二选一) -#### 使用git的下载方式 +#### 方式一: 使用git的下载方式 ``` git clone https://gitee.com/talkweb_oh/niobe.git ``` -#### 使用repo的下载方式 +#### 方式二: 使用repo的下载方式 ``` # 初始化 diff --git a/applications/docs/安装docker.md b/applications/docs/安装docker.md index bcedc31f..26acd6f9 100644 --- a/applications/docs/安装docker.md +++ b/applications/docs/安装docker.md @@ -98,15 +98,4 @@ docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-dock ``` docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker:0.0.5 -``` - -* 通过如下命令启动不同平台的编译 - -``` -hb set #设置工作目录。 -. #输入源码所在目录,点(.)表示当前目录。 -#在显示的页面中通过键盘上下键选择需要编译的平台,通过回车确定选择。 -#选择talkweb niobe开发板 -#编译release 版本 -hb build -b release -f #执行编译。 ``` \ No newline at end of file diff --git a/figures/Niobe/341d541732a8bb7b49afe4859720702.jpg b/applications/figures/341d541732a8bb7b49afe4859720702.jpg similarity index 100% rename from figures/Niobe/341d541732a8bb7b49afe4859720702.jpg rename to applications/figures/341d541732a8bb7b49afe4859720702.jpg diff --git a/figures/Niobe/6924eeb198d01b9918c2f6b7187898e.jpg b/applications/figures/6924eeb198d01b9918c2f6b7187898e.jpg similarity index 100% rename from figures/Niobe/6924eeb198d01b9918c2f6b7187898e.jpg rename to applications/figures/6924eeb198d01b9918c2f6b7187898e.jpg diff --git a/figures/Niobe/niobe.png b/applications/figures/niobe.png similarity index 100% rename from figures/Niobe/niobe.png rename to applications/figures/niobe.png diff --git a/figures/Niobe/全貌图.jpg b/applications/figures/全貌图.jpg similarity index 100% rename from figures/Niobe/全貌图.jpg rename to applications/figures/全貌图.jpg diff --git a/figures/Niobe/预售链接.png b/applications/figures/预售链接.png similarity index 100% rename from figures/Niobe/预售链接.png rename to applications/figures/预售链接.png