@@ -338,7 +338,7 @@ Standard Controls While Blade is OFF
338338 *if using FETT263_BC_SAY_BATTERY_VOLTS_PERCENT
339339 Point down for volts, parallel or up for percent
340340 NEW! Manual Blade ID* = Triple Click + Long Click PWR
341- *requires FETT263_MANUAL_BLADE_ID and BLADE_ID_SCAN_MILLIS defines
341+ *requires FETT263_MANUAL_BLADE_ID
342342 *replaces Change Font control
343343 NEW! Change Font*
344344 Next Font = Triple Click + Long Click PWR (parallel or up)
@@ -557,7 +557,7 @@ OPTIONAL DEFINES (added to CONFIG_TOP in config.h file)
557557
558558 FETT263_MANUAL_BLADE_ID
559559 Enables Manual Blade ID Scan via button control (see here: https://pod.hubbe.net/howto/blade-id.html)
560- *requires BLADE_ID_SCAN_MILLIS define, replaces "Change Font" control
560+ *replaces "Change Font" control
561561
562562 FETT263_MANUAL_BLADE_ARRAY
563563 Enables Manual Blade Array switching via button control (you need more than one Blade Array)
@@ -1416,8 +1416,8 @@ EFFECT2(trloop, trloop);
14161416#ifdef FETT263_USE_SETTINGS_MENU
14171417EFFECT (medit); // Edit Mode
14181418#endif
1419- #ifdef FETT263_MANUAL_BLADE_ARRAY
1420- EFFECT (array); // for Manual Blade Array switching
1419+ #if defined( FETT263_MANUAL_BLADE_ARRAY) || defined(FETT263_MANUAL_BLADE_ID)
1420+ EFFECT (array); // for Manual Blade Array or Manual Blade ID switching
14211421#endif
14221422#ifdef FETT263_SS_BUTTON_CLICKER
14231423EFFECT (press); // for button press sound
@@ -2291,6 +2291,7 @@ SaberFett263Buttons() : PropBase() {}
22912291 FindBladeAgain ();
22922292 PlayArraySound ();
22932293 }
2294+
22942295#ifdef FETT263_MANUAL_BLADE_ARRAY
22952296 void NextBladeArray () {
22962297 if (!use_fake_id_) best_config_before_faking_ = current_config - blades;
@@ -2301,6 +2302,7 @@ SaberFett263Buttons() : PropBase() {}
23012302 FindBladeAgain ();
23022303 PlayArraySound ();
23032304 }
2305+ #endif
23042306
23052307 void PlayArraySound () {
23062308 if (SFX_array) {
@@ -2310,7 +2312,6 @@ SaberFett263Buttons() : PropBase() {}
23102312 hybrid_font.PlayCommon (&SFX_font);
23112313 }
23122314 }
2313- #endif
23142315#endif
23152316
23162317 void DoInteractivePreon () {
0 commit comments