Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Q
QJ_500-7c
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
时昊
QJ_500-7c
Commits
9ac078a8
Commit
9ac078a8
authored
Jul 26, 2024
by
薛小虎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 添加蓝牙反初始化函数,OTA前卸载蓝牙。内部版本号升级
parent
99dd5a82
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
34 additions
and
3 deletions
+34
-3
Protocol_User.c
qianjiang/main/Protocol_User.c
+2
-1
gatts_table_creat_demo.c
qianjiang/main/gatts_table_creat_demo.c
+29
-0
gatts_table_creat_demo.h
qianjiang/main/gatts_table_creat_demo.h
+1
-0
main_user.h
qianjiang/main/main_user.h
+1
-1
QJ500-7C.bin
qianjiang/utility/QJ-5007C工程文件/WIFI升级用的文件/QJ500-7C.bin
+0
-0
QJ-70000PBS0002-ESP32-BootApp-S240726-240726.bin
...下载器下载的文件/QJ-70000PBS0002-ESP32-BootApp-S240726-240726.bin
+0
-0
文件说明.txt
qianjiang/utility/QJ-5007C工程文件/下载器下载的文件/文件说明.txt
+1
-1
软件变更记录_QJ-5007C.xlsx
qianjiang/utility/软件变更记录_QJ-5007C.xlsx
+0
-0
No files found.
qianjiang/main/Protocol_User.c
View file @
9ac078a8
...
...
@@ -271,8 +271,9 @@ static void Protocol_UartHandle(const Protocol_Data_t *pData)
// {
if
(
Wifi_OTA_Request
==
0
)
{
app_ble_stop
();
Wifi_OTA_Request
=
1
;
//
printf("get ota req! \r\n");
printf
(
"get ota req!
\r\n
"
);
}
// }
}
...
...
qianjiang/main/gatts_table_creat_demo.c
View file @
9ac078a8
...
...
@@ -132,6 +132,35 @@ void simple_ota_service(void)
int
app_ble_stop
(
void
)
{
esp_err_t
err
;
err
=
esp_bluedroid_disable
();
if
(
err
!=
ESP_OK
)
{
return
ESP_FAIL
;
}
err
=
esp_bluedroid_deinit
();
if
(
err
!=
ESP_OK
)
{
return
err
;
}
err
=
esp_bt_controller_disable
();
if
(
err
!=
ESP_OK
)
{
return
ESP_FAIL
;
}
/* The API `esp_bt_controller_deinit` will have to be removed when we add support for
* `reset to provisioning`
*/
err
=
esp_bt_controller_deinit
();
if
(
err
!=
ESP_OK
)
{
return
ESP_FAIL
;
}
return
ESP_OK
;
}
...
...
qianjiang/main/gatts_table_creat_demo.h
View file @
9ac078a8
...
...
@@ -80,4 +80,5 @@ extern uint8_t BT_Device_Name[14];
void
Get_Mac_Init
(
void
);
extern
int
bsp_Uart_Send_Data
(
uint8_t
*
data
,
unsigned
int
len
);
extern
uint8_t
BT_Device_Name
[
14
];
int
app_ble_stop
(
void
);
#endif
\ No newline at end of file
qianjiang/main/main_user.h
View file @
9ac078a8
...
...
@@ -3,7 +3,7 @@
#define BL_INTERNAL_SW_YEAR 24
#define BL_INTERNAL_SW_MONTH 7
#define BL_INTERNAL_SW_DAY 2
5
#define BL_INTERNAL_SW_DAY 2
6
#endif
\ No newline at end of file
qianjiang/utility/QJ-5007C工程文件/WIFI升级用的文件/QJ500-7C.bin
View file @
9ac078a8
No preview for this file type
qianjiang/utility/QJ-5007C工程文件/下载器下载的文件/QJ-70000PBS0002-ESP32-BootApp-S24072
5-240725
.bin
→
qianjiang/utility/QJ-5007C工程文件/下载器下载的文件/QJ-70000PBS0002-ESP32-BootApp-S24072
6-240726
.bin
View file @
9ac078a8
No preview for this file type
qianjiang/utility/QJ-5007C工程文件/下载器下载的文件/文件说明.txt
View file @
9ac078a8
bootloader.bin
ota_data_initial.bin
partition-table.bin
QJ-70000PBS0002-ESP32-BootApp-S
1.1-240711
.bin
QJ-70000PBS0002-ESP32-BootApp-S
240726-240726
.bin
是用下载器给仪表下载的工程文件;
qianjiang/utility/软件变更记录_QJ-5007C.xlsx
View file @
9ac078a8
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment