Merge pull request #429 from theAlexes/theAlexes/format-command

add a format command
This commit is contained in:
atax1a 2024-08-07 04:51:12 +00:00 committed by GitHub
commit 0ad5fa4733
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 36 additions and 4 deletions

View File

@ -120,13 +120,29 @@ bool filesystem_init(void) {
printf("Ignore that error! Formatting filesystem...\r\n"); printf("Ignore that error! Formatting filesystem...\r\n");
err = lfs_format(&lfs, &cfg); err = lfs_format(&lfs, &cfg);
if (err < 0) return false; if (err < 0) return false;
err = lfs_mount(&lfs, &cfg) == LFS_ERR_OK; err = lfs_mount(&lfs, &cfg);
printf("Filesystem mounted with %ld bytes free.\r\n", filesystem_get_free_space()); printf("Filesystem mounted with %ld bytes free.\r\n", filesystem_get_free_space());
} }
return err == LFS_ERR_OK; return err == LFS_ERR_OK;
} }
int _filesystem_format(void);
int _filesystem_format(void) {
int err = lfs_unmount(&lfs);
if (err < 0) {
printf("Couldn't unmount - continuing to format, but you should reboot afterwards!\r\n");
}
err = lfs_format(&lfs, &cfg);
if (err < 0) return err;
err = lfs_mount(&lfs, &cfg);
if (err < 0) return err;
printf("Filesystem re-mounted with %ld bytes free.\r\n", filesystem_get_free_space());
return 0;
}
bool filesystem_file_exists(char *filename) { bool filesystem_file_exists(char *filename) {
info.type = 0; info.type = 0;
lfs_stat(&lfs, filename, &info); lfs_stat(&lfs, filename, &info);
@ -251,6 +267,16 @@ int filesystem_cmd_rm(int argc, char *argv[]) {
return 0; return 0;
} }
int filesystem_cmd_format(int argc, char *argv[]) {
(void) argc;
if(strcmp(argv[1], "YES") == 0) {
return _filesystem_format();
}
printf("usage: format YES\r\n");
return 1;
}
int filesystem_cmd_echo(int argc, char *argv[]) { int filesystem_cmd_echo(int argc, char *argv[]) {
(void) argc; (void) argc;
@ -279,4 +305,3 @@ int filesystem_cmd_echo(int argc, char *argv[]) {
return 0; return 0;
} }

View File

@ -100,6 +100,7 @@ int filesystem_cmd_ls(int argc, char *argv[]);
int filesystem_cmd_cat(int argc, char *argv[]); int filesystem_cmd_cat(int argc, char *argv[]);
int filesystem_cmd_df(int argc, char *argv[]); int filesystem_cmd_df(int argc, char *argv[]);
int filesystem_cmd_rm(int argc, char *argv[]); int filesystem_cmd_rm(int argc, char *argv[]);
int filesystem_cmd_format(int argc, char *argv[]);
int filesystem_cmd_echo(int argc, char *argv[]); int filesystem_cmd_echo(int argc, char *argv[]);
#endif // FILESYSTEM_H_ #endif // FILESYSTEM_H_

View File

@ -85,6 +85,13 @@ shell_command_t g_shell_commands[] = {
.max_args = 1, .max_args = 1,
.cb = filesystem_cmd_rm, .cb = filesystem_cmd_rm,
}, },
{
.name = "format",
.help = "usage: format YES",
.min_args = 1,
.max_args = 1,
.cb = filesystem_cmd_format,
},
{ {
.name = "echo", .name = "echo",
.help = "usage: echo TEXT {>,>>} FILE", .help = "usage: echo TEXT {>,>>} FILE",
@ -109,7 +116,7 @@ static int help_cmd(int argc, char *argv[]) {
printf("Command List:\r\n"); printf("Command List:\r\n");
for (size_t i = 0; i < g_num_shell_commands; i++) { for (size_t i = 0; i < g_num_shell_commands; i++) {
printf(" %s\t%s\r\n", printf(" %s\t%s\r\n",
g_shell_commands[i].name, g_shell_commands[i].name,
(g_shell_commands[i].help) ? g_shell_commands[i].help : "" (g_shell_commands[i].help) ? g_shell_commands[i].help : ""
); );
@ -156,4 +163,3 @@ static int stress_cmd(int argc, char *argv[]) {
return 0; return 0;
} }