Merge branch 'master' into messing_with_pd
This commit is contained in:
@@ -12,9 +12,9 @@ extern const uint8_t USER_FONT_12[];
|
||||
extern const uint8_t USER_FONT_6x8[];
|
||||
extern const bool HasFahrenheit;
|
||||
|
||||
extern const char *SettingsShortNames[33][2];
|
||||
extern const char *SettingsDescriptions[33];
|
||||
extern const char *SettingsMenuEntries[5];
|
||||
extern const char *SettingsShortNames[];
|
||||
extern const char *SettingsDescriptions[];
|
||||
extern const char *SettingsMenuEntries[];
|
||||
|
||||
extern const char *SettingsCalibrationDone;
|
||||
extern const char *SettingsCalibrationWarning;
|
||||
@@ -35,8 +35,9 @@ extern const char *IdleSetString;
|
||||
extern const char *TipDisconnectedString;
|
||||
extern const char *SolderingAdvancedPowerPrompt;
|
||||
extern const char *OffString;
|
||||
extern const char *ResetOKMessage;
|
||||
extern const char *YourGainMessage;
|
||||
|
||||
extern const char *ResetOKMessage;
|
||||
extern const char *SettingsResetMessage;
|
||||
extern const char *NoAccelerometerMessage;
|
||||
extern const char *NoPowerDeliveryMessage;
|
||||
|
||||
@@ -29,6 +29,7 @@ typedef struct {
|
||||
|
||||
void enterSettingsMenu();
|
||||
void GUIDelay();
|
||||
void warnUser(const char *warning, const int timeout);
|
||||
extern const menuitem rootSettingsMenu[];
|
||||
|
||||
#endif /* GUI_HPP_ */
|
||||
|
||||
Reference in New Issue
Block a user