sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Add BLE Enabled to advanced menu

Browse Source
This commit is contained in:
Ben V. Brown
2023-01-23 18:05:59 +11:00
parent 07a5d45e17
commit 26f71b2c2f
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/Core/BSP/Pinecilv2/configuration.h
View File

@@ -152,7 +152,7 @@
#define HAS_POWER_DEBUG_MENU #define HAS_POWER_DEBUG_MENU
#define HARDWARE_MAX_WATTAGE_X10 750 #define HARDWARE_MAX_WATTAGE_X10 750
#define TIP_THERMAL_MASS 65 // X10 watts to raise 1 deg C in 1 second #define TIP_THERMAL_MASS 65 // X10 watts to raise 1 deg C in 1 second
#define BLE_ENABLED
#define NEEDS_VBUS_PROBE 0 #define NEEDS_VBUS_PROBE 0
#endif #endif

13
source/Core/Src/settingsGUI.cpp
View File

@@ -41,6 +41,9 @@ static void displayAdvancedSolderingScreens(void);
static void displayAdvancedIDLEScreens(void); static void displayAdvancedIDLEScreens(void);
static void displayScrollSpeed(void); static void displayScrollSpeed(void);
static void displayPowerLimit(void); static void displayPowerLimit(void);
#ifdef BLE_ENABLED
static void displayBLEEnabled(void);
#endif
#ifndef NO_DISPLAY_ROTATE #ifndef NO_DISPLAY_ROTATE
static bool setDisplayRotation(void); static bool setDisplayRotation(void);
static void displayDisplayRotation(void); static void displayDisplayRotation(void);
@@ -255,7 +258,8 @@ const menuitem UIMenu[] = {
{0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0} // end of menu marker. DO NOT REMOVE {0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0} // end of menu marker. DO NOT REMOVE
}; };
const menuitem advancedMenu[] = { const menuitem advancedMenu[] = {
/* /*
* BLE Enabled or not
* Power Limit * Power Limit
* Calibrate CJC At Next Boot * Calibrate CJC At Next Boot
* Calibrate Input V * Calibrate Input V
@@ -264,6 +268,9 @@ const menuitem advancedMenu[] = {
* -Power Pulse Duration * -Power Pulse Duration
* Factory Reset * Factory Reset
*/ */
#ifdef BLE_ENABLED
{SETTINGS_DESC(SettingsItemIndex::BLEEnabled), nullptr, displayBLEEnabled, nullptr, SettingsOptions::BLEEnabled, SettingsItemIndex::BLEEnabled, 7}, /*Advanced idle screen*/
#endif
{SETTINGS_DESC(SettingsItemIndex::PowerLimit), nullptr, displayPowerLimit, nullptr, SettingsOptions::PowerLimit, SettingsItemIndex::PowerLimit, 5}, /*Power limit*/ {SETTINGS_DESC(SettingsItemIndex::PowerLimit), nullptr, displayPowerLimit, nullptr, SettingsOptions::PowerLimit, SettingsItemIndex::PowerLimit, 5}, /*Power limit*/
{SETTINGS_DESC(SettingsItemIndex::CalibrateCJC), setCalibrate, displayCalibrate, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::CalibrateCJC, {SETTINGS_DESC(SettingsItemIndex::CalibrateCJC), setCalibrate, displayCalibrate, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::CalibrateCJC,
7}, /*Calibrate Cold Junktion Compensation at next boot*/ 7}, /*Calibrate Cold Junktion Compensation at next boot*/
@@ -633,7 +640,9 @@ static void displayLogoTime(void) {
static void displayAdvancedIDLEScreens(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::DetailedIDLE)); } static void displayAdvancedIDLEScreens(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::DetailedIDLE)); }
static void displayAdvancedSolderingScreens(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::DetailedSoldering)); } static void displayAdvancedSolderingScreens(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::DetailedSoldering)); }
#ifdef BLE_ENABLED
static void displayBLEEnabled(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::BLEEnabled)); }
#endif
static void displayPowerLimit(void) { static void displayPowerLimit(void) {
if (getSettingValue(SettingsOptions::PowerLimit) == 0) { if (getSettingValue(SettingsOptions::PowerLimit) == 0) {