diff --git a/roadscore/prototype/app.py b/roadscore/prototype/app.py index 2dd62d3f8f..461f8b3a75 100644 --- a/roadscore/prototype/app.py +++ b/roadscore/prototype/app.py @@ -141,7 +141,7 @@ if shaker_enabled or apex_enabled or alert_enabled or curve_enabled: profile_manifest=json.loads((root/'experiments/ace_chestnut_20260916/profiles'/ace_profile/'profile.json').read_text()) rhythm_timeline=RhythmTimeline(rate,profile_tempo_prior(profile_manifest));rhythm_timeline.add(source,0) shaker_grid=rhythm_timeline.at(0) - shaker=SignalShaker(shaker_grid,rate,enabled=shaker_enabled,peak=config.get('signal_shaker',{}).get('peak',.012)) + shaker=SignalShaker(shaker_grid,rate,enabled=shaker_enabled,peak=config.get('signal_shaker',{}).get('peak',.012),accented=config.get('signal_shaker',{}).get('accented',False)) apex=CoreApex(shaker_grid,rate,enabled=apex_enabled and not curve_enabled,dip_db=config.get('core_apex',{}).get('dip_db',-1.)) alert_accent=AlertAccent(shaker_grid,rate,enabled=alert_enabled) curve_reaction=CurveReaction(shaker_grid,rate,enabled=curve_enabled,bass_build=config.get('curve_reaction',{}).get('bass_build') is True) diff --git a/roadscore/prototype/prepared_core.py b/roadscore/prototype/prepared_core.py index b5049b2c51..741b0f4f49 100644 --- a/roadscore/prototype/prepared_core.py +++ b/roadscore/prototype/prepared_core.py @@ -55,7 +55,7 @@ class PreparedPresentation: rows = json.loads((Path(archive)/'rhythm_timeline.json').read_text()) self.rhythm.entries = tuple((int(row['start_frame']), int(row['end_frame']), ShakerGrid(**row['grid'])) for row in rows) grid = self.rhythm.at(0) - self.shaker = SignalShaker(grid, rate, enabled=True, peak=config['signal_shaker'].get('peak', .018)) + self.shaker = SignalShaker(grid, rate, enabled=True, peak=config['signal_shaker'].get('peak', .018),accented=config['signal_shaker'].get('accented',False)) self.curve = CurveReaction(grid, rate, enabled=True, bass_build=config.get('curve_reaction', {}).get('bass_build', False)) self.alert = AlertAccent(grid, rate, enabled=True) self.contained_gain = config['signal_shaker'].get('contained_gain', 1.) diff --git a/roadscore/prototype/presentation_policy.py b/roadscore/prototype/presentation_policy.py index 4f67202aff..1b7986f9a0 100644 --- a/roadscore/prototype/presentation_policy.py +++ b/roadscore/prototype/presentation_policy.py @@ -17,7 +17,7 @@ CONSERVATIVE_V3 = {**copy.deepcopy(CONSERVATIVE_V2), 'presentation_policy_versio CONSERVATIVE_V4 = {**copy.deepcopy(CONSERVATIVE_V3), 'presentation_policy_version':'conservative-v4', 'curve_reaction':{'enabled':True,'bass_build':True}, - 'signal_shaker':{'enabled':True,'peak':.055,'after_containment':True,'contained_gain':.45}, + 'signal_shaker':{'enabled':True,'peak':.14,'accented':True,'after_containment':True,'contained_gain':.8}, 'engagement_presentation':{'version':2,'enabled':True,'attack_ms':220,'release_ms':650, 'cutoff_hz':1000.,'width':.55,'gain':.6683439}, } diff --git a/roadscore/prototype/test_presentation_policy.py b/roadscore/prototype/test_presentation_policy.py index 49d7808bcd..67b18ae193 100644 --- a/roadscore/prototype/test_presentation_policy.py +++ b/roadscore/prototype/test_presentation_policy.py @@ -50,7 +50,8 @@ class PolicyTests(unittest.TestCase): current=effective_config({}, {'ROADSCORE_PRESENTATION_POLICY':'conservative-v4'}) self.assertEqual(previous['signal_shaker']['peak'],.018) self.assertNotIn('cutoff_hz',previous['engagement_presentation']) - self.assertEqual(current['signal_shaker']['peak'],.055) + self.assertEqual(current['signal_shaker']['peak'],.14) + self.assertTrue(current['signal_shaker']['accented']) self.assertTrue(current['signal_shaker']['after_containment']) self.assertEqual(current['engagement_presentation']['cutoff_hz'],1000.) self.assertEqual(select_launch('ace','prism',policy='conservative-v3')['policy'],'conservative-v3') diff --git a/starpilot/system/the_galaxy/roadscore.py b/starpilot/system/the_galaxy/roadscore.py index 43d5756911..d546548f30 100644 --- a/starpilot/system/the_galaxy/roadscore.py +++ b/starpilot/system/the_galaxy/roadscore.py @@ -167,7 +167,7 @@ class Operator: 'reason':'' if available else 'Start a RoadScore replay to simulate displayed engagement, signals and music.'} if available: result['route'] = state['route'] - result['readiness'] = state.get('readiness') + if state.get('readiness') in STATES:result['readiness'] = state['readiness'] result['compute'] = state.get('compute') result['status_age_seconds'] = time.monotonic()-stamp values = {key:state.get(key) for key in ('route_t','elapsed','source_model_ns')}