bonamin/bellsystems-cp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: Added NVS Gen on the Flasher

Browse Source
This commit is contained in:
Vasileios Kousaridas
2026-03-27 11:17:10 +02:00
parent 2b05ff8b02
commit 7a5321c097
3 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/manufacturing/router.py
View File

@@ -274,9 +274,10 @@ async def download_nvs(
sn: str, sn: str,
hw_type_override: Optional[str] = Query(None, description="Override hw_type written to NVS (for bespoke firmware)"), hw_type_override: Optional[str] = Query(None, description="Override hw_type written to NVS (for bespoke firmware)"),
hw_revision_override: Optional[str] = Query(None, description="Override hw_revision written to NVS (for bespoke firmware)"), hw_revision_override: Optional[str] = Query(None, description="Override hw_revision written to NVS (for bespoke firmware)"),
nvs_schema: Optional[str] = Query(None, description="NVS schema to use: 'legacy' or 'new' (default)"),
user: TokenPayload = Depends(require_permission("manufacturing", "view")), user: TokenPayload = Depends(require_permission("manufacturing", "view")),
): ):
binary = service.get_nvs_binary(sn, hw_type_override=hw_type_override, hw_revision_override=hw_revision_override) binary = service.get_nvs_binary(sn, hw_type_override=hw_type_override, hw_revision_override=hw_revision_override, legacy=(nvs_schema == "legacy"))
await audit.log_action( await audit.log_action(
admin_user=user.email, admin_user=user.email,
action="device_flashed", action="device_flashed",

3
backend/manufacturing/service.py
View File

@@ -197,12 +197,13 @@ def update_device_status(sn: str, data: DeviceStatusUpdate, set_by: str | None =
return _doc_to_inventory_item(doc_ref.get()) return _doc_to_inventory_item(doc_ref.get())
def get_nvs_binary(sn: str, hw_type_override: str | None = None, hw_revision_override: str | None = None) -> bytes: def get_nvs_binary(sn: str, hw_type_override: str | None = None, hw_revision_override: str | None = None, legacy: bool = False) -> bytes:
item = get_device_by_sn(sn) item = get_device_by_sn(sn)
return generate_nvs_binary( return generate_nvs_binary(
serial_number=item.serial_number, serial_number=item.serial_number,
hw_family=hw_type_override if hw_type_override else item.hw_type, hw_family=hw_type_override if hw_type_override else item.hw_type,
hw_revision=hw_revision_override if hw_revision_override else item.hw_version, hw_revision=hw_revision_override if hw_revision_override else item.hw_version,
legacy=legacy,
) )

42
frontend/src/manufacturing/ProvisioningWizard.jsx
View File

@@ -851,6 +851,7 @@ function StepFlash({ device, bespokeOverride, onFlashed }) {
const [serial, setSerial] = useState([]); const [serial, setSerial] = useState([]);
const [serialAutoScroll, setSerialAutoScroll] = useState(true); const [serialAutoScroll, setSerialAutoScroll] = useState(true);
const [error, setError] = useState(""); const [error, setError] = useState("");
const [nvsSchema, setNvsSchema] = useState("new");
const loaderRef = useRef(null); const loaderRef = useRef(null);
const portRef = useRef(null); const portRef = useRef(null);
@@ -993,9 +994,10 @@ function StepFlash({ device, bespokeOverride, onFlashed }) {
const partUrl = bespokeOverride const partUrl = bespokeOverride
? `/api/manufacturing/devices/${sn}/partitions.bin?hw_type_override=${bespokeOverride.hwFamily}` ? `/api/manufacturing/devices/${sn}/partitions.bin?hw_type_override=${bespokeOverride.hwFamily}`
: `/api/manufacturing/devices/${sn}/partitions.bin`; : `/api/manufacturing/devices/${sn}/partitions.bin`;
const nvsSchemaParam = nvsSchema === "legacy" ? "&nvs_schema=legacy" : "";
const nvsUrl = bespokeOverride const nvsUrl = bespokeOverride
? `/api/manufacturing/devices/${sn}/nvs.bin?hw_type_override=${bespokeOverride.hwFamily}&hw_revision_override=1.0` ? `/api/manufacturing/devices/${sn}/nvs.bin?hw_type_override=${bespokeOverride.hwFamily}&hw_revision_override=1.0${nvsSchemaParam}`
: `/api/manufacturing/devices/${sn}/nvs.bin`; : `/api/manufacturing/devices/${sn}/nvs.bin${nvsSchema === "legacy" ? "?nvs_schema=legacy" : ""}`;
appendLog("Fetching bootloader binary…"); appendLog("Fetching bootloader binary…");
const blBuffer = await fetchBinary(blUrl); const blBuffer = await fetchBinary(blUrl);
@@ -1232,16 +1234,32 @@ function StepFlash({ device, bespokeOverride, onFlashed }) {
</button> </button>
)} )}
{portConnected && !done && ( {portConnected && !done && (
<button <>
onClick={handleStartFlash} <select
className="flex items-center gap-2 px-5 py-2 text-sm rounded-md font-medium hover:opacity-90 transition-opacity cursor-pointer" value={nvsSchema}
style={{ backgroundColor: "var(--btn-primary)", color: "var(--text-white)" }} onChange={(e) => setNvsSchema(e.target.value)}
> disabled={flashing}
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"> className="px-3 py-2 text-sm rounded-md border cursor-pointer font-medium"
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M13 10V3L4 14h7v7l9-11h-7z" /> style={{
</svg> backgroundColor: "var(--bg-input)",
Start Flashing borderColor: "var(--border-primary)",
</button> color: "var(--text-secondary)",
}}
>
<option value="new">NVS: Current Gen</option>
<option value="legacy">NVS: Legacy Gen</option>
</select>
<button
onClick={handleStartFlash}
className="flex items-center gap-2 px-5 py-2 text-sm rounded-md font-medium hover:opacity-90 transition-opacity cursor-pointer"
style={{ backgroundColor: "var(--btn-primary)", color: "var(--text-white)" }}
>
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M13 10V3L4 14h7v7l9-11h-7z" />
</svg>
Start Flashing
</button>
</>
)} )}
</div> </div>
)} )}