Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm-projects
RIOT
Commits
deeb514d
Commit
deeb514d
authored
9 years ago
by
Martine Lenders
Browse files
Options
Downloads
Plain Diff
Merge pull request #2836 from haukepetersen/opt_xbee
drivers/xbee: misc fixes
parents
d274fc4a
727ddb9d
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
drivers/include/xbee.h
+2
-2
2 additions, 2 deletions
drivers/include/xbee.h
drivers/xbee/xbee.c
+2
-2
2 additions, 2 deletions
drivers/xbee/xbee.c
with
4 additions
and
4 deletions
drivers/include/xbee.h
+
2
−
2
View file @
deeb514d
...
@@ -67,12 +67,12 @@
...
@@ -67,12 +67,12 @@
/**
/**
* @brief Default PAN ID used after initialization
* @brief Default PAN ID used after initialization
*/
*/
#define XBEE_DEFAULT_PANID (0x00
01
)
#define XBEE_DEFAULT_PANID (0x00
23
)
/**
/**
* @brief Default channel used after initialization
* @brief Default channel used after initialization
*/
*/
#define XBEE_DEFAULT_CHANNEL (1
1
U)
#define XBEE_DEFAULT_CHANNEL (1
7
U)
/**
/**
* @brief States of the internal FSM for handling incoming UART frames
* @brief States of the internal FSM for handling incoming UART frames
...
...
This diff is collapsed.
Click to expand it.
drivers/xbee/xbee.c
+
2
−
2
View file @
deeb514d
...
@@ -558,7 +558,7 @@ static int _send(ng_netdev_t *netdev, ng_pktsnip_t *pkt)
...
@@ -558,7 +558,7 @@ static int _send(ng_netdev_t *netdev, ng_pktsnip_t *pkt)
dev
->
tx_buf
[
1
]
=
(
uint8_t
)((
size
+
11
)
>>
8
);
dev
->
tx_buf
[
1
]
=
(
uint8_t
)((
size
+
11
)
>>
8
);
dev
->
tx_buf
[
2
]
=
(
uint8_t
)(
size
+
11
);
dev
->
tx_buf
[
2
]
=
(
uint8_t
)(
size
+
11
);
dev
->
tx_buf
[
3
]
=
API_ID_TX_LONG_ADDR
;
dev
->
tx_buf
[
3
]
=
API_ID_TX_LONG_ADDR
;
memcpy
(
dev
->
tx_buf
+
11
,
ng_netif_hdr_get_dst_addr
(
hdr
),
8
);
memcpy
(
dev
->
tx_buf
+
5
,
ng_netif_hdr_get_dst_addr
(
hdr
),
8
);
pos
=
13
;
pos
=
13
;
}
}
/* set options */
/* set options */
...
@@ -696,7 +696,7 @@ static void _isr_event(ng_netdev_t *netdev, uint32_t event_type)
...
@@ -696,7 +696,7 @@ static void _isr_event(ng_netdev_t *netdev, uint32_t event_type)
/* allocate and fill interface header */
/* allocate and fill interface header */
pkt_head
=
ng_pktbuf_add
(
NULL
,
NULL
,
pkt_head
=
ng_pktbuf_add
(
NULL
,
NULL
,
sizeof
(
ng_netif_hdr_t
)
+
(
2
*
addr_len
),
sizeof
(
ng_netif_hdr_t
)
+
(
2
*
addr_len
),
NG_NETTYPE_
UNDE
F
);
NG_NETTYPE_
NETI
F
);
if
(
pkt_head
==
NULL
)
{
if
(
pkt_head
==
NULL
)
{
DEBUG
(
"xbee: Error allocating netif header in packet buffer on RX
\n
"
);
DEBUG
(
"xbee: Error allocating netif header in packet buffer on RX
\n
"
);
dev
->
rx_count
=
0
;
dev
->
rx_count
=
0
;
...
...
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