Shopfloor images: add Wax/Trace + Keyence per-model variants
Wax/Trace (gea-shopfloor-waxtrace): - captured/ holds master FormTracePak v6.0 state (Program Files reg dump gzipped, ARP entries) taken from a win11 VM where the CD-ROM-bound VB6 wrapper was driven to completion. xcopy + reg-import replays the install on real bays without running the wrapper itself. - 09-Setup-WaxAndTrace.ps1 rewrites the stub: installs prereqs via manifest (VC++ 2008/2017 x86+x64, Sentinel HASP), expands the captured zips into C:\Program Files (x86)\MitutoyoApp + C:\MitutoyoApp, imports the reg hive, then mounts the bay's per-machine cal ISO (matched by asset tag in machine-number.txt) and runs its Setup.exe. - waxtrace-manifest.json lists the 5 prereqs with InstallShield-style silent flags verified on the win11 VM. - sync-waxtrace.sh ships captured-binary/ + prereqs + cal ISOs from /home/camp/pxe-images/iso/mitutoyo-cal/ to /srv/samba/enrollment/installers-post/waxtrace/ on the PXE box. - select-waxtrace-asset.ps1 arrow-key bay picker for WinPE (parses INDEX.csv from the cal share, offers "Other (new bay)" fallback). - startnet.cmd: prompt_waxtrace_asset prompt, skip_waxtrace_stage xcopy block (mirrors :skip_cmm_stage), machine-number.txt write covers bay asset tag (WJRP*). Keyence (gea-shopfloor-keyence) - now multi-model: - vr3000/manifest.json + vr5000/manifest.json + vr6000/manifest.json (current single-model VR-6000 moved into vr6000/ subdir). Each ships the model's MSI silent-install + DetectionPath via ProductCode. Big payloads (Data1.cab, Data11.cab) gitignored, staged via sync-keyence.sh from /home/camp/pxe-images/iso/keyence/. - 09-Setup-Keyence.ps1 dispatches by C:\Enrollment\keyence-model.txt (written by startnet.cmd in :keyence_submenu) and points InstallerRoot at C:\KeyenceInstall\<model>. DXSETUP probe widened to all three Program Files paths (VR-3000 G2, VR-5000, VR-6000). - startnet.cmd: :keyence_submenu picks vr3000/vr5000/vr6000, :skip_keyence_stage xcopy block selectively stages chosen model bundle, pc-subtype.txt also written = drops directly into existing GE-Enforce PCSubType wiring (looks for gea-shopfloor-keyence-<model>\manifest.json on the tsgwp00525 share for ongoing enforcement, no dispatcher change needed). - sync-keyence.sh mirrors sync-waxtrace.sh pattern. Verified silent MSI install for VR-3000 G2 v2.5.0 and VR-5000 v3.3.1 on the win11 VM 2026-05-18 with /qn /norestart ALLUSERS=1 REBOOT=ReallySuppress TRANSFORMS=1033.mst. boot.wim on 172.16.9.1 wimupdate'd with the new startnet.cmd. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
cproudlock
@@ -66,7 +66,7 @@ echo.
|
||||
echo 1. Machine with Collections (eDNC + UDC + Plant Apps)
|
||||
echo 2. Machine without Collections (eDNC + Plant Apps, no UDC)
|
||||
echo 3. Common (Timeclock, Lab; WJ Shopfloor only)
|
||||
echo 4. Keyence (VR-6000 microscope/profilometer)
|
||||
echo 4. Keyence (VR-3000 / VR-5000 / VR-6000 microscope)
|
||||
echo 5. CMM (Hexagon PC-DMIS + Protect Viewer)
|
||||
echo 6. Genspect
|
||||
echo 7. Heattreat (placeholder)
|
||||
@@ -86,6 +86,27 @@ if "%ges_choice%"=="8" set PCTYPE=gea-shopfloor-waxtrace
|
||||
if "%ges_choice%"=="9" set PCTYPE=gea-shopfloor-display
|
||||
if "%PCTYPE%"=="" goto gea_shopfloor_submenu
|
||||
if "%PCTYPE%"=="gea-shopfloor-display" goto display_submenu
|
||||
if "%PCTYPE%"=="gea-shopfloor-keyence" goto keyence_submenu
|
||||
goto enroll_menu
|
||||
|
||||
:keyence_submenu
|
||||
cls
|
||||
echo.
|
||||
echo ========================================
|
||||
echo Keyence Model
|
||||
echo ========================================
|
||||
echo.
|
||||
echo 1. VR-3000 G2 (older microscope/profilometer line)
|
||||
echo 2. VR-5000 (mid-range)
|
||||
echo 3. VR-6000 (current line)
|
||||
echo.
|
||||
set KEYENCEMODEL=
|
||||
set /p kmod_choice=Enter your choice (1-3):
|
||||
if "%kmod_choice%"=="1" set KEYENCEMODEL=vr3000
|
||||
if "%kmod_choice%"=="2" set KEYENCEMODEL=vr5000
|
||||
if "%kmod_choice%"=="3" set KEYENCEMODEL=vr6000
|
||||
if "%KEYENCEMODEL%"=="" goto keyence_submenu
|
||||
echo Keyence model: %KEYENCEMODEL%
|
||||
goto enroll_menu
|
||||
|
||||
:display_submenu
|
||||
@@ -150,16 +171,32 @@ REM vs Dashboard to choose installer + Get-PCProfile builds Display-{type}
|
||||
REM profile key.
|
||||
set PCSUBTYPE=
|
||||
|
||||
REM --- Machine number (collections + nocollections only; other variants don't use one) ---
|
||||
REM --- Machine number / asset tag (only PC types that key per-machine config) ---
|
||||
REM collections + nocollections = 4-digit machine number for shopfloor identification.
|
||||
REM waxtrace = asset tag like WJRP2335 used to match per-machine cal ISO during
|
||||
REM 09-Setup-WaxAndTrace.ps1. Cal ISO files are named
|
||||
REM CAL-{asset_tag}_serial-*_probe-*.iso.
|
||||
set MACHINENUM=9999
|
||||
if /i "%PCTYPE%"=="gea-shopfloor-collections" goto prompt_machinenum
|
||||
if /i "%PCTYPE%"=="gea-shopfloor-nocollections" goto prompt_machinenum
|
||||
if /i "%PCTYPE%"=="gea-shopfloor-waxtrace" goto prompt_waxtrace_asset
|
||||
goto skip_machinenum
|
||||
:prompt_machinenum
|
||||
echo.
|
||||
set /p MACHINENUM=Enter machine number (digits, or Enter for 9999):
|
||||
if "%MACHINENUM%"=="" set MACHINENUM=9999
|
||||
echo Machine number: %MACHINENUM%
|
||||
goto skip_machinenum
|
||||
:prompt_waxtrace_asset
|
||||
echo.
|
||||
echo Wax/Trace bays use the asset tag (e.g. WJRP2335) to pick the right
|
||||
echo calibration ISO during shopfloor setup.
|
||||
set /p MACHINENUM=Enter asset tag (e.g. WJRP2335):
|
||||
if "%MACHINENUM%"=="" (
|
||||
echo WARNING: no asset tag entered - calibration apply will be skipped.
|
||||
set MACHINENUM=
|
||||
)
|
||||
echo Asset tag: %MACHINENUM%
|
||||
:skip_machinenum
|
||||
|
||||
REM --- Map enrollment share early (kept open for copy after imaging) ---
|
||||
@@ -311,6 +348,13 @@ REM Install-KioskApp.cmd reads it to pick Lobby vs Dashboard installer
|
||||
REM and Get-PCProfile.ps1 reads it to build the Display-{type} profile key.
|
||||
if not "%DISPLAYTYPE%"=="" echo %DISPLAYTYPE%> W:\Enrollment\display-type.txt
|
||||
if not "%MACHINENUM%"=="" echo %MACHINENUM%> W:\Enrollment\machine-number.txt
|
||||
REM Keyence model goes to BOTH keyence-model.txt (read by 09-Setup-Keyence) AND
|
||||
REM pc-subtype.txt (read by GE-Enforce for per-model dispatch via existing
|
||||
REM PCSubType wiring: looks for gea-shopfloor-keyence-<model>\manifest.json on share).
|
||||
if not "%KEYENCEMODEL%"=="" (
|
||||
echo %KEYENCEMODEL%> W:\Enrollment\keyence-model.txt
|
||||
echo %KEYENCEMODEL%> W:\Enrollment\pc-subtype.txt
|
||||
)
|
||||
copy /Y "Y:\shopfloor-setup\Run-ShopfloorSetup.ps1" "W:\Enrollment\Run-ShopfloorSetup.ps1"
|
||||
REM --- Always copy Shopfloor baseline scripts ---
|
||||
mkdir W:\Enrollment\shopfloor-setup 2>NUL
|
||||
@@ -377,6 +421,41 @@ if exist "Y:\installers-post\cmm\cmm-manifest.json" (
|
||||
echo WARNING: Y:\cmm-installers not found - CMM PC cannot install Hexagon apps at imaging time.
|
||||
)
|
||||
:skip_cmm_stage
|
||||
|
||||
REM --- Stage Keyence per-model bootstrap bundle (Keyence PCs only) ---
|
||||
REM Copies only the selected model's MSI + Data cabs from the PXE enrollment
|
||||
REM share to the target disk. installers-post/keyence/<model>/ contains:
|
||||
REM manifest.json
|
||||
REM installers/{MSI, Data1.cab, [Data11.cab for vr3000], 1033.mst}
|
||||
REM drivers/ (vr6000 only - older external .inf; vr3000/vr5000 drivers
|
||||
REM are embedded in their MSIs)
|
||||
REM 09-Setup-Keyence.ps1 reads C:\Enrollment\keyence-model.txt to know which.
|
||||
if /i not "%PCTYPE%"=="gea-shopfloor-keyence" goto skip_keyence_stage
|
||||
if "%KEYENCEMODEL%"=="" goto skip_keyence_stage
|
||||
if exist "Y:\installers-post\keyence\%KEYENCEMODEL%\manifest.json" (
|
||||
mkdir W:\KeyenceInstall 2>NUL
|
||||
mkdir W:\KeyenceInstall\%KEYENCEMODEL% 2>NUL
|
||||
xcopy /E /Y /I "Y:\installers-post\keyence\%KEYENCEMODEL%" "W:\KeyenceInstall\%KEYENCEMODEL%\"
|
||||
echo Staged Keyence %KEYENCEMODEL% bootstrap to W:\KeyenceInstall\%KEYENCEMODEL%\.
|
||||
) else (
|
||||
echo WARNING: Y:\installers-post\keyence\%KEYENCEMODEL% not found - Keyence %KEYENCEMODEL% cannot install at imaging time.
|
||||
)
|
||||
:skip_keyence_stage
|
||||
|
||||
REM --- Stage WaxTrace bootstrap bundle (wax/trace gea-shopfloor-waxtrace only) ---
|
||||
REM Copies the FormTracePak master capture (~110 MB compressed) + HASP +
|
||||
REM VC++ redists + per-machine cal ISOs from the enrollment share onto the
|
||||
REM target disk so 09-Setup-WaxAndTrace.ps1 can install FormTracePak via
|
||||
REM xcopy + reg-import (bypassing Mitutoyo's CD-ROM-bound VB6 wrapper).
|
||||
if /i not "%PCTYPE%"=="gea-shopfloor-waxtrace" goto skip_waxtrace_stage
|
||||
if exist "Y:\installers-post\waxtrace\waxtrace-manifest.json" (
|
||||
mkdir W:\WaxTrace-Install 2>NUL
|
||||
xcopy /E /Y /I "Y:\installers-post\waxtrace" "W:\WaxTrace-Install\"
|
||||
echo Staged WaxTrace bootstrap to W:\WaxTrace-Install.
|
||||
) else (
|
||||
echo WARNING: Y:\installers-post\waxtrace not found - WaxTrace PC cannot install FormTracePak at imaging time.
|
||||
)
|
||||
:skip_waxtrace_stage
|
||||
:pctype_done
|
||||
|
||||
REM --- BIOS update sub-stage push (fires AFTER W: copies complete) ---
|
||||
|
||||
Reference in New Issue
Block a user