Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
flow3r 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
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
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
flow3r
flow3r firmware
Commits
3e1da8f1
Commit
3e1da8f1
authored
1 year ago
by
dos
Committed by
dos
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
recovery: Show a different message in SD disk mode
parent
c0a5a4f4
No related branches found
No related tags found
1 merge request
!536
recovery: Show a different message in SD disk mode
Pipeline
#9010
passed
1 year ago
Stage: check
Stage: build
Stage: deploy
Changes
1
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
recovery/main/rec_main.c
+12
-4
12 additions, 4 deletions
recovery/main/rec_main.c
with
12 additions
and
4 deletions
recovery/main/rec_main.c
+
12
−
4
View file @
3e1da8f1
...
@@ -28,7 +28,8 @@ static const char *TAG = "flow3r-recovery";
...
@@ -28,7 +28,8 @@ static const char *TAG = "flow3r-recovery";
static
menu_t
*
_cur_menu
=
NULL
;
static
menu_t
*
_cur_menu
=
NULL
;
static
menu_t
_main_menu
;
static
menu_t
_main_menu
;
static
menu_t
_list_menu
;
static
menu_t
_list_menu
;
static
menu_t
_diskmode_menu
;
static
menu_t
_diskmode_flash_menu
;
static
menu_t
_diskmode_sd_menu
;
static
menu_t
_erasedone_menu
;
static
menu_t
_erasedone_menu
;
static
menu_entry_t
_list_menu_entries
[];
static
menu_entry_t
_list_menu_entries
[];
...
@@ -44,7 +45,7 @@ static image_entry_t image_list[64];
...
@@ -44,7 +45,7 @@ static image_entry_t image_list[64];
static
void
_main_reboot
(
void
)
{
esp_restart
();
}
static
void
_main_reboot
(
void
)
{
esp_restart
();
}
static
void
_main_disk_mode_flash
(
void
)
{
static
void
_main_disk_mode_flash
(
void
)
{
_cur_menu
=
&
_diskmode_menu
;
_cur_menu
=
&
_diskmode_
flash_
menu
;
_cur_menu
->
selected
=
0
;
_cur_menu
->
selected
=
0
;
if
(
!
_usb_initialized
)
{
if
(
!
_usb_initialized
)
{
...
@@ -57,7 +58,7 @@ static void _main_disk_mode_flash(void) {
...
@@ -57,7 +58,7 @@ static void _main_disk_mode_flash(void) {
}
}
static
void
_main_disk_mode_sd
(
void
)
{
static
void
_main_disk_mode_sd
(
void
)
{
_cur_menu
=
&
_diskmode_menu
;
_cur_menu
=
&
_diskmode_
sd_
menu
;
_cur_menu
->
selected
=
0
;
_cur_menu
->
selected
=
0
;
if
(
!
_usb_initialized
)
{
if
(
!
_usb_initialized
)
{
...
@@ -258,7 +259,7 @@ static menu_entry_t _diskmode_menu_entries[] = {
...
@@ -258,7 +259,7 @@ static menu_entry_t _diskmode_menu_entries[] = {
{
.
label
=
"Exit"
,
.
enter
=
_diskmode_exit
},
{
.
label
=
"Exit"
,
.
enter
=
_diskmode_exit
},
};
};
static
menu_t
_diskmode_menu
=
{
static
menu_t
_diskmode_
flash_
menu
=
{
.
help
=
.
help
=
"Connect the badge to a PC to
\n
access the internal flash
\n
FAT32 "
"Connect the badge to a PC to
\n
access the internal flash
\n
FAT32 "
"partition."
,
"partition."
,
...
@@ -267,6 +268,13 @@ static menu_t _diskmode_menu = {
...
@@ -267,6 +268,13 @@ static menu_t _diskmode_menu = {
.
selected
=
0
,
.
selected
=
0
,
};
};
static
menu_t
_diskmode_sd_menu
=
{
.
help
=
"Connect the badge to a PC to
\n
access the SD card."
,
.
entries
=
_diskmode_menu_entries
,
.
entries_count
=
1
,
.
selected
=
0
,
};
static
menu_entry_t
_list_menu_entries
[
64
]
=
{
static
menu_entry_t
_list_menu_entries
[
64
]
=
{
{
.
label
=
"Exit"
,
.
enter
=
_list_exit
},
{
.
label
=
"Exit"
,
.
enter
=
_list_exit
},
};
};
...
...
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