Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
contiki-ng
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
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
NATAF Emmanuel
contiki-ng
Commits
85214f2d
Unverified
Commit
85214f2d
authored
6 years ago
by
George Oikonomou
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into contrib/tsch-log-test
parents
d45ee858
0f5913ec
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
os/net/mac/tsch/tsch.h
+1
-1
1 addition, 1 deletion
os/net/mac/tsch/tsch.h
with
1 addition
and
1 deletion
os/net/mac/tsch/tsch.h
+
1
−
1
View file @
85214f2d
...
...
@@ -158,7 +158,7 @@ extern uint8_t tsch_current_channel;
extern
uint8_t
tsch_hopping_sequence
[
TSCH_HOPPING_SEQUENCE_MAX_LEN
];
extern
struct
tsch_asn_divisor_t
tsch_hopping_sequence_length
;
/* TSCH timeslot timing (in micro-second) */
uint16_t
tsch_timing_us
[
tsch_ts_elements_count
];
extern
uint16_t
tsch_timing_us
[
tsch_ts_elements_count
];
/* TSCH timeslot timing (in rtimer ticks) */
extern
rtimer_clock_t
tsch_timing
[
tsch_ts_elements_count
];
/* Statistics on the current session */
...
...
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