diff -urN v147/honeywell6160_web/CHANGELOG.md v148/honeywell6160_web/CHANGELOG.md --- v147/honeywell6160_web/CHANGELOG.md 2026-09-12 02:26:25.000000000 +0000 +++ v148/honeywell6160_web/CHANGELOG.md 2026-09-18 22:35:57.557652561 +0000 @@ -1,3 +1,10 @@ +## v1.4.8 — Delta Patch: Touch auth flow + UtilitarianWave +- TouchCenter DISARM no longer performs a one-tap disarm; it now opens Console Mode and requires a valid code entry. +- TouchCenter arming buttons now honor code-entry arming unless Quick Arm is enabled; when Quick Arm is enabled they still act as quick-arm buttons. +- Added a pending TouchCenter auth flow that routes arm/disarm through Console Mode. +- Message Center overlay now uses the requested count/header wording and shows a no-message placeholder or a formatted message row. +- Applied the UtilitarianWave UI pass: Arimo-first font stack, squared corners, and gradient-free browser UI chrome. + ## v1.4.7 — TouchCenter console / Message Center / lighting / armed-state repair - Console Mode now uses the original 320×240 SWF console face and invisible native-coordinate key hit regions instead of a browser-generated 3×4 button grid. diff -urN v147/honeywell6160_web/TOUCHCENTER_6270_6271CV_AUDIT_v1.4.8.md v148/honeywell6160_web/TOUCHCENTER_6270_6271CV_AUDIT_v1.4.8.md --- v147/honeywell6160_web/TOUCHCENTER_6270_6271CV_AUDIT_v1.4.8.md 1970-01-01 00:00:00.000000000 +0000 +++ v148/honeywell6160_web/TOUCHCENTER_6270_6271CV_AUDIT_v1.4.8.md 2026-09-18 22:35:57.557713121 +0000 @@ -0,0 +1,7 @@ +# TouchCenter 6270 / 6271CV Audit v1.4.8 + +- Converted TouchCenter arm/disarm interactions into a code-authenticated flow. +- DISARM now routes through Console Mode instead of executing on a single tap. +- AWAY/STAY/NIGHT route through Console Mode unless Quick Arm is enabled, in which case they remain quick-arm actions. +- Message Center formatting was tightened to match the requested layout and empty-state wording. +- Applied the UtilitarianWave browser-UI pass: Arimo-first font stack, square corners, and no CSS gradients. diff -urN v147/honeywell6160_web/app.js v148/honeywell6160_web/app.js --- v147/honeywell6160_web/app.js 2026-09-12 02:26:10.000000000 +0000 +++ v148/honeywell6160_web/app.js 2026-09-18 22:35:57.556845688 +0000 @@ -1480,7 +1480,7 @@ const [x,y,w,h]=keyLayout[key];return {left:(x-7)/389*100,top:(y-22)/328*100,width:w/389*100,height:h/328*100}; } - const TOUCH_REV='1.4.7'; + const TOUCH_REV='1.4.8'; const TOUCH_PAGE_LABELS={ home:'Home',security:'Security',messages:'Messages',lights:'Lighting',more:'More Choices',console:'Console Mode',events:'Event Logs',zones:'Zones',modes:'Operating Modes',setup:'Setup' }; @@ -1554,7 +1554,7 @@ const consoleKeys=`
${touchHotKey('1',82,57,63,42)}${touchHotKey('2',150,57,63,42)}${touchHotKey('3',218,57,63,42)}${touchHotKey('4',82,101,63,42)}${touchHotKey('5',150,101,63,42)}${touchHotKey('6',218,101,63,42)}${touchHotKey('7',82,145,63,42)}${touchHotKey('8',150,145,63,42)}${touchHotKey('9',218,145,63,42)}${touchHotKey('*',82,189,63,42,'Star / Ready')}${touchHotKey('0',150,189,63,42)}${touchHotKey('#',218,189,63,42,'Pound')}
`; const page=kp.touchPage||'home'; const shellHotspots=model==='6270'?``:''; - return `
Honeywell ${model==='6271cv'?'6271CV':'6270'} TouchCenter${shellHotspots}
${homeSource}
${securitySource}
${moreSource}
${is6271?touchPositionedButton(model,'home','touch-home','Home',sg.home):''}${is6271?touchPositionedButton(model,'back','touch-back','Back',sg.back):''}${touchHotAction('message-play',151,149,57,31,'Play message')}${touchHotAction('message-delete',58,181,57,28,'Delete message')}${touchHotAction('message-stop',151,181,57,28,'Stop')}${touchHotAction('message-record',243,181,57,28,'Record message')}
${sourceHeader}
Garage Door${activate}
Basement
Light${on}${off}
Porch Light${on}${off}
Backyard
Light${on}${off}
${sourceFooter}
${consoleKeys}
${sourceHeader}
${sourceHeader}
${refresh}
${sourceFooter}
${sourceHeader}
${sourceFooter}
${sourceHeader}
${sourceFooter}
`; + return `
Honeywell ${model==='6271cv'?'6271CV':'6270'} TouchCenter${shellHotspots}
${homeSource}
${securitySource}
${moreSource}
${is6271?touchPositionedButton(model,'home','touch-home','Home',sg.home):''}${is6271?touchPositionedButton(model,'back','touch-back','Back',sg.back):''}${touchHotAction('message-play',151,149,57,31,'Play message')}${touchHotAction('message-delete',58,181,57,28,'Delete message')}${touchHotAction('message-stop',151,181,57,28,'Stop')}${touchHotAction('message-record',243,181,57,28,'Record message')}
${sourceHeader}
Garage Door${activate}
Basement
Light${on}${off}
Porch Light${on}${off}
Backyard
Light${on}${off}
${sourceFooter}
${consoleKeys}
${sourceHeader}
${sourceHeader}
${refresh}
${sourceFooter}
${sourceHeader}
${sourceFooter}
${sourceHeader}
${sourceFooter}
`; } function touchNowString(){return new Date().toLocaleTimeString(undefined,{hour:'2-digit',minute:'2-digit'});} function touchSourceDateString(){return new Date().toLocaleString(undefined,{month:'numeric',day:'numeric',year:'2-digit',hour:'2-digit',minute:'2-digit'});} @@ -1589,6 +1589,8 @@ view.touchRoot.querySelector('.touch-source-security')?.classList.toggle('armed-state',!!(st.arming||st.armed)); if(view.clock)view.clock.textContent=touchNowString(); view.touchRoot.querySelectorAll('.touch-source-status').forEach(el=>el.textContent=touchSourceStatusString()); + const consoleCaption=view.touchRoot.querySelector('.touch-console-caption'); + if(consoleCaption)consoleCaption.textContent=touchPendingPrompt(kp); view.touchRoot.querySelectorAll('.touch-source-date').forEach(el=>el.textContent=touchSourceDateString()); view.shellArmed?.classList.toggle('is-on',!!(st.power&&!st.startup&&(st.armed||st.arming))); view.shellReady?.classList.toggle('is-on',!!(st.power&&!st.startup&&!st.programming&&!st.armed&&!st.arming&&st.ready)); @@ -1603,8 +1605,22 @@ if(view.messageList){ view.messageList.replaceChildren(); const msg=voiceMessageFor(kp.id), count=msg?1:0, countEl=view.touchRoot.querySelector('.touch-message-count'); - if(countEl)countEl.textContent=`Message Center - ${count} message(s)`; - if(msg){const row=document.createElement('div');row.className='touch-message-entry';const d=new Date(msg.createdAt||Date.now());row.textContent=`New 1 ${d.toLocaleDateString()} ${d.toLocaleTimeString([], {hour:'numeric',minute:'2-digit',second:'2-digit'})}`;view.messageList.appendChild(row);} + if(countEl)countEl.textContent=`Message Center - ${count}message(s)`; + if(msg){ + const row=document.createElement('div'); + row.className='touch-message-entry'; + const d=new Date(msg.createdAt||Date.now()); + const dateStr=`${d.getMonth()+1}/${d.getDate()}/${String(d.getFullYear()).slice(-2)}`; + const timeStr=d.toLocaleTimeString([], {hour:'numeric',minute:'2-digit',second:'2-digit'}); + const seconds=Math.max(1,Math.round(((msg.durationMs??msg.duration??5000))/1000)); + row.textContent=`New 1 ${dateStr} ${timeStr} (${seconds} Sec)`; + view.messageList.appendChild(row); + }else{ + const row=document.createElement('div'); + row.className='touch-message-entry touch-message-empty'; + row.textContent='No messages or central-station events.'; + view.messageList.appendChild(row); + } } if(view.eventList){ view.eventList.replaceChildren();const items=monitoringEvents.slice(0,6),total=monitoringEvents.length; @@ -1629,6 +1645,23 @@ if(!st.activeAlarm.has(zone)&&zoneCfg(zone).type!==0)alarm(zone,kind==='fire'?'fire':zoneCfg(zone).type===14?'co':'burg'); } const touchPageHistory=new Map(); + const touchPendingAuth=new Map(); + function clearTouchPendingAuth(keypadId){ + if(keypadId!=null)touchPendingAuth.delete(keypadId); + } + function beginTouchPendingAuth(kp,kind,mode=null){ + if(!kp)return; + touchPendingAuth.set(kp.id,{kind,mode,page:kp.touchPage||'security'}); + resetInput(); + navigateTouchPage(kp,'console'); + } + function touchPendingPrompt(kp){ + const pending=kp?touchPendingAuth.get(kp.id):null; + if(!pending)return ''; + if(pending.kind==='disarm')return 'Enter code to disarm'; + const label={away:'Away',stay:'Stay',night:'Night',max:'Maximum',instant:'Instant'}[pending.mode]||'arm'; + return `Enter code to arm ${label.toLowerCase()}`; + } function navigateTouchPage(kp,page,{clearHistory=false}={}){ if(!kp)return; const current=kp.touchPage||'home'; @@ -1651,21 +1684,21 @@ if(!kp)return; const pageMap={'page-home':'home','page-security':'security','page-messages':'messages','page-lights':'lights','page-more':'more','page-console':'console','page-events':'events','page-zones':'zones','page-modes':'modes','page-setup':'setup'}; if(action==='touch-home'){ - if(!keypadEnabled(kp))return;touchActionBeep(kp);navigateTouchPage(kp,'home',{clearHistory:true});return; + if(!keypadEnabled(kp))return;touchActionBeep(kp);clearTouchPendingAuth(kp.id);navigateTouchPage(kp,'home',{clearHistory:true});return; } if(action==='touch-back'){ - if(!keypadEnabled(kp))return;touchActionBeep(kp);touchGoBack(kp);return; + if(!keypadEnabled(kp))return;touchActionBeep(kp);clearTouchPendingAuth(kp.id);touchGoBack(kp);return; } if(pageMap[action]){ - if(!keypadEnabled(kp))return;touchActionBeep(kp);navigateTouchPage(kp,pageMap[action]);return; + if(!keypadEnabled(kp))return;touchActionBeep(kp);if(pageMap[action]!=='console')clearTouchPendingAuth(kp.id);navigateTouchPage(kp,pageMap[action]);return; } if(!keypadEnabled(kp)&&!['monitoring-center'].includes(action))return; touchActionBeep(kp); if(action==='armed-mode-block'){playAck('single',kp.id);return;} - if(action==='arm-away'){arm('away',{keypadId:kp.id});return;} - if(action==='arm-stay'){arm('stay',{keypadId:kp.id});return;} - if(action==='arm-night'){arm('night',{keypadId:kp.id});return;} - if(action==='disarm'){disarm({keypadId:kp.id});return;} + if(action==='arm-away'){if(config.quickArm)arm('away',{keypadId:kp.id});else beginTouchPendingAuth(kp,'arm','away');return;} + if(action==='arm-stay'){if(config.quickArm)arm('stay',{keypadId:kp.id});else beginTouchPendingAuth(kp,'arm','stay');return;} + if(action==='arm-night'){if(config.quickArm)arm('night',{keypadId:kp.id});else beginTouchPendingAuth(kp,'arm','night');return;} + if(action==='disarm'){beginTouchPendingAuth(kp,'disarm');return;} if(action==='show-faults'){showFaults();return;} if(action==='enter-bypass'){enterBypass();navigateTouchPage(kp,'console');render();return;} if(action==='bypass-all'){if(!quickBypassFaultedZones())temporaryDisplay(config.quickBypass?'NO FAULTED ZONES':'ENABLE *23 QUICK BYP','',1500);return;} @@ -2546,6 +2579,7 @@ function exitWalkTest(){clearWalkTestTimers();st.test=false;st.testMenu=false;} function disarm({clearMemory=false,user=null,keypadId=st.lastInputKeypadId||selectedKeypadId}={}){ + clearTouchPendingAuth(keypadId); const hadArmedState=!!(st.armed||st.arming||st.entryDelay||st.exitDelay||st.activeAlarm.size||st.fire||st.co); const hadMemory=st.alarmMemory.size>0; // A second valid OFF while already disarmed and only alarm memory remains @@ -3473,6 +3507,25 @@ st.input=(st.input+k).slice(-32);clearTimeout(st.inputTimer);st.inputTimer=setTimeout(resetInput,4000); + const pendingTouchAuth=touchPendingAuth.get(keypadId); + if(pendingTouchAuth&&st.input.length>=4){ + const code=st.input.slice(-4),u=userForCode(code); + if(u){ + clearTouchPendingAuth(keypadId); + if(pendingTouchAuth.kind==='disarm'){ + if(!canDisarmWith(u)){codeError('DISARM DENIED');return;} + transmitDuress(u,'DISARM'); + queuePanelResponse('disarm',p=>{const hadMemory=st.alarmMemory.size>0&&!st.activeAlarm.size&&!st.fire;disarm({clearMemory:hadMemory,user:u,keypadId:p.keypadId});},{keypadId}); + return; + } + if(!canArmWith(u)){codeError('ARM DENIED');return;} + const mode=pendingTouchAuth.mode||'stay'; + transmitDuress(u,{away:'ARM AWAY',stay:'ARM STAY',night:'ARM NIGHT',max:'ARM MAXIMUM',instant:'ARM INSTANT'}[mode]||'ARM'); + queuePanelResponse(mode==='stay'?'arm-stay':'arm',p=>arm(p.mode||mode,{userSlot:u.slot,keypadId:p.keypadId}),{mode,userSlot:u.slot,keypadId}); + return; + } + } + // 6160V local controls live in the keypad itself. // #01 record; RECORD [1] ends recording. #03 plays the stored message. // #02 followed by 3/6 changes both message and status volume; #024 toggles Voice Chime. diff -urN v147/honeywell6160_web/index.html v148/honeywell6160_web/index.html --- v147/honeywell6160_web/index.html 2026-09-12 02:26:25.000000000 +0000 +++ v148/honeywell6160_web/index.html 2026-09-18 22:36:27.891443051 +0000 @@ -4,7 +4,7 @@ Vista Emulator DELUXE — VISTA-20P / 6150 / 6160 / 6160V / 6270 / 6271CV - +