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
coon
firmware
Commits
956c9c91
Commit
956c9c91
authored
5 years ago
by
rahix
Browse files
Options
Downloads
Plain Diff
Merge 'BLE cleanups and security updates'
See merge request
card10/firmware!244
parents
53297345
31ef150a
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
epicardium/ble/card10.c
+224
-180
224 additions, 180 deletions
epicardium/ble/card10.c
epicardium/ble/filetransfer.c
+7
-4
7 additions, 4 deletions
epicardium/ble/filetransfer.c
epicardium/ble/uart.c
+78
-63
78 additions, 63 deletions
epicardium/ble/uart.c
with
309 additions
and
247 deletions
epicardium/ble/card10.c
+
224
−
180
View file @
956c9c91
...
...
@@ -256,228 +256,272 @@ static uint16_t initLightSensorLen = sizeof(initLightSensorValue);
*/
static
const
attsAttr_t
card10SvcAttrList
[]
=
{
{
.
pUuid
=
attPrimSvcUuid
,
{
.
pUuid
=
attPrimSvcUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_svc
,
.
pLen
=
(
uint16_t
*
)
&
UUID_len
,
.
maxLen
=
sizeof
(
UUID_svc
),
.
permissions
=
ATTS_PERMIT_READ
},
.
permissions
=
ATTS_PERMIT_READ
,
},
// TIME
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_time
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_time
),
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_time
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_time
,
.
pValue
=
timeValue
,
.
pLen
=
&
timeLen
,
.
maxLen
=
sizeof
(
uint64_t
),
.
settings
=
(
ATTS_SET_WRITE_CBACK
|
ATTS_SET_READ_CBACK
),
.
permissions
=
(
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
.
settings
=
ATTS_SET_WRITE_CBACK
|
ATTS_SET_READ_CBACK
,
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_AUTH
|
ATTS_PERMIT_READ
|
ATTS_PERMIT_READ_ENC
|
ATTS_PERMIT_READ_AUTH
)
},
ATTS_PERMIT_READ_ENC
|
ATTS_PERMIT_READ_AUTH
,
},
// VIBRA
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_vibra
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_vibra
),
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_vibra
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_vibra
,
.
pValue
=
NULL
,
.
maxLen
=
sizeof
(
uint16_t
),
.
settings
=
ATTS_SET_WRITE_CBACK
,
.
permissions
=
(
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_
ENC
|
ATTS_PERMIT_WRITE_AUTH
)
},
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_
AUTH
,
},
// ROCKETS
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_rockets
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_rockets
),
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_rockets
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_rockets
,
.
pValue
=
NULL
,
.
maxLen
=
3
*
sizeof
(
uint8_t
),
.
settings
=
ATTS_SET_WRITE_CBACK
,
.
permissions
=
(
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_
ENC
|
ATTS_PERMIT_WRITE_AUTH
)
},
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_
AUTH
,
},
// BG LED Bottom left
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_led_bg_bottom_left
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_led_bg_bottom_left
),
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_led_bg_bottom_left
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_led_bg_bottom_left
,
.
pValue
=
NULL
,
.
maxLen
=
3
*
sizeof
(
uint8_t
),
.
settings
=
ATTS_SET_WRITE_CBACK
,
.
permissions
=
(
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_
ENC
|
ATTS_PERMIT_WRITE_AUTH
)
},
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_
AUTH
,
},
// BG LED Bottom right
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_led_bg_bottom_right
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_led_bg_bottom_right
),
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_led_bg_bottom_right
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_led_bg_bottom_right
,
.
pValue
=
NULL
,
.
maxLen
=
3
*
sizeof
(
uint8_t
),
.
settings
=
ATTS_SET_WRITE_CBACK
,
.
permissions
=
(
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_
ENC
|
ATTS_PERMIT_WRITE_AUTH
)
},
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_
AUTH
,
},
// BG LED top right
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_led_bg_top_right
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_led_bg_top_right
),
.
settings
=
0
,
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_led_bg_top_right
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_led_bg_top_right
,
.
pValue
=
NULL
,
.
maxLen
=
3
*
sizeof
(
uint8_t
),
.
settings
=
ATTS_SET_WRITE_CBACK
,
.
permissions
=
(
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_
ENC
|
ATTS_PERMIT_WRITE_AUTH
)
},
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_
AUTH
,
},
// BG LED top left
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_led_bg_top_left
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_led_bg_top_left
),
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_led_bg_top_left
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_led_bg_top_left
,
.
pValue
=
NULL
,
.
maxLen
=
3
*
sizeof
(
uint8_t
),
.
settings
=
ATTS_SET_WRITE_CBACK
,
.
permissions
=
(
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_
ENC
|
ATTS_PERMIT_WRITE_AUTH
)
},
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_
AUTH
,
},
// Dim bottom module
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_leds_bottom_dim
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_leds_bottom_dim
),
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_leds_bottom_dim
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_leds_bottom_dim
,
.
pValue
=
NULL
,
.
pLen
=
0
,
.
maxLen
=
sizeof
(
uint8_t
),
.
settings
=
ATTS_SET_WRITE_CBACK
,
.
permissions
=
(
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_
ENC
|
ATTS_PERMIT_WRITE_AUTH
)
},
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_
AUTH
,
},
// Dim top module
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_leds_top_dim
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_leds_top_dim
),
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_leds_top_dim
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_leds_top_dim
,
.
pValue
=
NULL
,
.
maxLen
=
sizeof
(
uint8_t
),
.
settings
=
ATTS_SET_WRITE_CBACK
,
.
permissions
=
(
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_
ENC
|
ATTS_PERMIT_WRITE_AUTH
)
},
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_
AUTH
,
},
// led powersafe
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_led_powersafe
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_led_powersafe
),
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_led_powersafe
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_led_powersafe
,
.
pValue
=
NULL
,
.
maxLen
=
sizeof
(
uint8_t
),
.
settings
=
ATTS_SET_WRITE_CBACK
,
.
permissions
=
(
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_
ENC
|
ATTS_PERMIT_WRITE_AUTH
)
},
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_
AUTH
,
},
// flashlight
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_flashlight
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_flashlight
),
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_flashlight
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_flashlight
,
.
pValue
=
NULL
,
.
maxLen
=
sizeof
(
uint8_t
),
.
settings
=
ATTS_SET_WRITE_CBACK
,
.
permissions
=
(
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_
ENC
|
ATTS_PERMIT_WRITE_AUTH
)
},
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_
AUTH
,
},
// personal state
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_personal_state
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_personal_state
),
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_personal_state
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_personal_state
,
.
pValue
=
&
personalStateValue
,
.
pLen
=
&
personalStateLen
,
.
maxLen
=
sizeof
(
uint16_t
),
.
settings
=
(
ATTS_SET_WRITE_CBACK
|
ATTS_SET_READ_CBACK
),
.
permissions
=
(
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
.
settings
=
ATTS_SET_WRITE_CBACK
|
ATTS_SET_READ_CBACK
,
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_AUTH
|
ATTS_PERMIT_READ
|
ATTS_PERMIT_READ_ENC
|
ATTS_PERMIT_READ_AUTH
)
},
ATTS_PERMIT_READ_ENC
|
ATTS_PERMIT_READ_AUTH
,
},
// ABOVE LEDS
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_leds_above
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_leds_above
),
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_leds_above
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_leds_above
,
.
pValue
=
NULL
,
.
maxLen
=
11
*
3
*
sizeof
(
uint8_t
),
.
settings
=
ATTS_SET_WRITE_CBACK
,
.
permissions
=
(
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_
ENC
|
ATTS_PERMIT_WRITE_AUTH
)
},
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_
AUTH
,
},
// Light sensor
{
.
pUuid
=
attChUuid
,
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
UUID_char_light_sensor
,
.
pLen
=
(
uint16_t
*
)
&
UUID_char_len
,
.
maxLen
=
sizeof
(
UUID_char_light_sensor
),
.
permissions
=
ATTS_PERMIT_READ
},
{
.
pUuid
=
UUID_attChar_light_sensor
,
.
permissions
=
ATTS_PERMIT_READ
,
},
{
.
pUuid
=
UUID_attChar_light_sensor
,
.
pValue
=
initLightSensorValue
,
.
pLen
=
&
initLightSensorLen
,
.
maxLen
=
sizeof
(
uint8_t
),
.
settings
=
ATTS_SET_READ_CBACK
,
.
permissions
=
(
ATTS_PERMIT_READ
|
ATTS_PERMIT_READ_
ENC
|
ATTS_PERMIT_READ_AUTH
)
},
.
permissions
=
ATTS_PERMIT_READ
|
ATTS_PERMIT_READ_ENC
|
ATTS_PERMIT_READ_
AUTH
,
},
};
// validating, that the service really get all charateristics
...
...
This diff is collapsed.
Click to expand it.
epicardium/ble/filetransfer.c
+
7
−
4
View file @
956c9c91
...
...
@@ -143,7 +143,8 @@ static const attsAttr_t fileTransCfgList[] = {
.
pLen
=
NULL
,
.
maxLen
=
128
,
.
settings
=
ATTS_SET_WRITE_CBACK
|
ATTS_SET_VARIABLE_LEN
,
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_AUTH
,
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_AUTH
,
},
/* File transfer Central RX characteristic */
{
...
...
@@ -161,7 +162,8 @@ static const attsAttr_t fileTransCfgList[] = {
.
pLen
=
&
attRxChConfigValue_len
,
.
maxLen
=
sizeof
(
attRxChConfigValue
),
.
settings
=
ATTS_SET_VARIABLE_LEN
,
.
permissions
=
ATTS_PERMIT_READ
|
ATTS_PERMIT_READ_AUTH
,
.
permissions
=
ATTS_PERMIT_READ
|
ATTS_PERMIT_READ_ENC
|
ATTS_PERMIT_READ_AUTH
,
},
/* File transfer Central RX notification channel */
{
...
...
@@ -170,8 +172,9 @@ static const attsAttr_t fileTransCfgList[] = {
.
pLen
=
&
attRxChConfigValue_len
,
.
maxLen
=
sizeof
(
attRxChConfigValue
),
.
settings
=
ATTS_SET_CCC
,
.
permissions
=
ATTS_PERMIT_READ
|
ATTS_PERMIT_READ_AUTH
|
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_AUTH
,
.
permissions
=
ATTS_PERMIT_READ
|
ATTS_PERMIT_READ_ENC
|
ATTS_PERMIT_READ_AUTH
|
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_AUTH
,
},
};
...
...
This diff is collapsed.
Click to expand it.
epicardium/ble/uart.c
+
78
−
63
View file @
956c9c91
...
...
@@ -31,66 +31,84 @@ enum { UART_SVC_HDL = UART_START_HDL, /*!< \brief UART service declaration */
/* clang-format off */
static
const
uint8_t
UARTSvc
[]
=
{
0x9E
,
0xCA
,
0xDC
,
0x24
,
0x0E
,
0xE5
,
0xA9
,
0xE0
,
0x93
,
0xF3
,
0xA3
,
0xB5
,
0x01
,
0x00
,
0x40
,
0x6E
};
static
const
uint16_t
UARTSvc_len
=
sizeof
(
UARTSvc
);
static
const
uint8_t
uartRxCh
[]
=
{
ATT_PROP_WRITE
,
UINT16_TO_BYTES
(
UART_RX_HDL
),
0x9E
,
0xCA
,
0xDC
,
0x24
,
0x0E
,
0xE5
,
0xA9
,
0xE0
,
0x93
,
0xF3
,
0xA3
,
0xB5
,
0x02
,
0x00
,
0x40
,
0x6E
};
const
uint8_t
attUartRxChUuid
[]
=
{
0x9E
,
0xCA
,
0xDC
,
0x24
,
0x0E
,
0xE5
,
0xA9
,
0xE0
,
0x93
,
0xF3
,
0xA3
,
0xB5
,
0x02
,
0x00
,
0x40
,
0x6E
};
static
const
uint16_t
uartRxCh_len
=
sizeof
(
uartRxCh
);
static
const
uint8_t
attUartRxChUuid
[]
=
{
0x9E
,
0xCA
,
0xDC
,
0x24
,
0x0E
,
0xE5
,
0xA9
,
0xE0
,
0x93
,
0xF3
,
0xA3
,
0xB5
,
0x02
,
0x00
,
0x40
,
0x6E
};
static
const
uint8_t
uartTxCh
[]
=
{
ATT_PROP_READ
|
ATT_PROP_NOTIFY
,
UINT16_TO_BYTES
(
UART_TX_HDL
),
0x9E
,
0xCA
,
0xDC
,
0x24
,
0x0E
,
0xE5
,
0xA9
,
0xE0
,
0x93
,
0xF3
,
0xA3
,
0xB5
,
0x03
,
0x00
,
0x40
,
0x6E
};
const
uint8_t
attUartTxChUuid
[]
=
{
0x9E
,
0xCA
,
0xDC
,
0x24
,
0x0E
,
0xE5
,
0xA9
,
0xE0
,
0x93
,
0xF3
,
0xA3
,
0xB5
,
0x03
,
0x00
,
0x40
,
0x6E
};
/* clang-format on */
static
void
*
SvcUARTAddGroupDyn
(
void
)
{
void
*
pSHdl
;
uint8_t
initCcc
[]
=
{
UINT16_TO_BYTES
(
0x0000
)
};
static
const
uint16_t
uartTxCh_len
=
sizeof
(
uartTxCh
);
static
const
uint8_t
attUartTxChUuid
[]
=
{
0x9E
,
0xCA
,
0xDC
,
0x24
,
0x0E
,
0xE5
,
0xA9
,
0xE0
,
0x93
,
0xF3
,
0xA3
,
0xB5
,
0x03
,
0x00
,
0x40
,
0x6E
};
/* Create the service */
pSHdl
=
AttsDynCreateGroup
(
UART_START_HDL
,
UART_END_HDL
);
static
uint8_t
ble_uart_tx_buf
[
128
];
static
uint16_t
ble_uart_buf_tx_fill
=
0
;
/* clang-format on */
if
(
pSHdl
!=
NULL
)
{
/* clang-format off */
/* Attribute list for uriCfg group */
static
const
attsAttr_t
uartAttrCfgList
[]
=
{
/* Primary service */
AttsDynAddAttrConst
(
pSHdl
,
attPrimSvcUuid
,
UARTSvc
,
sizeof
(
UARTSvc
),
0
,
ATTS_PERMIT_READ
);
{
.
pUuid
=
attPrimSvcUuid
,
.
pValue
=
(
uint8_t
*
)
UARTSvc
,
.
pLen
=
(
uint16_t
*
)
&
UARTSvc_len
,
.
maxLen
=
sizeof
(
UARTSvc
),
.
settings
=
0
,
.
permissions
=
ATTS_PERMIT_READ
,
},
/* UART rx characteristic */
AttsDynAddAttrConst
(
pSHdl
,
attChUuid
,
uartRxCh
,
sizeof
(
uartRxCh
),
0
,
ATTS_PERMIT_READ
);
// XXX: attUartRxChUuid is 16 bytes but nothing says so....
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
uartRxCh
,
.
pLen
=
(
uint16_t
*
)
&
uartRxCh_len
,
.
maxLen
=
sizeof
(
uartRxCh
),
.
settings
=
0
,
.
permissions
=
ATTS_PERMIT_READ
,
},
/* UART rx value */
// XXX: not sure if max value of 128 is fine...
AttsDynAddAttr
(
pSHdl
,
attUartRxChUuid
,
NULL
,
0
,
128
,
ATTS_SET_WRITE_CBACK
|
ATTS_SET_VARIABLE_LEN
,
ATTS_PERMIT_WRITE
);
{
.
pUuid
=
attUartRxChUuid
,
.
pValue
=
NULL
,
.
pLen
=
NULL
,
.
maxLen
=
128
,
.
settings
=
ATTS_SET_WRITE_CBACK
|
ATTS_SET_VARIABLE_LEN
,
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_AUTH
,
},
/* UART tx characteristic */
AttsDynAddAttrConst
(
pSHdl
,
attChUuid
,
uartTxCh
,
sizeof
(
uartTxCh
),
0
,
ATTS_PERMIT_READ
);
{
.
pUuid
=
attChUuid
,
.
pValue
=
(
uint8_t
*
)
uartTxCh
,
.
pLen
=
(
uint16_t
*
)
&
uartTxCh_len
,
.
maxLen
=
sizeof
(
uartTxCh
),
.
settings
=
0
,
.
permissions
=
ATTS_PERMIT_READ
,
},
/* UART tx value */
/* TODO: do we need ATTS_SET_READ_CBACK ? */
AttsDynAddAttr
(
pSHdl
,
attUartTxChUuid
,
NULL
,
0
,
sizeof
(
uint8_t
),
ATTS_SET_READ_CBACK
,
ATTS_PERMIT_READ
);
{
.
pUuid
=
attUartTxChUuid
,
.
pValue
=
ble_uart_tx_buf
,
.
pLen
=
&
ble_uart_buf_tx_fill
,
.
maxLen
=
sizeof
(
ble_uart_tx_buf
),
.
settings
=
0
,
.
permissions
=
ATTS_PERMIT_READ
|
ATTS_PERMIT_READ_ENC
|
ATTS_PERMIT_READ_AUTH
,
},
/* UART tx CCC descriptor */
AttsDynAddAttr
(
pSHdl
,
attCliChCfgUuid
,
initCcc
,
sizeof
(
uint16_t
),
sizeof
(
uint16_t
),
ATTS_SET_CCC
,
ATTS_PERMIT_READ
|
ATTS_PERMIT_WRITE
);
/* clang-format on */
}
return
pSHdl
;
}
{
.
pUuid
=
attCliChCfgUuid
,
.
pValue
=
NULL
,
.
pLen
=
NULL
,
.
maxLen
=
0
,
.
settings
=
ATTS_SET_CCC
,
.
permissions
=
ATTS_PERMIT_WRITE
|
ATTS_PERMIT_WRITE_ENC
|
ATTS_PERMIT_WRITE_AUTH
|
ATTS_PERMIT_READ
|
ATTS_PERMIT_READ_ENC
|
ATTS_PERMIT_READ_AUTH
,
},
};
dmConnId_t
active_connection
=
0
;
static
uint8_t
UARTReadCback
(
dmConnId_t
connId
,
uint16_t
handle
,
uint8_t
operation
,
uint16_t
offset
,
attsAttr_t
*
pAttr
)
{
printf
(
"read callback
\n
"
);
return
ATT_SUCCESS
;
}
static
uint8_t
UARTWriteCback
(
dmConnId_t
connId
,
uint16_t
handle
,
...
...
@@ -119,8 +137,6 @@ static uint8_t UARTWriteCback(
return
ATT_SUCCESS
;
}
static
uint8_t
ble_uart_tx_buf
[
128
];
static
uint8_t
ble_uart_buf_tx_fill
;
static
int
ble_uart_lasttick
=
0
;
void
ble_uart_write
(
uint8_t
*
pValue
,
uint8_t
len
)
...
...
@@ -134,11 +150,6 @@ void ble_uart_write(uint8_t *pValue, uint8_t len)
if
(
ble_uart_buf_tx_fill
==
128
||
pValue
[
i
]
==
'\r'
||
pValue
[
i
]
==
'\n'
)
{
if
(
ble_uart_buf_tx_fill
>
0
)
{
AttsSetAttr
(
UART_TX_HDL
,
ble_uart_buf_tx_fill
,
ble_uart_tx_buf
);
if
(
active_connection
)
{
int
x
=
xTaskGetTickCount
()
-
ble_uart_lasttick
;
...
...
@@ -165,11 +176,15 @@ void ble_uart_write(uint8_t *pValue, uint8_t len)
}
}
static
attsGroup_t
uartCfgGroup
=
{
.
pAttr
=
(
attsAttr_t
*
)
uartAttrCfgList
,
.
writeCback
=
UARTWriteCback
,
.
startHandle
=
UART_START_HDL
,
.
endHandle
=
UART_END_HDL
,
};
void
bleuart_init
(
void
)
{
/* Add the UART service dynamically */
void
*
pSHdl
;
pSHdl
=
SvcUARTAddGroupDyn
();
AttsDynRegister
(
pSHdl
,
UARTReadCback
,
UARTWriteCback
);
//AttsDynRegister(pSHdl, NULL, UARTWriteCback);
/* Add the UART service */
AttsAddGroup
(
&
uartCfgGroup
);
}
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