Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pousseseringue-arduino
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
Container 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
FabLAAS
PousseSeringue
pousseseringue-arduino
Commits
89e23b51
Commit
89e23b51
authored
1 year ago
by
Malaurie Bernard
Browse files
Options
Downloads
Patches
Plain Diff
Adding a method to choose the theme (so we can create several of them later)
parent
97799ac5
No related branches found
Branches containing commit
No related tags found
1 merge request
!17
Malaurie's work on UI + CLI interface + AccelStepper interface
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
web.cpp
+34
-1
34 additions, 1 deletion
web.cpp
web.h
+3
-1
3 additions, 1 deletion
web.h
with
37 additions
and
2 deletions
web.cpp
+
34
−
1
View file @
89e23b51
...
...
@@ -5,7 +5,7 @@
void
web_setup
()
{
set_theme
(
1
);
...
...
@@ -408,6 +408,39 @@ void style (uint16_t id, int style)
}
void
set_style
()
{
//Mettre le style initial
}
void
set_theme
(
int
theme
)
{
if
(
theme
==
1
)
{
//Creation des différents styles
//Les verts pour la mise en mrche de la seringue
sprintf
(
couleur1
,
"background-color: #%06X;"
,
(
unsigned
int
)
0xb2dbbf
);
sprintf
(
couleur2
,
"background-color: #%06X;"
,
(
unsigned
int
)
0x5a8668
);
//Le rouge pour la seringue a l'arrêt
sprintf
(
couleur3
,
"background-color: #%06X;"
,
(
unsigned
int
)
0xc97064
);
sprintf
(
couleur4
,
"background-color: #%06X;"
,
(
unsigned
int
)
0x762419
);
//Les marrons pour la config des seringues
sprintf
(
couleur5
,
"background-color: #%06X;"
,
(
unsigned
int
)
0xce9f6f
);
sprintf
(
couleur6
,
"background-color: #%06X;"
,
(
unsigned
int
)
0x926448
);
//Pas utilisé pour le moment
sprintf
(
couleur7
,
"background-color: #%06X;"
,
(
unsigned
int
)
0x0a7477
);
sprintf
(
couleur8
,
"background-color: #%06X;"
,
(
unsigned
int
)
0x052a38
);
sprintf
(
couleur9
,
"background-color: #%06X;"
,
(
unsigned
int
)
0x044365
);
sprintf
(
couleur10
,
"background-color: #%06X;"
,
(
unsigned
int
)
0x58b8c3
);
}
}
//WEB_LOOP//
...
...
This diff is collapsed.
Click to expand it.
web.h
+
3
−
1
View file @
89e23b51
...
...
@@ -91,7 +91,7 @@ void status_position_choice_callback (Control* sender, int value);
void
add_syringe_callback
(
Control
*
sender
,
int
value
,
void
*
param
);
void
remaining_volume_callback
(
Control
*
sender
,
int
value
,
void
*
param
);
//onoff methods
...
...
@@ -109,4 +109,6 @@ void select_syringe_maj(uint16_t tab);
void
style
(
uint16_t
id
,
int
style
);
void
set_style
();
void
set_theme
(
int
theme
);
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