Skip to content

Commit

Permalink
Bc prop overhaul (#682)
Browse files Browse the repository at this point in the history
* Delete props/saber_BC_buttons.h

* Add files via upload

* Update saber_BC_buttons.h

* spelling

* Update saber_BC_buttons.h

* edit guards2

* change name from Toggle to EnterBladeLengthMode()

* add Custom Spec modes Vol and Blade Length

* Update saber_BC_buttons.h

* stab location aware

* Update instructions sections

* conform to sound lib changes from 01c5872

* use pos_ in BCSelectBladeMode

comment inline in prev conversation

* add temp comment

* test review comment wiping out

* revised BCVolumeMode as per review

* Intro comments edits as per review

* guard BC_MAIN_BLADE == BC_SECOND_BLADE warning

* BCSelectBladeMode ironed out

* add SteppedModeBase to BCMenuSpec

* BCMenuSpec as default unless def MENU_SPEC_TEMPLATE

* review updates. see commit comment

Change selected_blade_  to menu_current_blade_.
Update ChangeBladeLengthMode to use pos_+1 for display and speaking (one-based index for user facing things). BC version too.
current_volume_ function scope and useful only.
Helper function `current_blade()` to handle a bunch of this->pos + 1) code.
Remove redundant say() calls from prev() and next().
Add typedef for SteppedModeBase.
Remove BC_ENABLE_OS_MENU define and base the use of prop-based BcMenuSpec menus on the non-existence of a MENU_SPEC_TEMPLATE in user config.
add a Setup() function to init() soundLibrary.

* actually remove redundant say() calls

* use sound lib v2 for revert

* prevent volume menu from over-queueing min/max volume prompts.

* volume menu percentage fix

* refreshed update to saber_BC_buttons.h

* fix 3btn vs 2btn ON/blaster block

* Resolving first section of review notes.

* Update some button things and Melt use location

Thrust direction needs some work. Not working great.

* Location effects

Also updated BladeSet blade naming for consistency

* remove empty condition

* remove GetSoundLengthNow function

* missing semicolon

* override DoAccel() to use bi-directional stab effect.

* simplify stab direction detection

* even more simplified forward_stab_ setting

* restore safeguard delays to gesture ignitions

* Update more gesture guards

* guard volume menu if in scroll presets.

* guard preset change if already in scroll presets.

* reload style after blade length change

* allow access to UpdateStyle() from modes

* skip blade selection if only one blade

* edit redundant SetMute calls

* use absolute value of diff.x instead of + OR -

* fix stab: since saber_time_off calc.

* fix single blade ON muted comment. not dual blades.

* update USER effects top comments.

* fix weird indentation.

* actually fix stab guard.

* whitespace

* another stab guard fix

* BCChangeBladeLengthBlade1 select() use popMode()

* Fix location lockup-drag for dual blades.

* move thrusting_blade_declaration.

* remove duplicate declaration.

* add stab debug printout

* NO_BLADE_NO_GEST_ONOFF update

* set blade_detected_ in ScanBladeIdNow()

* use onreturn in BCSelectBlade, and unguard BCVolumeMenu

* better DelayTimer

* clarify degrees / radians comment

* fix redundant twist_timer_ check

* DOUBLE_TWIST_TIMEOUT -> REGULAR_TWIST_TIMEOUT

* add comment for DoChangePreset()

* revert unneeded changes for blade_detected_

* revert weird indent

* adjust DelayTimer again.

* Update DelayTimer()

* use fabs in EVENT_THRUST

* add comment explaining DoChangePresetFast

* fix #endif placement for EnterBladeLengthMode()

* make EnterVolumeMenu() use either BC or OS menu based on MENU_SPEC_TEMPLATE defined.

* clean up horizon detection for drag for dual blades.

* NUM_BLADES, not NUM_BUTTONS

* remove unneeded guard for single blade use in BCSelectBladeMode

* fix indents and redundant return.

* added helper functions GestureEnableBattleMode and NoBladeDisableGestures

* fix void return in NoBladeDisableGestures() and missing ;

* update USER effect twists.

* simplify BCVolumeMode menu

* remove faston stuff and unused SB_Effect cases.

* fix indents

* remove redundant if

* fix indent

* remove pointless TurnDualBladesOn/Off and call TurnOn/OffHelpers direct instead.

* just return EffectLocation GetThrustBladeLocation(), no variable needed

* remove unneeded global call to GetThrustBladeLocation

* more indentation fixing

* move return one line down for visibility

* use fusor.angle1() instead of accel

* fix Thrust On and GetThrustBladeLocation()

* fix event twist stopTimer() call

* whitespace

* remove redundant printouts for THRUST ON

* Fix saved twist for USER effects.

* remove old comments

* restore printout to DEBUG only

* un-virtual EnterBladeLengthMode()

* remove unneeded returns.

* remove isTimerRunning()

* say Edit Volume instead of Enter Volume Menu

* change vol menu announce pt2

* fix EnterBladeLengthMode(); use condition

* fix the fix for EnterBladeLengthMode()

* Fix quote timer. Now overlap timer for quote and force.

* rename delay timer variables

* clarify beep delay comment
  • Loading branch information
NoSloppy authored Nov 24, 2024
1 parent 9ec9367 commit 10d2998
Showing 1 changed file with 2,380 additions and 879 deletions.
Loading

0 comments on commit 10d2998

Please sign in to comment.