Merge branch 'dev' into BLE

2022-12-28 14:24:49 +11:00
parent b6aaf30c58 45a4ff90aa
commit 7c8664fb22
65 changed files with 11784 additions and 11798 deletions
--- a/source/Core/Inc/Translation.h
+++ b/source/Core/Inc/Translation.h
@@ -87,6 +87,7 @@ struct TranslationIndexTable {
  uint16_t DeviceFailedValidationWarning;

  uint16_t CJCCalibrationDone;
+  uint16_t ResetOKMessage;
  uint16_t SettingsResetMessage;
  uint16_t NoAccelerometerMessage;
  uint16_t NoPowerDeliveryMessage;
--- a/source/Core/Inc/settingsGUI.hpp
+++ b/source/Core/Inc/settingsGUI.hpp
@@ -35,7 +35,6 @@ typedef struct {
 } menuitem;

 void                  enterSettingsMenu();
-void                  GUIDelay();
 void                  warnUser(const char *warning, const int timeout);
 extern const menuitem rootSettingsMenu[];