diff -urN v149full/honeywell6160_web/CHANGELOG.md v1410/honeywell6160_web/CHANGELOG.md --- v149full/honeywell6160_web/CHANGELOG.md 2026-09-18 22:55:29.648110153 +0000 +++ v1410/honeywell6160_web/CHANGELOG.md 2026-09-18 22:57:08.935218553 +0000 @@ -1,3 +1,9 @@ +## v1.4.10 — Delta Patch: TouchCenter isolation + inline authorization +- Stopped the 6270 monochrome TouchCenter from inheriting 6271CV color-only screen styling and assets. +- Replaced the copied 6271CV Console Mode background on 6270 with a monochrome 6270-native keypad composition. +- Arming/disarming authorization no longer navigates to Console Mode. Code entry stays inline on the Security page. +- AWAY/STAY/NIGHT always request a code; if Quick Arm is enabled, a separate QUICK ARM control appears in the authorization overlay. + ## v1.4.9 — Delta Patch: 6270 Console asset repair - Added the missing `assets/6270/console-bg.png`, which caused the 6270 code-entry screen to render as a white broken-image panel. - Repositioned the TouchCenter auth prompt into the console display area. diff -urN v149full/honeywell6160_web/TOUCHCENTER_6270_6271CV_AUDIT_v1.4.10.md v1410/honeywell6160_web/TOUCHCENTER_6270_6271CV_AUDIT_v1.4.10.md --- v149full/honeywell6160_web/TOUCHCENTER_6270_6271CV_AUDIT_v1.4.10.md 1970-01-01 00:00:00.000000000 +0000 +++ v1410/honeywell6160_web/TOUCHCENTER_6270_6271CV_AUDIT_v1.4.10.md 2026-09-18 22:57:08.935279633 +0000 @@ -0,0 +1,6 @@ +# TouchCenter 6270 / 6271CV Audit v1.4.10 + +- 6270 and 6271CV rendering paths are explicitly separated for color-sensitive utility/status surfaces. +- 6270 Console Mode no longer uses the 6271CV raster. It is composed from 6270-native monochrome key assets. +- Arm/disarm authorization is now an inline Security-page state instead of a page-navigation event. +- Arm actions always request a valid code. Quick Arm is exposed separately when enabled. diff -urN v149full/honeywell6160_web/app.js v1410/honeywell6160_web/app.js --- v149full/honeywell6160_web/app.js 2026-09-18 22:55:29.648249729 +0000 +++ v1410/honeywell6160_web/app.js 2026-09-18 22:57:27.031758135 +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.9'; + const TOUCH_REV='1.4.10'; 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' }; @@ -1521,6 +1521,10 @@ const alt=key==='*'?(model==='6271cv'?'Clear':'Star / Clear'):key==='#'?'Pound':String(label); return ``; } + function touchAuthKeypad(model){ + const nums=['1','2','3','4','5','6','7','8','9']; + return `
${nums.map(k=>touchKeyButton(model,k)).join('')}${touchKeyButton(model,'0')}
`; + } function touchHotKey(key,x,y,w,h,label=key){ return ``; } @@ -1544,7 +1548,7 @@ const homeSource=`
${touchPositionedButton(model,'security','page-security','Security',hg.security)}${touchPositionedButton(model,'lighting','page-lights','Lighting',hg.lighting)}${touchPositionedButton(model,'messages','page-messages','Message',hg.messages)}${sourceFooter}`; - const securitySource=`
${touchPositionedButton(model,'away','arm-away','Arm Away',sg.away)}${touchPositionedButton(model,'stay','arm-stay','Arm Stay',sg.stay)}${touchPositionedButton(model,'night','arm-night','Arm Night',sg.night)}${touchPositionedButton(model,'more','page-more','More Choices',sg.more)}
${touchPositionedButton(model,'away','armed-mode-block','Away',sg.away)}${touchPositionedButton(model,'stay','armed-mode-block','Stay',sg.stay)}${touchPositionedButton(model,'night','armed-mode-block','Night',sg.night)}${touchPositionedButton(model,'disarm','disarm','Disarm',[167,92,116,46])}${touchPositionedButton(model,'more','page-more','More Choices',[167,141,116,46])}
All Zones MonitoredEntry Delay Active
${is6271?touchPositionedButton(model,'home','touch-home','Home',sg.home):''}${is6271?touchPositionedButton(model,'back','touch-back','Back',sg.back):''}${sourceFooter}`; + const securitySource=`
${touchPositionedButton(model,'away','arm-away','Arm Away',sg.away)}${touchPositionedButton(model,'stay','arm-stay','Arm Stay',sg.stay)}${touchPositionedButton(model,'night','arm-night','Arm Night',sg.night)}${touchPositionedButton(model,'more','page-more','More Choices',sg.more)}
${touchPositionedButton(model,'away','armed-mode-block','Away',sg.away)}${touchPositionedButton(model,'stay','armed-mode-block','Stay',sg.stay)}${touchPositionedButton(model,'night','armed-mode-block','Night',sg.night)}${touchPositionedButton(model,'disarm','disarm','Disarm',[167,92,116,46])}${touchPositionedButton(model,'more','page-more','More Choices',[167,141,116,46])}
All Zones MonitoredEntry Delay Active
${touchAuthKeypad(model)}
${is6271?touchPositionedButton(model,'home','touch-home','Home',sg.home):''}${is6271?touchPositionedButton(model,'back','touch-back','Back',sg.back):''}${sourceFooter}`; // IMPORTANT: this is deliberately NOT a CSS grid. The previous version // packed unrelated source controls into an invented 3x3 dashboard. The @@ -1552,9 +1556,11 @@ const moreSource=`
${sourceHeader}${touchPositionedButton(model,'show-zones','page-zones','Show Zones',mg.zones)}${touchPositionedButton(model,'console','page-console','Console Mode',mg.console)}${touchPositionedButton(model,'event-logs','page-events','Event Logs',mg.events)}${touchPositionedButton(model,'operating-modes','page-modes','Operating Modes',mg.modes)}${touchPositionedButton(model,'setup','page-setup','Setup',mg.setup)}${sourceFooter}`; 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 monoConsoleKeys=`
${['1','2','3','4','5','6','7','8','9','*','0','#'].map(k=>touchKeyButton(model,k)).join('')}
`; + const consoleSource=is6271?`${consoleKeys}`:`
CONSOLE MODE
${touchSourceStatusString()}
${monoConsoleKeys}
`; 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}
${consoleSource}
${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,8 +1595,15 @@ 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); + const monoConsoleStatus=view.touchRoot.querySelector('.touch-mono-console-status');if(monoConsoleStatus)monoConsoleStatus.textContent=touchSourceStatusString(); + const auth=touchPendingAuth.get(kp.id),authOverlay=view.touchRoot.querySelector('.touch-auth-overlay'); + if(authOverlay){ + authOverlay.classList.toggle('is-active',!!auth); + const title=authOverlay.querySelector('.touch-auth-title'),digits=authOverlay.querySelector('.touch-auth-digits'),quick=authOverlay.querySelector('.touch-auth-quick'); + if(title)title.textContent=auth?touchPendingPrompt(kp):''; + if(digits)digits.textContent=auth?'•'.repeat(Math.min(4,st.input.length)):''; + if(quick){quick.hidden=!(auth?.kind==='arm'&&config.quickArm);quick.textContent=auth?.kind==='arm'?`QUICK ${String(auth.mode||'ARM').toUpperCase()}`:'QUICK ARM';} + } 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)); @@ -1653,7 +1666,9 @@ if(!kp)return; touchPendingAuth.set(kp.id,{kind,mode,page:kp.touchPage||'security'}); resetInput(); - navigateTouchPage(kp,'console'); + kp.touchPage='security'; + saveSettings(); + updateTouchscreenViews(); } function touchPendingPrompt(kp){ const pending=kp?touchPendingAuth.get(kp.id):null; @@ -1694,10 +1709,16 @@ } if(!keypadEnabled(kp)&&!['monitoring-center'].includes(action))return; touchActionBeep(kp); + if(action==='auth-cancel'){clearTouchPendingAuth(kp.id);resetInput();updateTouchscreenViews();return;} + if(action==='auth-quick-arm'){ + const pending=touchPendingAuth.get(kp.id); + if(!pending||pending.kind!=='arm'||!config.quickArm){playAck('single',kp.id);return;} + const mode=pending.mode||'stay';clearTouchPendingAuth(kp.id);resetInput();arm(mode,{keypadId:kp.id});return; + } if(action==='armed-mode-block'){playAck('single',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==='arm-away'){beginTouchPendingAuth(kp,'arm','away');return;} + if(action==='arm-stay'){beginTouchPendingAuth(kp,'arm','stay');return;} + if(action==='arm-night'){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;} @@ -3491,6 +3512,9 @@ // a later valid code+command suffix is recognized immediately. STAR is the // documented "I made a mistake" escape: with an entry in progress it clears // the entry; with no entry pending it keeps its normal fault-display job. + if(k==='*'&&touchPendingAuth.has(keypadId)){ + resetInput();updateTouchscreenViews();return; + } if(k==='*'){ if(kp?.model==='6160v' && st.input==='#0'){ st.input='#0*';clearTimeout(st.inputTimer);st.inputTimer=setTimeout(resetInput,10000); @@ -3508,22 +3532,26 @@ 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(pendingTouchAuth){ + if(st.input.length>=4){ + const code=st.input.slice(-4),u=userForCode(code); + if(u){ + clearTouchPendingAuth(keypadId); + resetInput(); + if(pendingTouchAuth.kind==='disarm'){ + if(!canDisarmWith(u)){codeError('DISARM DENIED');updateTouchscreenViews();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}); + updateTouchscreenViews();return; + } + if(!canArmWith(u)){codeError('ARM DENIED');updateTouchscreenViews();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}); + updateTouchscreenViews();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; } + updateTouchscreenViews();return; } // 6160V local controls live in the keypad itself. diff -urN v149full/honeywell6160_web/index.html v1410/honeywell6160_web/index.html --- v149full/honeywell6160_web/index.html 2026-09-18 22:55:29.648448453 +0000 +++ v1410/honeywell6160_web/index.html 2026-09-18 22:57:08.935159656 +0000 @@ -4,7 +4,7 @@ Vista Emulator DELUXE — VISTA-20P / 6150 / 6160 / 6160V / 6270 / 6271CV - +