@@ -332,18 +461,25 @@ const $=id=>document.getElementById(id);
const cv=$('gfc'),ctx=cv.getContext('2d');
const CX=70,CY=70,R=55,SCL=R/2;
-// Preset definitions based on real-world G-forces (tested values):
-// City: gentle-normal inputs (0.10-0.20g accel, 0.15-0.30g brake, 0.10-0.25g lateral)
-// Highway: mostly cruising, higher speed threshold to filter parking maneuvers
-// Canyon: spirited driving (0.20-0.40g range)
-// Track: racing (0.35-0.80g+ range)
-const PRESETS={
-track:{acc:0.35,acc_exit:0.17,brake:0.55,brake_exit:0.27,lat:0.50,lat_exit:0.25,yaw:0.15,min_speed:4.0,desc:'Racing/track days'},
-canyon:{acc:0.22,acc_exit:0.11,brake:0.35,brake_exit:0.17,lat:0.28,lat_exit:0.14,yaw:0.10,min_speed:3.0,desc:'Spirited mountain roads'},
+// Default presets (must match settings.rs DrivingMode::default_config())
+// Each mode has independent thresholds - calibrate via Autotune page
+const DEFAULT_PRESETS={
+track:{acc:0.30,acc_exit:0.15,brake:0.50,brake_exit:0.25,lat:0.50,lat_exit:0.25,yaw:0.15,min_speed:3.0,desc:'Racing/track days'},
+canyon:{acc:0.20,acc_exit:0.10,brake:0.35,brake_exit:0.17,lat:0.30,lat_exit:0.15,yaw:0.10,min_speed:2.5,desc:'Spirited mountain roads'},
city:{acc:0.10,acc_exit:0.05,brake:0.18,brake_exit:0.09,lat:0.12,lat_exit:0.06,yaw:0.05,min_speed:2.0,desc:'Daily street driving'},
-highway:{acc:0.12,acc_exit:0.06,brake:0.22,brake_exit:0.11,lat:0.14,lat_exit:0.07,yaw:0.04,min_speed:5.0,desc:'Highway cruising'}
+highway:{acc:0.08,acc_exit:0.04,brake:0.15,brake_exit:0.07,lat:0.10,lat_exit:0.05,yaw:0.04,min_speed:4.0,desc:'Highway cruising'}
};
+// Get presets - prefer calibrated profiles from localStorage, fall back to defaults
+function getPresets(){
+const calib=localStorage.getItem('bb_profiles');
+if(calib){
+try{return JSON.parse(calib).profiles}catch(e){}
+}
+return DEFAULT_PRESETS;
+}
+const PRESETS=getPresets();
+
function fmtTime(ms){const s=Math.floor(ms/1000),m=Math.floor(s/60);return String(m).padStart(2,'0')+':'+String(s%60).padStart(2,'0')}
function resetGMax(){maxL=maxR=maxA=maxB=0;$('maxL').textContent=$('maxR').textContent=$('maxA').textContent=$('maxB').textContent='0.0'}
@@ -501,6 +637,29 @@ $('s-yaw').value=p.yaw;$('v-yaw').textContent=p.yaw.toFixed(3);
$('s-minspd').value=p.min_speed;$('v-minspd').textContent=p.min_speed.toFixed(1);
}
+// Get calibration data from localStorage
+// Schema: { profiles: { track: {...}, city: {...}, ... }, lastMode: 'track', date: '...' }
+function getCalibrationData(){
+try{
+const data=JSON.parse(localStorage.getItem('bb_profiles')||'null');
+return data;
+}catch(e){return null}
+}
+function isCalibrated(){
+const data=getCalibrationData();
+return data&&data.profiles&&Object.keys(data.profiles).length>0;
+}
+// Get autotune profile for current preset (used by Custom mode)
+function getAutotuneProfile(){
+const data=getCalibrationData();
+if(data&&data.profiles){
+// Return last calibrated mode's profile, or first available
+const mode=data.lastMode||Object.keys(data.profiles)[0];
+return data.profiles[mode]||null;
+}
+return null;
+}
+
// Select preset and apply
function selectPreset(name){
currentPreset=name;
@@ -512,12 +671,20 @@ b.classList.toggle('active',b.dataset.preset===name);
const isCustom=name==='custom';
$('preset-summary').classList.toggle('hidden',isCustom);
$('cfg-sliders').classList.toggle('show',isCustom);
-// If not custom, apply preset and send to ESP32
+// If not custom, apply preset and send to ESP32 (includes mode switch)
if(!isCustom&&PRESETS[name]){
const p=PRESETS[name];
updateSummary(p);
applyPresetToSliders(p);
-sendSettings(p);
+sendSettings(p,name);
+}else if(isCustom){
+// For custom, try to load from autotune profile
+const at=getAutotuneProfile();
+if(at){
+const p={acc:at.acc,acc_exit:at.acc_exit,brake:at.brake,brake_exit:at.brake_exit,lat:at.lat,lat_exit:at.lat_exit,yaw:at.yaw,min_speed:at.min_speed};
+applyPresetToSliders(p);
+sendSettings(p,'custom');
+}
}
}
@@ -531,10 +698,13 @@ applyPresetToSliders(PRESETS.city);
}
}
-// Send settings to ESP32
-async function sendSettings(p){
+// Send settings to ESP32 (includes mode change for correct NVS slot)
+async function sendSettings(p,mode){
const brake=-Math.abs(p.brake),brake_exit=-Math.abs(p.brake_exit);
try{
+// First switch to target mode if specified
+if(mode){await fetch('/api/settings/set?mode='+mode);await new Promise(r=>setTimeout(r,150))}
+// Then send settings
const url='/api/settings/set?acc='+p.acc+'&acc_exit='+p.acc_exit+'&brake='+brake+'&brake_exit='+brake_exit+'&lat='+p.lat+'&lat_exit='+p.lat_exit+'&yaw='+p.yaw+'&min_speed='+p.min_speed;
await fetch(url);
}catch(e){console.log('Settings send failed:',e)}
@@ -546,10 +716,10 @@ var acc=parseFloat($('s-acc').value),accexit=parseFloat($('s-accexit').value),br
if(accexit>=acc){alert('Accel Exit must be < Accel Entry');return}
if(brakeexit>=brake){alert('Brake Exit must be < Brake Entry');return}
if(latexit>=lat){alert('Lateral Exit must be < Lateral Entry');return}
-// Send
+// Send (with current preset mode for NVS storage)
const p={acc,acc_exit:accexit,brake,brake_exit:brakeexit,lat,lat_exit:latexit,yaw,min_speed:minspd};
try{
-await sendSettings(p);
+await sendSettings(p,currentPreset);
var btn=document.querySelector('.cfg-save');
btn.textContent='Applied';btn.style.background='#10b981';
setTimeout(()=>{btn.textContent='Apply';btn.style.background=''},1500);
@@ -574,6 +744,21 @@ if(Math.abs(s.acc-p.acc)<0.01&&Math.abs(s.lat-p.lat)<0.01&&Math.abs(s.min_speed-
matched=name;break;
}
}
+// Update preset buttons to show calibration status
+const calib=getCalibrationData();
+document.querySelectorAll('.preset-btn:not(.custom)').forEach(btn=>{
+const name=btn.dataset.preset;
+if(calib&&calib.profiles){
+// Show calibrated indicator
+btn.innerHTML=name.charAt(0).toUpperCase()+name.slice(1)+' ●';
+btn.title='Calibrated '+new Date(calib.date).toLocaleDateString();
+}
+});
+// Update custom button
+const customBtn=document.querySelector('.preset-btn.custom');
+if(customBtn){
+customBtn.textContent='Custom';
+}
currentPreset=matched;
// Update UI
document.querySelectorAll('.preset-btn').forEach(b=>{
@@ -716,6 +901,707 @@ update();