mirror of
https://github.com/pybricks/pybricks-code.git
synced 2026-09-15 11:04:49 +00:00
firmware/bootloaderInstructions: Refactor.
- Use steps for the connection procedure - Use categories (To do: consider making numbering consecutive) - Show hub bootloader device name explicitly - List official app to use for recovery (make V2/V3 explicit) - Copy edit Also fix the layout (class) of the installation panel to make it consistent with the style of the recovery panel.
This commit is contained in:
Laurens Valk
committed by
David Lechner
David Lechner
parent
560da418e0
commit
8aa82eee46
@@ -43,8 +43,21 @@ type BootloaderInstructionsProps = {
|
||||
* @default false
|
||||
*/
|
||||
recovery?: boolean;
|
||||
/**
|
||||
* Flash button name that can be referenced in the instructions.
|
||||
*/
|
||||
flashButtonText: string;
|
||||
};
|
||||
|
||||
const bootloaderDeviceNameMap: ReadonlyMap<Hub, string> = new Map([
|
||||
[Hub.City, 'LEGO Bootloader'],
|
||||
[Hub.Essential, 'LEGO Technic Small Hub in DFU Mode'],
|
||||
[Hub.Inventor, 'LEGO Technic Large Hub in DFU Mode'],
|
||||
[Hub.Move, 'LEGO Bootloader'],
|
||||
[Hub.Prime, 'LEGO Technic Large Hub in DFU Mode'],
|
||||
[Hub.Technic, 'LEGO Bootloader'],
|
||||
]);
|
||||
|
||||
const videoFileMap: ReadonlyMap<Hub, string> = new Map([
|
||||
[Hub.City, cityHubMp4],
|
||||
[Hub.Essential, essentialHubMp4],
|
||||
@@ -86,10 +99,10 @@ const recoveryMetadataFileMap: ReadonlyMap<Hub, string> = new Map([
|
||||
*/
|
||||
const BootloaderInstructions: React.VoidFunctionComponent<
|
||||
BootloaderInstructionsProps
|
||||
> = ({ hubType, recovery }) => {
|
||||
> = ({ hubType, recovery, flashButtonText }) => {
|
||||
const i18n = useI18n();
|
||||
|
||||
const { button, light, lightPattern } = useMemo(() => {
|
||||
const { button, light, lightPattern, flashButton } = useMemo(() => {
|
||||
return {
|
||||
button: i18n.translate(
|
||||
hubHasBluetoothButton(hubType) ? 'button.bluetooth' : 'button.power',
|
||||
@@ -102,6 +115,7 @@ const BootloaderInstructions: React.VoidFunctionComponent<
|
||||
? 'lightPattern.bluetooth'
|
||||
: 'lightPattern.status',
|
||||
),
|
||||
flashButton: flashButtonText,
|
||||
};
|
||||
}, [i18n, hubType]);
|
||||
|
||||
@@ -192,38 +206,31 @@ const BootloaderInstructions: React.VoidFunctionComponent<
|
||||
|
||||
<div className="pb-spacer" />
|
||||
|
||||
<p>{i18n.translate('prepare.start')}</p>
|
||||
<p>
|
||||
<strong>{i18n.translate('prepare.start')}</strong>
|
||||
</p>
|
||||
<ol>
|
||||
{hubHasUSB(hubType) ? (
|
||||
<>
|
||||
<li>{i18n.translate('prepare.usb')}</li>
|
||||
<li>{i18n.translate('prepare.turnOff')}</li>
|
||||
</>
|
||||
<li>
|
||||
{i18n.translate(
|
||||
hubHasUSB(hubType) ? 'prepare.usb' : 'prepare.batteries',
|
||||
)}
|
||||
</li>
|
||||
<li>{i18n.translate('prepare.turnOff')}</li>
|
||||
{/* For non-usb recovery, show step about official app */}
|
||||
{recovery && !hubHasUSB(hubType) ? (
|
||||
<li>
|
||||
{i18n.translate('prepare.app', {
|
||||
lego: legoRegisteredTrademark,
|
||||
})}
|
||||
</li>
|
||||
) : (
|
||||
<>
|
||||
{recovery ? (
|
||||
<>
|
||||
<li>
|
||||
{i18n.translate('prepare.batteries')}{' '}
|
||||
{i18n.translate('prepare.turnOff')}
|
||||
</li>
|
||||
<li>
|
||||
{i18n.translate('prepare.app', {
|
||||
lego: legoRegisteredTrademark,
|
||||
})}
|
||||
</li>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<li>{i18n.translate('prepare.batteries')}</li>
|
||||
<li>{i18n.translate('prepare.turnOff')}</li>
|
||||
</>
|
||||
)}
|
||||
</>
|
||||
<></>
|
||||
)}
|
||||
</ol>
|
||||
<p>{i18n.translate('step.start')}</p>
|
||||
<ol start={3}>
|
||||
<p>
|
||||
<strong>{i18n.translate('step.start')}</strong>
|
||||
</p>
|
||||
<ol>
|
||||
{/* City hub has power issues and requires disconnecting motors/sensors */}
|
||||
{hubType === Hub.City && (
|
||||
<li
|
||||
@@ -310,6 +317,36 @@ const BootloaderInstructions: React.VoidFunctionComponent<
|
||||
</li>
|
||||
)}
|
||||
</ol>
|
||||
{hubHasUSB(hubType) || (!hubHasUSB(hubType) && !recovery) ? (
|
||||
<>
|
||||
<p>
|
||||
<strong>{i18n.translate('connect.start')}</strong>
|
||||
</p>
|
||||
<ol>
|
||||
<li>
|
||||
{i18n.translate('connect.clickConnectAndFlash', {
|
||||
flashButton: <strong>{flashButton}</strong>,
|
||||
})}
|
||||
</li>
|
||||
<li>
|
||||
{i18n.translate('connect.selectDevice', {
|
||||
deviceName: (
|
||||
<strong>
|
||||
{bootloaderDeviceNameMap.get(hubType)}
|
||||
</strong>
|
||||
),
|
||||
connectButton: (
|
||||
<strong>
|
||||
{i18n.translate('connect.connectButton')}
|
||||
</strong>
|
||||
),
|
||||
})}
|
||||
</li>
|
||||
</ol>
|
||||
</>
|
||||
) : (
|
||||
<></>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"learnMore": "Learn more."
|
||||
},
|
||||
"prepare": {
|
||||
"start": "Now place the hub in update mode. To prepare:",
|
||||
"start": "Preparation:",
|
||||
"batteries": "Make sure the hub has fresh batteries.",
|
||||
"turnOff": "Make sure the hub is turned off.",
|
||||
"usb": "Disconnect the USB cable.",
|
||||
@@ -24,7 +24,7 @@
|
||||
"status": "light purple"
|
||||
},
|
||||
"step": {
|
||||
"start": "Now follow these steps:",
|
||||
"start": "Enter update mode (see video):",
|
||||
"disconnectIo": "Disconnect any device from port A on the hub.",
|
||||
"holdButton": "Press and hold the {button} on the hub.",
|
||||
"connectUsb": "Connect the USB cable.",
|
||||
@@ -32,5 +32,11 @@
|
||||
"waitAppConnect": "The app will automatically connect and start restoring the firmware.",
|
||||
"releaseButton": "Release the {button}.",
|
||||
"keepHolding": "Keep holding the {button}."
|
||||
},
|
||||
"connect": {
|
||||
"start": "Activate the connection:",
|
||||
"clickConnectAndFlash": "Click the {flashButton} button below.",
|
||||
"selectDevice": "In the pop-up dialog, select {deviceName} and click {connectButton}.",
|
||||
"connectButton": "Connect"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user