liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Power: rename reset to reboot (#552)

Browse Source
This commit is contained in:
あく 2021-07-02 01:53:20 +03:00 committed by GitHub
parent c27d76d664
commit d088c28659
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
applications/power/power.c
View File

@ -67,9 +67,9 @@ void power_menu_off_callback(void* context) {
void power_menu_reset_dialog_result(DialogResult result, void* context) { void power_menu_reset_dialog_result(DialogResult result, void* context) {
Power* power = context; Power* power = context;
if(result == DialogResultLeft) { if(result == DialogResultLeft) {
power_reset(power, PowerBootModeDfu); power_reboot(power, PowerBootModeDfu);
} else if(result == DialogResultRight) { } else if(result == DialogResultRight) {
power_reset(power, PowerBootModeNormal); power_reboot(power, PowerBootModeNormal);
} else if(result == DialogResultBack) { } else if(result == DialogResultBack) {
view_dispatcher_switch_to_view(power->view_dispatcher, VIEW_NONE); view_dispatcher_switch_to_view(power->view_dispatcher, VIEW_NONE);
} }
@ -162,7 +162,7 @@ void power_off(Power* power) {
view_dispatcher_switch_to_view(power->view_dispatcher, PowerViewDisconnect); view_dispatcher_switch_to_view(power->view_dispatcher, PowerViewDisconnect);
} }
void power_reset(Power* power, PowerBootMode mode) { void power_reboot(Power* power, PowerBootMode mode) {
if(mode == PowerBootModeNormal) { if(mode == PowerBootModeNormal) {
api_hal_boot_set_mode(ApiHalBootModeNormal); api_hal_boot_set_mode(ApiHalBootModeNormal);
} else if(mode == PowerBootModeDfu) { } else if(mode == PowerBootModeDfu) {

4
applications/power/power.h
View File

@ -12,8 +12,8 @@ typedef enum {
*/ */
void power_off(Power* power); void power_off(Power* power);
/** Reset device /** Reboot device
* @param power - Power instance * @param power - Power instance
* @param mode - PowerBootMode * @param mode - PowerBootMode
*/ */
void power_reset(Power* power, PowerBootMode mode); void power_reboot(Power* power, PowerBootMode mode);

10
applications/power/power_cli.c
View File

@ -6,14 +6,14 @@ void power_cli_poweroff(Cli* cli, string_t args, void* context) {
power_off(power); power_off(power);
} }
void power_cli_reset(Cli* cli, string_t args, void* context) { void power_cli_reboot(Cli* cli, string_t args, void* context) {
Power* power = context; Power* power = context;
power_reset(power, PowerBootModeNormal); power_reboot(power, PowerBootModeNormal);
} }
void power_cli_dfu(Cli* cli, string_t args, void* context) { void power_cli_dfu(Cli* cli, string_t args, void* context) {
Power* power = context; Power* power = context;
power_reset(power, PowerBootModeDfu); power_reboot(power, PowerBootModeDfu);
} }
void power_cli_factory_reset(Cli* cli, string_t args, void* context) { void power_cli_factory_reset(Cli* cli, string_t args, void* context) {
@ -23,7 +23,7 @@ void power_cli_factory_reset(Cli* cli, string_t args, void* context) {
if(c == 'y' || c == 'Y') { if(c == 'y' || c == 'Y') {
printf("Data will be wiped after reboot.\r\n"); printf("Data will be wiped after reboot.\r\n");
api_hal_boot_set_flags(ApiHalBootFlagFactoryReset); api_hal_boot_set_flags(ApiHalBootFlagFactoryReset);
power_reset(power, PowerBootModeNormal); power_reboot(power, PowerBootModeNormal);
} else { } else {
printf("Safe choice.\r\n"); printf("Safe choice.\r\n");
} }
@ -45,7 +45,7 @@ void power_cli_otg(Cli* cli, string_t args, void* context) {
void power_cli_init(Cli* cli, Power* power) { void power_cli_init(Cli* cli, Power* power) {
cli_add_command(cli, "poweroff", power_cli_poweroff, power); cli_add_command(cli, "poweroff", power_cli_poweroff, power);
cli_add_command(cli, "reset", power_cli_reset, power); cli_add_command(cli, "reboot", power_cli_reboot, power);
cli_add_command(cli, "factory_reset", power_cli_factory_reset, power); cli_add_command(cli, "factory_reset", power_cli_factory_reset, power);
cli_add_command(cli, "dfu", power_cli_dfu, power); cli_add_command(cli, "dfu", power_cli_dfu, power);
cli_add_command(cli, "power_info", power_cli_info, power); cli_add_command(cli, "power_info", power_cli_info, power);