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
33ef8491
Commit
33ef8491
authored
11 years ago
by
Oleg Hahm
Browse files
Options
Downloads
Plain Diff
Merge pull request #632 from benpicco/add_name
add name to sysconfig
parents
355f6610
bbe616f1
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
core/include/config.h
+2
-0
2 additions, 0 deletions
core/include/config.h
sys/config/config.c
+1
-0
1 addition, 0 deletions
sys/config/config.c
with
3 additions
and
0 deletions
core/include/config.h
+
2
−
0
View file @
33ef8491
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include
<stdint.h>
#include
<stdint.h>
#define CONFIG_KEY (0x1701)
#define CONFIG_KEY (0x1701)
#define CONFIG_NAME_LEN (10)
extern
char
configmem
[];
extern
char
configmem
[];
...
@@ -30,6 +31,7 @@ typedef struct {
...
@@ -30,6 +31,7 @@ typedef struct {
uint16_t
id
;
///< unique node identifier
uint16_t
id
;
///< unique node identifier
uint8_t
radio_address
;
///< address for radio communication
uint8_t
radio_address
;
///< address for radio communication
uint8_t
radio_channel
;
///< current frequency
uint8_t
radio_channel
;
///< current frequency
char
name
[
CONFIG_NAME_LEN
];
///< name of the node
}
config_t
;
}
config_t
;
/* @brief: Element to store in flashrom */
/* @brief: Element to store in flashrom */
...
...
This diff is collapsed.
Click to expand it.
sys/config/config.c
+
1
−
0
View file @
33ef8491
...
@@ -22,4 +22,5 @@ config_t sysconfig = {
...
@@ -22,4 +22,5 @@ config_t sysconfig = {
0
,
///< default ID
0
,
///< default ID
0
,
///< default radio address
0
,
///< default radio address
0
,
///< default radio channel
0
,
///< default radio channel
"foobar"
,
///< default name
};
};
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