Skip to content

Commit

Permalink
update v2.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] committed Apr 7, 2024
1 parent 393d637 commit 9711470
Show file tree
Hide file tree
Showing 526 changed files with 19,429 additions and 2,721 deletions.
1,351 changes: 694 additions & 657 deletions .vscode/c_cpp_properties.json

Large diffs are not rendered by default.

216 changes: 108 additions & 108 deletions .vscode/tasks.json

Large diffs are not rendered by default.

158 changes: 79 additions & 79 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,137 +6,137 @@
# 3. 确认 ulimit -n 的结果足够大(建议大于8096),否则链接可能会因为打开文件太多而失败
# 可以通过 ulimit -n 8096 来设置一个较大的值
# 支持的目标
# make ac638n_spp_and_le
# make ac632n_spp_and_le
# make ac631n_spp_and_le
# make ac636n_spp_and_le
# make ac637n_spp_and_le
# make ac635n_spp_and_le
# make ac638n_hid
# make ac632n_hid
# make ac631n_hid
# make ac638n_hid
# make ac635n_hid
# make ac637n_hid
# make ac636n_hid
# make ac637n_hid
# make ac635n_hid
# make ac638n_mesh
# make ac632n_mesh
# make ac631n_mesh
# make ac638n_mesh
# make ac635n_mesh
# make ac637n_mesh
# make ac636n_mesh
# make ac632n_spp_and_le
# make ac631n_spp_and_le
# make ac638n_spp_and_le
# make ac635n_spp_and_le
# make ac637n_spp_and_le
# make ac636n_spp_and_le
# make ac637n_mesh
# make ac635n_mesh

.PHONY: all clean ac632n_hid ac631n_hid ac638n_hid ac635n_hid ac637n_hid ac636n_hid ac632n_mesh ac631n_mesh ac638n_mesh ac635n_mesh ac637n_mesh ac636n_mesh ac632n_spp_and_le ac631n_spp_and_le ac638n_spp_and_le ac635n_spp_and_le ac637n_spp_and_le ac636n_spp_and_le clean_ac632n_hid clean_ac631n_hid clean_ac638n_hid clean_ac635n_hid clean_ac637n_hid clean_ac636n_hid clean_ac632n_mesh clean_ac631n_mesh clean_ac638n_mesh clean_ac635n_mesh clean_ac637n_mesh clean_ac636n_mesh clean_ac632n_spp_and_le clean_ac631n_spp_and_le clean_ac638n_spp_and_le clean_ac635n_spp_and_le clean_ac637n_spp_and_le clean_ac636n_spp_and_le
.PHONY: all clean ac638n_spp_and_le ac632n_spp_and_le ac631n_spp_and_le ac636n_spp_and_le ac637n_spp_and_le ac635n_spp_and_le ac638n_hid ac632n_hid ac631n_hid ac636n_hid ac637n_hid ac635n_hid ac638n_mesh ac632n_mesh ac631n_mesh ac636n_mesh ac637n_mesh ac635n_mesh clean_ac638n_spp_and_le clean_ac632n_spp_and_le clean_ac631n_spp_and_le clean_ac636n_spp_and_le clean_ac637n_spp_and_le clean_ac635n_spp_and_le clean_ac638n_hid clean_ac632n_hid clean_ac631n_hid clean_ac636n_hid clean_ac637n_hid clean_ac635n_hid clean_ac638n_mesh clean_ac632n_mesh clean_ac631n_mesh clean_ac636n_mesh clean_ac637n_mesh clean_ac635n_mesh

all: ac632n_hid ac631n_hid ac638n_hid ac635n_hid ac637n_hid ac636n_hid ac632n_mesh ac631n_mesh ac638n_mesh ac635n_mesh ac637n_mesh ac636n_mesh ac632n_spp_and_le ac631n_spp_and_le ac638n_spp_and_le ac635n_spp_and_le ac637n_spp_and_le ac636n_spp_and_le
all: ac638n_spp_and_le ac632n_spp_and_le ac631n_spp_and_le ac636n_spp_and_le ac637n_spp_and_le ac635n_spp_and_le ac638n_hid ac632n_hid ac631n_hid ac636n_hid ac637n_hid ac635n_hid ac638n_mesh ac632n_mesh ac631n_mesh ac636n_mesh ac637n_mesh ac635n_mesh
@echo +ALL DONE

clean: clean_ac632n_hid clean_ac631n_hid clean_ac638n_hid clean_ac635n_hid clean_ac637n_hid clean_ac636n_hid clean_ac632n_mesh clean_ac631n_mesh clean_ac638n_mesh clean_ac635n_mesh clean_ac637n_mesh clean_ac636n_mesh clean_ac632n_spp_and_le clean_ac631n_spp_and_le clean_ac638n_spp_and_le clean_ac635n_spp_and_le clean_ac637n_spp_and_le clean_ac636n_spp_and_le
clean: clean_ac638n_spp_and_le clean_ac632n_spp_and_le clean_ac631n_spp_and_le clean_ac636n_spp_and_le clean_ac637n_spp_and_le clean_ac635n_spp_and_le clean_ac638n_hid clean_ac632n_hid clean_ac631n_hid clean_ac636n_hid clean_ac637n_hid clean_ac635n_hid clean_ac638n_mesh clean_ac632n_mesh clean_ac631n_mesh clean_ac636n_mesh clean_ac637n_mesh clean_ac635n_mesh
@echo +CLEAN DONE

ac632n_hid:
$(MAKE) -C apps/hid/board/bd19 -f Makefile
ac638n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br34 -f Makefile

clean_ac632n_hid:
$(MAKE) -C apps/hid/board/bd19 -f Makefile clean
clean_ac638n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br34 -f Makefile clean

ac631n_hid:
$(MAKE) -C apps/hid/board/bd29 -f Makefile
ac632n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/bd19 -f Makefile

clean_ac631n_hid:
$(MAKE) -C apps/hid/board/bd29 -f Makefile clean
clean_ac632n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/bd19 -f Makefile clean

ac631n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/bd29 -f Makefile

clean_ac631n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/bd29 -f Makefile clean

ac636n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br25 -f Makefile

clean_ac636n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br25 -f Makefile clean

ac637n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br30 -f Makefile

clean_ac637n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br30 -f Makefile clean

ac635n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br23 -f Makefile

clean_ac635n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br23 -f Makefile clean

ac638n_hid:
$(MAKE) -C apps/hid/board/br34 -f Makefile

clean_ac638n_hid:
$(MAKE) -C apps/hid/board/br34 -f Makefile clean

ac635n_hid:
$(MAKE) -C apps/hid/board/br23 -f Makefile
ac632n_hid:
$(MAKE) -C apps/hid/board/bd19 -f Makefile

clean_ac635n_hid:
$(MAKE) -C apps/hid/board/br23 -f Makefile clean
clean_ac632n_hid:
$(MAKE) -C apps/hid/board/bd19 -f Makefile clean

ac637n_hid:
$(MAKE) -C apps/hid/board/br30 -f Makefile
ac631n_hid:
$(MAKE) -C apps/hid/board/bd29 -f Makefile

clean_ac637n_hid:
$(MAKE) -C apps/hid/board/br30 -f Makefile clean
clean_ac631n_hid:
$(MAKE) -C apps/hid/board/bd29 -f Makefile clean

ac636n_hid:
$(MAKE) -C apps/hid/board/br25 -f Makefile

clean_ac636n_hid:
$(MAKE) -C apps/hid/board/br25 -f Makefile clean

ac632n_mesh:
$(MAKE) -C apps/mesh/board/bd19 -f Makefile
ac637n_hid:
$(MAKE) -C apps/hid/board/br30 -f Makefile

clean_ac632n_mesh:
$(MAKE) -C apps/mesh/board/bd19 -f Makefile clean
clean_ac637n_hid:
$(MAKE) -C apps/hid/board/br30 -f Makefile clean

ac631n_mesh:
$(MAKE) -C apps/mesh/board/bd29 -f Makefile
ac635n_hid:
$(MAKE) -C apps/hid/board/br23 -f Makefile

clean_ac631n_mesh:
$(MAKE) -C apps/mesh/board/bd29 -f Makefile clean
clean_ac635n_hid:
$(MAKE) -C apps/hid/board/br23 -f Makefile clean

ac638n_mesh:
$(MAKE) -C apps/mesh/board/br34 -f Makefile

clean_ac638n_mesh:
$(MAKE) -C apps/mesh/board/br34 -f Makefile clean

ac635n_mesh:
$(MAKE) -C apps/mesh/board/br23 -f Makefile
ac632n_mesh:
$(MAKE) -C apps/mesh/board/bd19 -f Makefile

clean_ac635n_mesh:
$(MAKE) -C apps/mesh/board/br23 -f Makefile clean
clean_ac632n_mesh:
$(MAKE) -C apps/mesh/board/bd19 -f Makefile clean

ac637n_mesh:
$(MAKE) -C apps/mesh/board/br30 -f Makefile
ac631n_mesh:
$(MAKE) -C apps/mesh/board/bd29 -f Makefile

clean_ac637n_mesh:
$(MAKE) -C apps/mesh/board/br30 -f Makefile clean
clean_ac631n_mesh:
$(MAKE) -C apps/mesh/board/bd29 -f Makefile clean

ac636n_mesh:
$(MAKE) -C apps/mesh/board/br25 -f Makefile

clean_ac636n_mesh:
$(MAKE) -C apps/mesh/board/br25 -f Makefile clean

ac632n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/bd19 -f Makefile

clean_ac632n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/bd19 -f Makefile clean

ac631n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/bd29 -f Makefile

clean_ac631n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/bd29 -f Makefile clean

ac638n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br34 -f Makefile

clean_ac638n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br34 -f Makefile clean

ac635n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br23 -f Makefile

clean_ac635n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br23 -f Makefile clean

ac637n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br30 -f Makefile
ac637n_mesh:
$(MAKE) -C apps/mesh/board/br30 -f Makefile

clean_ac637n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br30 -f Makefile clean
clean_ac637n_mesh:
$(MAKE) -C apps/mesh/board/br30 -f Makefile clean

ac636n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br25 -f Makefile
ac635n_mesh:
$(MAKE) -C apps/mesh/board/br23 -f Makefile

clean_ac636n_spp_and_le:
$(MAKE) -C apps/spp_and_le/board/br25 -f Makefile clean
clean_ac635n_mesh:
$(MAKE) -C apps/mesh/board/br23 -f Makefile clean
14 changes: 11 additions & 3 deletions README-en.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# fw-AC63_BT_SDK

[tag download]:https://github.com/Jieli-Tech/fw-AC63_BT_SDK/tags
[tag_badgen]:https://img.shields.io/github/v/tag/Jieli-Tech/fw-AC63_BT_SDK?style=plastic&logo=bluetooth&labelColor=ffffff&color=informational&label=Tag&logoColor=blue

# fw-AC63_BT_SDK [![tag][tag_badgen]][tag download]

[中文](./README.md) | EN

Expand Down Expand Up @@ -42,12 +46,14 @@ Build
-------------
Select a project to build. The following folders contains buildable projects:

* APP_Bluetooth : [SPP_LE](./apps/spp_and_le), usage: data transfer, centeral devices, boardcast devices, beacon, multi-link, Dongle(usb / bt). [document](https://doc.zh-jieli.com/AC63/zh-cn/master/module_demo/spple/index.html)
* APP_Bluetooth : [SPP_LE](./apps/spp_and_le), usage: data transfer, centeral devices, boardcast devices, beacon, FindMy, multi-link, Dongle(usb / bt). [document](https://doc.zh-jieli.com/AC63/zh-cn/master/module_demo/spple/index.html)

* APP_Bluetooth : [HID](./apps/hid), usage: remote control, keyboard, mouse, game box, Voice remote control. [document](https://doc.zh-jieli.com/AC63/zh-cn/master/module_demo/hid/index.html)

* APP_Bluetooth : [Mesh](./apps/mesh), usage: Mesh nodes. [document](https://doc.zh-jieli.com/AC63/zh-cn/master/module_demo/mesh/index.html)

See Tags for the released versions.

Comming Soon:

* APP_Bluetooth :`IoT (ipv6 / 6lowpan)`
Expand All @@ -67,12 +73,14 @@ SDK support Codeblock & Make to build to project,make sure you already setup the
Certification
-------------

Bluetooth Classic LMP /LE Link Layer protocol stack implementing Bluetooth 5.0/5.1 specification
Bluetooth Classic LMP /LE Link Layer protocol stack implementing Bluetooth 5.0/5.1/5.4 specification

* Core v5.0 [QDID 134104](https://launchstudio.bluetooth.com/ListingDetails/88799)

* Core v5.1 [QDID 136145](https://launchstudio.bluetooth.com/ListingDetails/91371)

* Core v5.4 [QDID 222830](https://launchstudio.bluetooth.com/ListingDetails/193923)


Hardware
-------------
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ AC63 系列通用蓝牙SDK 固件程序
-------------
请选择以下一个工程进行编译,下列目录包含了便于开发的工程文件:

* 蓝牙应用 : [SPP_LE](./apps/spp_and_le), 适用领域:透传, 数传, 扫描设备, 广播设备, 信标, 多机连接. Dongle(usb / bt). [文档链接](https://doc.zh-jieli.com/AC63/zh-cn/master/module_demo/spple/index.html)
* 蓝牙应用 : [SPP_LE](./apps/spp_and_le), 适用领域:透传, 数传, 扫描设备, 广播设备, 信标, FindMy应用, 多机连接. Dongle(usb / bt). [文档链接](https://doc.zh-jieli.com/AC63/zh-cn/master/module_demo/spple/index.html)

* 蓝牙应用 : [HID](./apps/hid), 适用领域:遥控器, 自拍器, 键盘, 鼠标, 吃鸡王座, 语音遥控器. [文档链接](https://doc.zh-jieli.com/AC63/zh-cn/master/module_demo/hid/index.html)

* 蓝牙应用 : [Mesh](./apps/mesh), 适用领域:物联网节点, 天猫精灵接入, 自组网应用. [文档链接](https://doc.zh-jieli.com/AC63/zh-cn/master/module_demo/mesh/index.html)

已发布版本详见 标签(Tags)。

即将发布:

* 蓝牙应用 :`IoT (ipv6 / 6lowpan)`
Expand All @@ -68,12 +70,14 @@ SDK 同时支持Codeblock 和 Make 编译环境,请确保编译前已经搭建
蓝牙官方认证
-------------

经典蓝牙LMP / 低功耗蓝牙Link Layer 层和Host 协议栈均支持蓝牙5.0 和 5.1版本实现
经典蓝牙LMP / 低功耗蓝牙Link Layer 层和Host 协议栈均支持蓝牙5.0 、5.1和5.4版本实现

* Core v5.0 [QDID 134104](https://launchstudio.bluetooth.com/ListingDetails/88799)

* Core v5.1 [QDID 136145](https://launchstudio.bluetooth.com/ListingDetails/91371)

* Core v5.4 [QDID 222830](https://launchstudio.bluetooth.com/ListingDetails/193923)


硬件环境
-------------
Expand Down
4 changes: 2 additions & 2 deletions apps/common/code_switch/code_switch.c
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@ void code_switch_init(SW_PLATFORM_DATA *priv)
/* JL_IOMAP->CON1 &= ~BIT(12); //RDES_IOSO = PB4 */
/* JL_IOMAP->CON1 &= ~BIT(13); //RDES_IOS1 = PB5 */

JL_IOMAP->CON1 |= BIT(12);
JL_IOMAP->CON1 |= BIT(13);
/* JL_IOMAP->CON1 |= BIT(12); */
/* JL_IOMAP->CON1 |= BIT(13); */

/* INPUT_CHANNLE6_SRC_SEL(sw_pdata->a_phase_io); */
/* INPUT_CHANNLE7_SRC_SEL(sw_pdata->b_phase_io); */
Expand Down
22 changes: 22 additions & 0 deletions apps/common/device/gSensor/fmy/Motion_api.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#ifndef MOTION_API_H
#define MOTION_API_H

#define GSENSOR_PRINTF_ENABLE 0//contrl debug printf

int get_DetectionBuf(int fs);
void init_MotionDet(void *ptr, short fs, float thread);
char run_MotionDetection(void *ptr, int len, short *data);

#if WIN32
#else
extern inline float add_float(float x, float y);
extern inline float sub_float(float x, float y);
extern inline float mul_float(float x, float y);
extern inline float div_float(float x, float y);
extern inline float complex_abs_float(float x, float y);
#endif


#endif // !MOTION_API_H


Loading

0 comments on commit 9711470

Please sign in to comment.