Michel2/pybricks-code
1
0
Fork 0
mirror of https://github.com/pybricks/pybricks-code.git synced 2026-09-12 17:45:22 +00:00
Code Issues Releases Activity

firmware/bootloaderInstructions: Group instruction steps.

Browse Source
This commit is contained in:
Laurens Valk
2022-12-15 14:59:36 -06:00
committed by David Lechner
parent e606887319
commit 4a9f2931d4
2 changed files with 63 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/firmware/bootloaderInstructions/BootloaderInstructions.tsx
+39 -21
View File
@@ -206,19 +206,21 @@ const BootloaderInstructions: React.VoidFunctionComponent<
<div className="pb-spacer" />
<p>
<strong>{i18n.translate('prepare.start')}</strong>
<strong>{i18n.translate('instructionGroup.prepare.title')}</strong>
</p>
<ol className="firstList">
<li>
{i18n.translate(
hubHasUSB(hubType) ? 'prepare.usb' : 'prepare.batteries',
hubHasUSB(hubType)
? 'instructionGroup.prepare.usb'
: 'instructionGroup.prepare.batteries',
)}
</li>
<li>{i18n.translate('prepare.turnOff')}</li>
<li>{i18n.translate('instructionGroup.prepare.turnOff')}</li>
{/* For non-usb recovery, show step about official app */}
{recovery && !hubHasUSB(hubType) ? (
<li>
{i18n.translate('prepare.app', {
{i18n.translate('instructionGroup.prepare.app', {
lego: legoRegisteredTrademark,
})}
</li>
@@ -227,7 +229,9 @@ const BootloaderInstructions: React.VoidFunctionComponent<
)}
</ol>
<p>
<strong>{i18n.translate('step.start')}</strong>
<strong>
{i18n.translate('instructionGroup.bootloaderMode.title')}
</strong>
</p>
<ol className="continuedList">
{/* City hub has power issues and requires disconnecting motors/sensors */}
@@ -237,7 +241,7 @@ const BootloaderInstructions: React.VoidFunctionComponent<
activeStep === 'disconnect-io' && 'pb-active-step',
)}
>
{i18n.translate('step.disconnectIo')}
{i18n.translate('instructionGroup.bootloaderMode.disconnectIo')}
</li>
)}
@@ -246,7 +250,9 @@ const BootloaderInstructions: React.VoidFunctionComponent<
activeStep === 'hold-button' && 'pb-active-step',
)}
>
{i18n.translate('step.holdButton', { button })}
{i18n.translate('instructionGroup.bootloaderMode.holdButton', {
button,
})}
</li>
{/* not strictly necessary, but order is swapped in the video,
@@ -257,7 +263,7 @@ const BootloaderInstructions: React.VoidFunctionComponent<
activeStep === 'connect-usb' && 'pb-active-step',
)}
>
{i18n.translate('step.connectUsb')}
{i18n.translate('instructionGroup.bootloaderMode.connectUsb')}
</li>
)}
@@ -266,7 +272,7 @@ const BootloaderInstructions: React.VoidFunctionComponent<
activeStep === 'wait-for-light' && 'pb-active-step',
)}
>
{i18n.translate('step.waitForLight', {
{i18n.translate('instructionGroup.bootloaderMode.waitForLight', {
button,
light,
lightPattern,
@@ -279,7 +285,7 @@ const BootloaderInstructions: React.VoidFunctionComponent<
activeStep === 'connect-usb' && 'pb-active-step',
)}
>
{i18n.translate('step.connectUsb')}
{i18n.translate('instructionGroup.bootloaderMode.connectUsb')}
</li>
)}
@@ -289,7 +295,9 @@ const BootloaderInstructions: React.VoidFunctionComponent<
activeStep === 'wait-app-connect' && 'pb-active-step',
)}
>
{i18n.translate('step.waitAppConnect')}
{i18n.translate(
'instructionGroup.bootloaderMode.waitAppConnect',
)}
</li>
)}
@@ -300,9 +308,12 @@ const BootloaderInstructions: React.VoidFunctionComponent<
activeStep === 'release-button' && 'pb-active-step',
)}
>
{i18n.translate('step.releaseButton', {
button,
})}
{i18n.translate(
'instructionGroup.bootloaderMode.releaseButton',
{
button,
},
)}
</li>
) : (
<li
@@ -310,7 +321,7 @@ const BootloaderInstructions: React.VoidFunctionComponent<
activeStep === 'keep-holding' && 'pb-active-step',
)}
>
{i18n.translate('step.keepHolding', {
{i18n.translate('instructionGroup.bootloaderMode.keepHolding', {
button,
})}
</li>
@@ -319,16 +330,21 @@ const BootloaderInstructions: React.VoidFunctionComponent<
{hubHasUSB(hubType) || (!hubHasUSB(hubType) && !recovery) ? (
<>
<p>
<strong>{i18n.translate('connect.start')}</strong>
<strong>
{i18n.translate('instructionGroup.connect.title')}
</strong>
</p>
<ol className="continuedList">
<li>
{i18n.translate('connect.clickConnectAndFlash', {
flashButton: <strong>{flashButtonText}</strong>,
})}
{i18n.translate(
'instructionGroup.connect.clickConnectAndFlash',
{
flashButton: <strong>{flashButtonText}</strong>,
},
)}
</li>
<li>
{i18n.translate('connect.selectDevice', {
{i18n.translate('instructionGroup.connect.selectDevice', {
deviceName: (
<strong>
{bootloaderDeviceNameMap.get(hubType)}
@@ -336,7 +352,9 @@ const BootloaderInstructions: React.VoidFunctionComponent<
),
connectButton: (
<strong>
{i18n.translate('connect.connectButton')}
{i18n.translate(
'instructionGroup.connect.connectButton',
)}
</strong>
),
})}
src/firmware/bootloaderInstructions/translations/en.json
+24 -22
View File
@@ -4,13 +4,6 @@
"windows": " If you have never used Pybricks with USB on Windows, you may need to manually install a USB driver before you can flash the hub firmware.",
"learnMore": "Learn more."
},
"prepare": {
"start": "Preparation:",
"batteries": "Make sure the hub has new or fully-charged batteries.",
"turnOff": "Make sure the hub is turned off.",
"usb": "Disconnect the USB cable.",
"app": "Open the {lego} PoweredUp app in 'Create' mode and start a new project."
},
"button": {
"bluetooth": "Bluetooth button",
"power": "button"
@@ -23,20 +16,29 @@
"bluetooth": "pink-green-blue-off",
"status": "light purple"
},
"step": {
"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.",
"waitForLight": "Wait for the {light} to start blinking {lightPattern}.",
"waitAppConnect": "The app will automatically connect and start restoring the firmware.",
"releaseButton": "Release the {button}.",
"keepHolding": "Keep holding the {button}."
},
"connect": {
"start": "Install:",
"clickConnectAndFlash": "Click the {flashButton} button below.",
"selectDevice": "In the pop-up dialog, select {deviceName} and click {connectButton}.",
"connectButton": "Connect"
"instructionGroup": {
"prepare": {
"title": "Preparation:",
"batteries": "Make sure the hub has new or fully-charged batteries.",
"turnOff": "Make sure the hub is turned off.",
"usb": "Disconnect the USB cable.",
"app": "Open the {lego} PoweredUp app in 'Create' mode and start a new project."
},
"bootloaderMode": {
"title": "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.",
"waitForLight": "Wait for the {light} to start blinking {lightPattern}.",
"waitAppConnect": "The app will automatically connect and start restoring the firmware.",
"releaseButton": "Release the {button}.",
"keepHolding": "Keep holding the {button}."
},
"connect": {
"title": "Install:",
"clickConnectAndFlash": "Click the {flashButton} button below.",
"selectDevice": "In the pop-up dialog, select {deviceName} and click {connectButton}.",
"connectButton": "Connect"
}
}
}