-
-
Notifications
You must be signed in to change notification settings - Fork 19.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Password via G-code and MarlinUI (#18399)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
- Loading branch information
1 parent
0a1b865
commit 852e5ae
Showing
19 changed files
with
588 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /** | ||
| * Marlin 3D Printer Firmware | ||
| * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] | ||
| * | ||
| * Based on Sprinter and grbl. | ||
| * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| #include "../../inc/MarlinConfigPre.h" | ||
|
|
||
| #if ENABLED(PASSWORD_FEATURE) | ||
|
|
||
| #include "password.h" | ||
| #include "../../gcode/gcode.h" | ||
| #include "../../core/serial.h" | ||
|
|
||
| Password password; | ||
|
|
||
| // public: | ||
| bool Password::is_set, Password::is_locked; | ||
| uint32_t Password::value, Password::value_entry; | ||
|
|
||
| // | ||
| // Authenticate user with password. | ||
| // Called from Setup, after SD Prinitng Stops/Aborts, and M510 | ||
| // | ||
| void Password::lock_machine() { | ||
| is_locked = true; | ||
| TERN_(HAS_LCD_MENU, authenticate_user(ui.status_screen, screen_password_entry)); | ||
| } | ||
|
|
||
| // | ||
| // Authentication check | ||
| // | ||
| void Password::authentication_check() { | ||
| if (value_entry == value) | ||
| is_locked = false; | ||
| else | ||
| SERIAL_ECHOLNPGM(STR_WRONG_PASSWORD); | ||
|
|
||
| TERN_(HAS_LCD_MENU, authentication_done()); | ||
| } | ||
|
|
||
| #endif // PASSWORD_FEATURE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /** | ||
| * Marlin 3D Printer Firmware | ||
| * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] | ||
| * | ||
| * Based on Sprinter and grbl. | ||
| * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
| #pragma once | ||
|
|
||
| #include "../../lcd/ultralcd.h" | ||
|
|
||
| class Password { | ||
| public: | ||
| static bool is_set, is_locked; | ||
| static uint32_t value, value_entry; | ||
|
|
||
| Password() { is_locked = false; } | ||
|
|
||
| static void lock_machine(); | ||
|
|
||
| #if HAS_LCD_MENU | ||
| static void access_menu_password(); | ||
| static void authentication_check(); | ||
| static void authentication_done(); | ||
| static void media_gatekeeper(); | ||
|
|
||
| private: | ||
| static void authenticate_user(const screenFunc_t, const screenFunc_t); | ||
| static void menu_password(); | ||
| static void menu_password_entry(); | ||
| static void screen_password_entry(); | ||
| static void screen_set_password(); | ||
| static void start_over(); | ||
|
|
||
| static void digit_entered(); | ||
| static void set_password_done(); | ||
| static void menu_password_report(); | ||
|
|
||
| static void remove_password(); | ||
| #endif | ||
| }; | ||
|
|
||
| extern Password password; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /** | ||
| * Marlin 3D Printer Firmware | ||
| * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] | ||
| * | ||
| * Based on Sprinter and grbl. | ||
| * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| #include "../../../inc/MarlinConfigPre.h" | ||
|
|
||
| #if ENABLED(PASSWORD_FEATURE) | ||
|
|
||
| #include "../../../feature/password/password.h" | ||
| #include "../../../core/serial.h" | ||
| #include "../../gcode.h" | ||
|
|
||
| // | ||
| // M510: Lock Printer | ||
| // | ||
| void GcodeSuite::M510() { | ||
| password.lock_machine(); | ||
| } | ||
|
|
||
| // | ||
| // M511: Unlock Printer | ||
| // | ||
| #if ENABLED(PASSWORD_UNLOCK_GCODE) | ||
|
|
||
| void GcodeSuite::M511() { | ||
| if (password.is_locked) { | ||
| password.value_entry = parser.ulongval('P'); | ||
| password.authentication_check(); | ||
| } | ||
| } | ||
|
|
||
| #endif // PASSWORD_UNLOCK_GCODE | ||
|
|
||
| // | ||
| // M512: Set/Change/Remove Password | ||
| // | ||
| #if ENABLED(PASSWORD_CHANGE_GCODE) | ||
|
|
||
| void GcodeSuite::M512() { | ||
| if (password.is_set && parser.ulongval('P') != password.value) { | ||
| SERIAL_ECHOLNPGM(STR_WRONG_PASSWORD); | ||
| return; | ||
| } | ||
|
|
||
| if (parser.seenval('N')) { | ||
| password.value_entry = parser.ulongval('N'); | ||
|
|
||
| if (password.value_entry < CAT(1e, PASSWORD_LENGTH)) { | ||
| password.is_set = true; | ||
| password.value = password.value_entry; | ||
| SERIAL_ECHOLNPAIR(STR_PASSWORD_SET, password.value); // TODO: Update password.string | ||
| } | ||
| else | ||
| SERIAL_ECHOLNPGM(STR_PASSWORD_TOO_LONG); | ||
| } | ||
| else { | ||
| password.is_set = false; | ||
| SERIAL_ECHOLNPGM(STR_PASSWORD_REMOVED); | ||
| } | ||
| SERIAL_ECHOLNPGM(STR_REMINDER_SAVE_SETTINGS); | ||
| } | ||
|
|
||
| #endif // PASSWORD_CHANGE_GCODE | ||
|
|
||
| #endif // PASSWORD_FEATURE |
Oops, something went wrong.