Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marek
firmware
Commits
dba22702
Commit
dba22702
authored
5 years ago
by
genofire
Committed by
schneider
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
ble: fix card10 svc uuid
parent
bf7824f7
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Documentation/bluetooth/card10.rst
+4
-4
4 additions, 4 deletions
Documentation/bluetooth/card10.rst
epicardium/ble/card10.c
+8
-7
8 additions, 7 deletions
epicardium/ble/card10.c
with
12 additions
and
11 deletions
Documentation/bluetooth/card10.rst
+
4
−
4
View file @
dba22702
...
...
@@ -13,21 +13,21 @@ The current draft uses following service specification:
- Service
UUID: ``
0000f0
00-2342-2342-2342-234223422342``
UUID: ``
422302
00-2342-2342-2342-234223422342``
- light sensor characteristic:
UUID: ``
0000f0
f0-2342-2342-2342-234223422342``
UUID: ``
422302
f0-2342-2342-2342-234223422342``
read
- Vibra characteristic:
UUID: ``
0000f1
0f-2342-2342-2342-234223422342``
UUID: ``
422302
0f-2342-2342-2342-234223422342``
write
- Rockets characteristic:
UUID: ``
0000f1
10-2342-2342-2342-234223422342``
UUID: ``
422302
10-2342-2342-2342-234223422342``
write
light sensor characteristic
...
...
This diff is collapsed.
Click to expand it.
epicardium/ble/card10.c
+
8
−
7
View file @
dba22702
...
...
@@ -24,6 +24,7 @@
#define CARD10_UUID_SUFFIX \
0x42, 0x23, 0x42, 0x23, 0x42, 0x23, 0x42, 0x23, 0x42, 0x23, 0x42, 0x23
#define CARD10_UUID_PREFIX 0x02, 0x23, 0x42
/*!< \brief Service start handle. */
#define CARD10_START_HDL 0x920
...
...
@@ -53,38 +54,38 @@ enum {
/* clang-format off */
/* BLE UUID for card10 service*/
static
const
uint8_t
UUID_svc
[]
=
{
CARD10_UUID_SUFFIX
,
0x0
,
0xf0
,
0x0
,
0x0
};
static
const
uint8_t
UUID_svc
[]
=
{
CARD10_UUID_SUFFIX
,
0x0
,
CARD10_UUID_PREFIX
};
/* BLE UUID for card10 char vibra */
static
const
uint8_t
UUID_char_vibra
[]
=
{
ATT_PROP_WRITE_NO_RSP
,
UINT16_TO_BYTES
(
CARD10_VIBRA_VAL_HDL
),
CARD10_UUID_SUFFIX
,
0xf
,
0xf1
,
0x0
,
0x0
CARD10_UUID_SUFFIX
,
0xf
,
CARD10_UUID_PREFIX
};
static
const
uint8_t
UUID_attChar_vibra
[]
=
{
CARD10_UUID_SUFFIX
,
0xf
,
0xf1
,
0x0
,
0x0
CARD10_UUID_SUFFIX
,
0xf
,
CARD10_UUID_PREFIX
};
/* BLE UUID for card10 char rockets */
static
const
uint8_t
UUID_char_rockets
[]
=
{
ATT_PROP_WRITE_NO_RSP
,
UINT16_TO_BYTES
(
CARD10_ROCKETS_VAL_HDL
),
CARD10_UUID_SUFFIX
,
0x10
,
0xf1
,
0x0
,
0x0
CARD10_UUID_SUFFIX
,
0x10
,
CARD10_UUID_PREFIX
};
static
const
uint8_t
UUID_attChar_rockets
[]
=
{
CARD10_UUID_SUFFIX
,
0x10
,
0xf1
,
0x0
,
0x0
CARD10_UUID_SUFFIX
,
0x10
,
CARD10_UUID_PREFIX
};
/* BLE UUID for card10 char light sensor */
static
const
uint8_t
UUID_char_light_sensor
[]
=
{
ATT_PROP_READ
,
UINT16_TO_BYTES
(
CARD10_LIGHT_SENSOR_VAL_HDL
),
CARD10_UUID_SUFFIX
,
0xf0
,
0xf0
,
0x0
,
0x0
CARD10_UUID_SUFFIX
,
0xf0
,
CARD10_UUID_PREFIX
};
static
const
uint8_t
UUID_attChar_light_sensor
[]
=
{
CARD10_UUID_SUFFIX
,
0xf0
,
0xf0
,
0x0
,
0x0
CARD10_UUID_SUFFIX
,
0xf0
,
CARD10_UUID_PREFIX
};
/* clang-format on */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment