diff --git a/package.json b/package.json
index 145e10372cc509b0cb76ce406cecadcdbcf106cc..27d80a6410f9beaea97855459de09ef70b8fcea4 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
"scratch-render": "0.1.0-prerelease.20180907144714",
"scratch-storage": "1.0.2",
"scratch-svg-renderer": "0.2.0-prerelease.20180907141232",
- "scratch-vm": "0.2.0-prerelease.20180906133035",
+ "scratch-vm": "0.2.0-prerelease.20180907210751",
"selenium-webdriver": "3.6.0",
"startaudiocontext": "1.2.1",
"style-loader": "^0.23.0",
diff --git a/src/components/connection-modal/auto-scanning-step.jsx b/src/components/connection-modal/auto-scanning-step.jsx
index 623bbdd02aa904ee4d0e60606a80ccd0aa1d2225..a73c0b58db974d065bc2d3372cee0c43595ad8ec 100644
--- a/src/components/connection-modal/auto-scanning-step.jsx
+++ b/src/components/connection-modal/auto-scanning-step.jsx
@@ -45,8 +45,8 @@ const AutoScanningStep = props => (
src={radarIcon}
/>
<img
- className={styles.deviceButtonImage}
- src={props.deviceButtonImage}
+ className={styles.peripheralButtonImage}
+ src={props.peripheralButtonImage}
/>
</React.Fragment>
)}
@@ -55,7 +55,7 @@ const AutoScanningStep = props => (
<FormattedMessage
defaultMessage="No devices found"
description="Text shown when no devices could be found"
- id="gui.connection.auto-scanning.noDevicesFound"
+ id="gui.connection.auto-scanning.noPeripheralsFound"
/>
</Box>
)}
@@ -139,9 +139,9 @@ const AutoScanningStep = props => (
);
AutoScanningStep.propTypes = {
- deviceButtonImage: PropTypes.string,
onRefresh: PropTypes.func,
onStartScan: PropTypes.func,
+ peripheralButtonImage: PropTypes.string,
phase: PropTypes.oneOf(Object.keys(PHASES))
};
diff --git a/src/components/connection-modal/connected-step.jsx b/src/components/connection-modal/connected-step.jsx
index c02f644bc4e55d807124bd8cc41004a98cdca24b..aa71c63c8a11730b8a30379de6112a2be98150d4 100644
--- a/src/components/connection-modal/connected-step.jsx
+++ b/src/components/connection-modal/connected-step.jsx
@@ -12,10 +12,10 @@ const ConnectedStep = props => (
<Box className={styles.body}>
<Box className={styles.activityArea}>
<Box className={styles.centeredRow}>
- <div className={styles.deviceActivity}>
+ <div className={styles.peripheralActivity}>
<img
- className={styles.deviceActivityIcon}
- src={props.deviceImage}
+ className={styles.peripheralActivityIcon}
+ src={props.peripheralImage}
/>
<img
className={styles.bluetoothConnectedIcon}
@@ -63,9 +63,9 @@ const ConnectedStep = props => (
);
ConnectedStep.propTypes = {
- deviceImage: PropTypes.string.isRequired,
onCancel: PropTypes.func,
- onDisconnect: PropTypes.func
+ onDisconnect: PropTypes.func,
+ peripheralImage: PropTypes.string.isRequired
};
export default ConnectedStep;
diff --git a/src/components/connection-modal/connecting-step.jsx b/src/components/connection-modal/connecting-step.jsx
index be378b3fdd54773f4a1bf9989364a930f9faf433..e4753628677d3f7532b72f9c498823ba38215ce2 100644
--- a/src/components/connection-modal/connecting-step.jsx
+++ b/src/components/connection-modal/connecting-step.jsx
@@ -14,10 +14,10 @@ const ConnectingStep = props => (
<Box className={styles.body}>
<Box className={styles.activityArea}>
<Box className={styles.centeredRow}>
- <div className={styles.deviceActivity}>
+ <div className={styles.peripheralActivity}>
<img
- className={styles.deviceActivityIcon}
- src={props.deviceImage}
+ className={styles.peripheralActivityIcon}
+ src={props.peripheralImage}
/>
<img
className={styles.bluetoothConnectingIcon}
@@ -61,8 +61,8 @@ const ConnectingStep = props => (
ConnectingStep.propTypes = {
connectingMessage: PropTypes.node.isRequired,
- deviceImage: PropTypes.string.isRequired,
- onDisconnect: PropTypes.func
+ onDisconnect: PropTypes.func,
+ peripheralImage: PropTypes.string.isRequired
};
export default ConnectingStep;
diff --git a/src/components/connection-modal/connection-modal.css b/src/components/connection-modal/connection-modal.css
index 16f337ef460e7a88120f9b5fe49958bdec07ba91..f024489c591456d75b65e6170f1ace7c71748351 100644
--- a/src/components/connection-modal/connection-modal.css
+++ b/src/components/connection-modal/connection-modal.css
@@ -25,14 +25,14 @@
align-items: center;
}
-.device-tile-pane {
+.peripheral-tile-pane {
overflow-y: auto;
width: 100%;
height: 100%;
padding: 0.5rem;
}
-.device-tile {
+.peripheral-tile {
display: flex;
flex-direction: row;
justify-content: space-between;
@@ -46,36 +46,36 @@
margin-bottom: 0.5rem;
}
-.device-tile-name {
+.peripheral-tile-name {
display: flex;
align-items: center;
}
-[dir="ltr"] .device-tile-image {
+[dir="ltr"] .peripheral-tile-image {
margin-right: 0.5rem;
}
-[dir="rtl"] .device-tile-image {
+[dir="rtl"] .peripheral-tile-image {
margin-left: 0.5rem;
}
-.device-tile-name-wrapper {
+.peripheral-tile-name-wrapper {
display: flex;
flex-direction: column;
justify-content: center;
align-items: flex-start;
}
-.device-tile-name-label {
+.peripheral-tile-name-label {
font-weight: bold;
font-size: 0.625rem;
}
-.device-tile-name-text {
+.peripheral-tile-name-text {
font-size: 0.875rem;
}
-.device-tile button {
+.peripheral-tile button {
padding: 0.6rem 0.75rem;
border: none;
border-radius: 0.25rem;
@@ -154,16 +154,16 @@
}
}
-.device-activity {
+.peripheral-activity {
position: relative;
}
-.device-activity-icon {
+.peripheral-activity-icon {
/* width: 80px;
height: 80px; */
}
-.device-button-image {
+.peripheral-button-image {
position: absolute;
}
@@ -214,7 +214,7 @@
box-shadow: 0px 0px 0px 2px $motion-transparent;
}
-.device-tile-widgets {
+.peripheral-tile-widgets {
display: flex;
align-items: center;
}
diff --git a/src/components/connection-modal/connection-modal.jsx b/src/components/connection-modal/connection-modal.jsx
index 6fb9cd4ff98c924e05d0ea5f35ebbf3aa7f1f348..99c9a6a531f9f73344cf5395c49d4f5bb7edaf35 100644
--- a/src/components/connection-modal/connection-modal.jsx
+++ b/src/components/connection-modal/connection-modal.jsx
@@ -27,7 +27,7 @@ const ConnectionModalComponent = props => (
className={styles.modalContent}
contentLabel={props.name}
headerClassName={styles.header}
- headerImage={props.smallDeviceImage}
+ headerImage={props.smallPeripheralImage}
onHelp={props.onHelp}
onRequestClose={props.onCancel}
>
@@ -44,12 +44,12 @@ const ConnectionModalComponent = props => (
ConnectionModalComponent.propTypes = {
connectingMessage: PropTypes.node,
- deviceButtonImage: PropTypes.string,
name: PropTypes.node,
onCancel: PropTypes.func.isRequired,
onHelp: PropTypes.func.isRequired,
+ peripheralButtonImage: PropTypes.string,
phase: PropTypes.oneOf(Object.keys(PHASES)).isRequired,
- smallDeviceImage: PropTypes.string,
+ smallPeripheralImage: PropTypes.string,
title: PropTypes.string.isRequired,
useAutoScan: PropTypes.bool.isRequired
};
diff --git a/src/components/connection-modal/error-step.jsx b/src/components/connection-modal/error-step.jsx
index a5a5ce1b70085d66bfd351599673da58da171821..21dcd8d54c92c4138862a053fe19e849835e744c 100644
--- a/src/components/connection-modal/error-step.jsx
+++ b/src/components/connection-modal/error-step.jsx
@@ -14,10 +14,10 @@ const ErrorStep = props => (
<Box className={styles.body}>
<Box className={styles.activityArea}>
<Box className={styles.centeredRow}>
- <div className={styles.deviceActivity}>
+ <div className={styles.peripheralActivity}>
<img
- className={styles.deviceActivityIcon}
- src={props.deviceImage}
+ className={styles.peripheralActivityIcon}
+ src={props.peripheralImage}
/>
</div>
</Box>
@@ -69,9 +69,9 @@ const ErrorStep = props => (
);
ErrorStep.propTypes = {
- deviceImage: PropTypes.string.isRequired,
onHelp: PropTypes.func,
- onScanning: PropTypes.func
+ onScanning: PropTypes.func,
+ peripheralImage: PropTypes.string.isRequired
};
export default ErrorStep;
diff --git a/src/components/connection-modal/device-tile.jsx b/src/components/connection-modal/peripheral-tile.jsx
similarity index 77%
rename from src/components/connection-modal/device-tile.jsx
rename to src/components/connection-modal/peripheral-tile.jsx
index c806453aa0ff60828462376bf9c01a3a38ae550f..6b7e0388d6216eb4dab3094bef76c6ab0b15e613 100644
--- a/src/components/connection-modal/device-tile.jsx
+++ b/src/components/connection-modal/peripheral-tile.jsx
@@ -7,7 +7,7 @@ import Box from '../box/box.jsx';
import styles from './connection-modal.css';
-class DeviceTile extends React.Component {
+class PeripheralTile extends React.Component {
constructor (props) {
super(props);
bindAll(this, [
@@ -19,26 +19,26 @@ class DeviceTile extends React.Component {
}
render () {
return (
- <Box className={styles.deviceTile}>
- <Box className={styles.deviceTileName}>
+ <Box className={styles.peripheralTile}>
+ <Box className={styles.peripheralTileName}>
<img
- className={styles.deviceTileImage}
- src={this.props.smallDeviceImage}
+ className={styles.peripheralTileImage}
+ src={this.props.smallPeripheralImage}
/>
- <Box className={styles.deviceTileNameWrapper}>
- <Box className={styles.deviceTileNameLabel}>
+ <Box className={styles.peripheralTileNameWrapper}>
+ <Box className={styles.peripheralTileNameLabel}>
<FormattedMessage
defaultMessage="Device name"
description="Label for field showing the device name"
- id="gui.connection.device-name-label"
+ id="gui.connection.peripheral-name-label"
/>
</Box>
- <Box className={styles.deviceTileNameText}>
+ <Box className={styles.peripheralTileNameText}>
{this.props.name}
</Box>
</Box>
</Box>
- <Box className={styles.deviceTileWidgets}>
+ <Box className={styles.peripheralTileWidgets}>
<Box className={styles.signalStrengthMeter}>
<div
className={classNames(styles.signalBar, {
@@ -76,12 +76,12 @@ class DeviceTile extends React.Component {
}
}
-DeviceTile.propTypes = {
+PeripheralTile.propTypes = {
name: PropTypes.string,
onConnecting: PropTypes.func,
peripheralId: PropTypes.string,
rssi: PropTypes.number,
- smallDeviceImage: PropTypes.string
+ smallPeripheralImage: PropTypes.string
};
-export default DeviceTile;
+export default PeripheralTile;
diff --git a/src/components/connection-modal/scanning-step.jsx b/src/components/connection-modal/scanning-step.jsx
index cadee33c3e1a6a5669c7a3232f7f3e11ef7e04b5..bb6276ac09bf575012e3e90039b852d5f6a76a97 100644
--- a/src/components/connection-modal/scanning-step.jsx
+++ b/src/components/connection-modal/scanning-step.jsx
@@ -4,7 +4,7 @@ import React from 'react';
import classNames from 'classnames';
import Box from '../box/box.jsx';
-import DeviceTile from './device-tile.jsx';
+import PeripheralTile from './peripheral-tile.jsx';
import Dots from './dots.jsx';
import radarIcon from './icons/searching.png';
@@ -16,7 +16,7 @@ const ScanningStep = props => (
<Box className={styles.body}>
<Box className={styles.activityArea}>
{props.scanning ? (
- props.deviceList.length === 0 ? (
+ props.peripheralList.length === 0 ? (
<div className={styles.activityAreaInfo}>
<div className={styles.centeredRow}>
<img
@@ -26,19 +26,19 @@ const ScanningStep = props => (
<FormattedMessage
defaultMessage="Looking for devices"
description="Text shown while scanning for devices"
- id="gui.connection.scanning.lookingfordevices"
+ id="gui.connection.scanning.lookingforperipherals"
/>
</div>
</div>
) : (
- <div className={styles.deviceTilePane}>
- {props.deviceList.map(device =>
- (<DeviceTile
- key={device.peripheralId}
- name={device.name}
- peripheralId={device.peripheralId}
- rssi={device.rssi}
- smallDeviceImage={props.smallDeviceImage}
+ <div className={styles.peripheralTilePane}>
+ {props.peripheralList.map(peripheral =>
+ (<PeripheralTile
+ key={peripheral.peripheralId}
+ name={peripheral.name}
+ peripheralId={peripheral.peripheralId}
+ rssi={peripheral.rssi}
+ smallPeripheralImage={props.smallPeripheralImage}
onConnecting={props.onConnecting}
/>)
)}
@@ -49,7 +49,7 @@ const ScanningStep = props => (
<FormattedMessage
defaultMessage="No devices found"
description="Text shown when no devices could be found"
- id="gui.connection.scanning.noDevicesFound"
+ id="gui.connection.scanning.noPeripheralsFound"
/>
</Box>
)}
@@ -85,19 +85,19 @@ const ScanningStep = props => (
);
ScanningStep.propTypes = {
- deviceList: PropTypes.arrayOf(PropTypes.shape({
+ onConnecting: PropTypes.func,
+ onRefresh: PropTypes.func,
+ peripheralList: PropTypes.arrayOf(PropTypes.shape({
name: PropTypes.string,
rssi: PropTypes.number,
peripheralId: PropTypes.string
})),
- onConnecting: PropTypes.func,
- onRefresh: PropTypes.func,
scanning: PropTypes.bool.isRequired,
- smallDeviceImage: PropTypes.string
+ smallPeripheralImage: PropTypes.string
};
ScanningStep.defaultProps = {
- deviceList: [],
+ peripheralList: [],
scanning: true
};
diff --git a/src/containers/auto-scanning-step.jsx b/src/containers/auto-scanning-step.jsx
index f8c0360a331dd2e141bef116dc3376c67406796c..f674738419d52289403add07bb1b1c52a21a4900 100644
--- a/src/containers/auto-scanning-step.jsx
+++ b/src/containers/auto-scanning-step.jsx
@@ -18,7 +18,7 @@ class AutoScanningStep extends React.Component {
};
}
componentWillUnmount () {
- // @todo: stop the device scan here
+ // @todo: stop the peripheral scan here
this.unbindPeripheralUpdates();
}
handlePeripheralScanTimeout () {
@@ -49,7 +49,7 @@ class AutoScanningStep extends React.Component {
'PERIPHERAL_SCAN_TIMEOUT', this.handlePeripheralScanTimeout);
}
handleRefresh () {
- // @todo: stop the device scan here, it is more important for auto scan
+ // @todo: stop the peripheral scan here, it is more important for auto scan
// due to timeout and cancellation
this.setState({
phase: PHASES.prescan
@@ -58,7 +58,7 @@ class AutoScanningStep extends React.Component {
}
handleStartScan () {
this.bindPeripheralUpdates();
- this.props.vm.startDeviceScan(this.props.extensionId);
+ this.props.vm.scanForPeripheral(this.props.extensionId);
this.setState({
phase: PHASES.pressbutton
});
@@ -67,7 +67,7 @@ class AutoScanningStep extends React.Component {
render () {
return (
<ScanningStepComponent
- deviceButtonImage={this.props.deviceButtonImage}
+ peripheralButtonImage={this.props.peripheralButtonImage}
phase={this.state.phase}
title={this.props.extensionId}
onRefresh={this.handleRefresh}
@@ -78,9 +78,9 @@ class AutoScanningStep extends React.Component {
}
AutoScanningStep.propTypes = {
- deviceButtonImage: PropTypes.string,
extensionId: PropTypes.string.isRequired,
onConnecting: PropTypes.func.isRequired,
+ peripheralButtonImage: PropTypes.string,
vm: PropTypes.instanceOf(VM).isRequired
};
diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index 8a6bec5fd7578beff79912dea9b6dd5cc52595ed..499d77636116b287d0acb3de60c939a0d31f0bd3 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -336,7 +336,7 @@ class Blocks extends React.Component {
}
handleCategorySelected (categoryId) {
const extension = extensionData.find(ext => ext.extensionId === categoryId);
- if (extension && extension.launchDeviceConnectionFlow) {
+ if (extension && extension.launchPeripheralConnectionFlow) {
this.handleConnectionModalStart(categoryId);
}
@@ -365,9 +365,9 @@ class Blocks extends React.Component {
this.setState({connectionModal: {
extensionId: extensionId,
useAutoScan: extension.useAutoScan,
- deviceImage: extension.deviceImage,
- smallDeviceImage: extension.smallDeviceImage,
- deviceButtonImage: extension.deviceButtonImage,
+ peripheralImage: extension.peripheralImage,
+ smallPeripheralImage: extension.smallPeripheralImage,
+ peripheralButtonImage: extension.peripheralButtonImage,
name: extension.name,
connectingMessage: extension.connectingMessage,
helpLink: extension.helpLink
diff --git a/src/containers/connection-modal.jsx b/src/containers/connection-modal.jsx
index 276d4f72a886e6df3b5f150d1cdd443e5eee9956..164f2455bb6a22a065ce5e5ba3946170271b43e0 100644
--- a/src/containers/connection-modal.jsx
+++ b/src/containers/connection-modal.jsx
@@ -35,7 +35,7 @@ class ConnectionModal extends React.Component {
});
}
handleConnecting (peripheralId) {
- this.props.vm.connectToPeripheral(this.props.extensionId, peripheralId);
+ this.props.vm.connectPeripheral(this.props.extensionId, peripheralId);
this.setState({
phase: PHASES.connecting
});
@@ -47,13 +47,13 @@ class ConnectionModal extends React.Component {
}
handleDisconnect () {
this.props.onStatusButtonUpdate(this.props.extensionId, 'not ready');
- this.props.vm.disconnectExtensionSession(this.props.extensionId);
+ this.props.vm.disconnectPeripheral(this.props.extensionId);
this.props.onCancel();
}
handleCancel () {
- // If we're not connected to a device, close the websocket so we stop scanning.
+ // If we're not connected to a peripheral, close the websocket so we stop scanning.
if (!this.props.vm.getPeripheralIsConnected(this.props.extensionId)) {
- this.props.vm.disconnectExtensionSession(this.props.extensionId);
+ this.props.vm.disconnectPeripheral(this.props.extensionId);
}
this.props.onCancel();
}
@@ -99,12 +99,12 @@ class ConnectionModal extends React.Component {
return (
<ConnectionModalComponent
connectingMessage={this.props.connectingMessage}
- deviceButtonImage={this.props.deviceButtonImage}
- deviceImage={this.props.deviceImage}
extensionId={this.props.extensionId}
name={this.props.name}
+ peripheralButtonImage={this.props.peripheralButtonImage}
+ peripheralImage={this.props.peripheralImage}
phase={this.state.phase}
- smallDeviceImage={this.props.smallDeviceImage}
+ smallPeripheralImage={this.props.smallPeripheralImage}
title={this.props.extensionId}
useAutoScan={this.props.useAutoScan}
vm={this.props.vm}
@@ -121,14 +121,14 @@ class ConnectionModal extends React.Component {
ConnectionModal.propTypes = {
connectingMessage: PropTypes.node.isRequired,
- deviceButtonImage: PropTypes.string,
- deviceImage: PropTypes.string.isRequired,
extensionId: PropTypes.string.isRequired,
helpLink: PropTypes.string.isRequired,
name: PropTypes.node.isRequired,
onCancel: PropTypes.func.isRequired,
onStatusButtonUpdate: PropTypes.func.isRequired,
- smallDeviceImage: PropTypes.string.isRequired,
+ peripheralButtonImage: PropTypes.string,
+ peripheralImage: PropTypes.string.isRequired,
+ smallPeripheralImage: PropTypes.string.isRequired,
useAutoScan: PropTypes.bool.isRequired,
vm: PropTypes.instanceOf(VM).isRequired
};
diff --git a/src/containers/scanning-step.jsx b/src/containers/scanning-step.jsx
index 07595d5266d937c577f2e44634995b7849e3e5fb..6e1daa8e6eb32ebdfbef49db1d4ca4b8b87ed03a 100644
--- a/src/containers/scanning-step.jsx
+++ b/src/containers/scanning-step.jsx
@@ -14,18 +14,18 @@ class ScanningStep extends React.Component {
]);
this.state = {
scanning: true,
- deviceList: []
+ peripheralList: []
};
}
componentDidMount () {
- this.props.vm.startDeviceScan(this.props.extensionId);
+ this.props.vm.scanForPeripheral(this.props.extensionId);
this.props.vm.on(
'PERIPHERAL_LIST_UPDATE', this.handlePeripheralListUpdate);
this.props.vm.on(
'PERIPHERAL_SCAN_TIMEOUT', this.handlePeripheralScanTimeout);
}
componentWillUnmount () {
- // @todo: stop the device scan here
+ // @todo: stop the peripheral scan here
this.props.vm.removeListener(
'PERIPHERAL_LIST_UPDATE', this.handlePeripheralListUpdate);
this.props.vm.removeListener(
@@ -34,7 +34,7 @@ class ScanningStep extends React.Component {
handlePeripheralScanTimeout () {
this.setState({
scanning: false,
- deviceList: []
+ peripheralList: []
});
}
handlePeripheralListUpdate (newList) {
@@ -42,22 +42,22 @@ class ScanningStep extends React.Component {
const peripheralArray = Object.keys(newList).map(id =>
newList[id]
);
- this.setState({deviceList: peripheralArray});
+ this.setState({peripheralList: peripheralArray});
}
handleRefresh () {
- this.props.vm.startDeviceScan(this.props.extensionId);
+ this.props.vm.scanForPeripheral(this.props.extensionId);
this.setState({
scanning: true,
- deviceList: []
+ peripheralList: []
});
}
render () {
return (
<ScanningStepComponent
- deviceList={this.state.deviceList}
+ peripheralList={this.state.peripheralList}
phase={this.state.phase}
scanning={this.state.scanning}
- smallDeviceImage={this.props.smallDeviceImage}
+ smallPeripheralImage={this.props.smallPeripheralImage}
title={this.props.extensionId}
onConnected={this.props.onConnected}
onConnecting={this.props.onConnecting}
@@ -71,7 +71,7 @@ ScanningStep.propTypes = {
extensionId: PropTypes.string.isRequired,
onConnected: PropTypes.func.isRequired,
onConnecting: PropTypes.func.isRequired,
- smallDeviceImage: PropTypes.string,
+ smallPeripheralImage: PropTypes.string,
vm: PropTypes.instanceOf(VM).isRequired
};
diff --git a/src/lib/libraries/extensions/index.jsx b/src/lib/libraries/extensions/index.jsx
index edd4fa512b6e2e414762aa6fccb9fdab5cf7dfdf..1be61b73462a3ae7ce830904e5730f9a2dfee9cc 100644
--- a/src/lib/libraries/extensions/index.jsx
+++ b/src/lib/libraries/extensions/index.jsx
@@ -9,13 +9,13 @@ import microbitImage from './microbit.png';
import ev3Image from './ev3.png';
import wedoImage from './wedo.png';
-import microbitDeviceImage from './device-connection/microbit/microbit-illustration.svg';
-import microbitMenuImage from './device-connection/microbit/microbit-small.svg';
-import ev3DeviceImage from './device-connection/ev3/ev3-hub-illustration.svg';
-import ev3MenuImage from './device-connection/ev3/ev3-small.svg';
-import wedoDeviceImage from './device-connection/wedo/wedo-illustration.svg';
-import wedoMenuImage from './device-connection/wedo/wedo-small.svg';
-import wedoButtonImage from './device-connection/wedo/wedo-button-illustration.svg';
+import microbitPeripheralImage from './peripheral-connection/microbit/microbit-illustration.svg';
+import microbitMenuImage from './peripheral-connection/microbit/microbit-small.svg';
+import ev3PeripheralImage from './peripheral-connection/ev3/ev3-hub-illustration.svg';
+import ev3MenuImage from './peripheral-connection/ev3/ev3-small.svg';
+import wedoPeripheralImage from './peripheral-connection/wedo/wedo-illustration.svg';
+import wedoMenuImage from './peripheral-connection/wedo/wedo-small.svg';
+import wedoButtonImage from './peripheral-connection/wedo/wedo-button-illustration.svg';
export default [
{
@@ -107,10 +107,10 @@ export default [
),
featured: true,
disabled: false,
- launchDeviceConnectionFlow: true,
+ launchPeripheralConnectionFlow: true,
useAutoScan: false,
- deviceImage: microbitDeviceImage,
- smallDeviceImage: microbitMenuImage,
+ peripheralImage: microbitPeripheralImage,
+ smallPeripheralImage: microbitMenuImage,
connectingMessage: (
<FormattedMessage
defaultMessage="Connecting"
@@ -133,10 +133,10 @@ export default [
),
featured: true,
disabled: false,
- launchDeviceConnectionFlow: true,
+ launchPeripheralConnectionFlow: true,
useAutoScan: false,
- deviceImage: ev3DeviceImage,
- smallDeviceImage: ev3MenuImage,
+ peripheralImage: ev3PeripheralImage,
+ smallPeripheralImage: ev3MenuImage,
connectingMessage: (
<FormattedMessage
defaultMessage="Connecting. Make sure the pin on your EV3 is set to 1234."
@@ -159,11 +159,11 @@ export default [
),
featured: true,
disabled: false,
- launchDeviceConnectionFlow: true,
+ launchPeripheralConnectionFlow: true,
useAutoScan: true,
- deviceImage: wedoDeviceImage,
- smallDeviceImage: wedoMenuImage,
- deviceButtonImage: wedoButtonImage,
+ peripheralImage: wedoPeripheralImage,
+ smallPeripheralImage: wedoMenuImage,
+ peripheralButtonImage: wedoButtonImage,
connectingMessage: (
<FormattedMessage
defaultMessage="Connecting"
diff --git a/src/lib/libraries/extensions/device-connection/ev3/ev3-hub-illustration.svg b/src/lib/libraries/extensions/peripheral-connection/ev3/ev3-hub-illustration.svg
similarity index 100%
rename from src/lib/libraries/extensions/device-connection/ev3/ev3-hub-illustration.svg
rename to src/lib/libraries/extensions/peripheral-connection/ev3/ev3-hub-illustration.svg
diff --git a/src/lib/libraries/extensions/device-connection/ev3/ev3-small.svg b/src/lib/libraries/extensions/peripheral-connection/ev3/ev3-small.svg
similarity index 100%
rename from src/lib/libraries/extensions/device-connection/ev3/ev3-small.svg
rename to src/lib/libraries/extensions/peripheral-connection/ev3/ev3-small.svg
diff --git a/src/lib/libraries/extensions/device-connection/microbit/microbit-illustration.svg b/src/lib/libraries/extensions/peripheral-connection/microbit/microbit-illustration.svg
similarity index 100%
rename from src/lib/libraries/extensions/device-connection/microbit/microbit-illustration.svg
rename to src/lib/libraries/extensions/peripheral-connection/microbit/microbit-illustration.svg
diff --git a/src/lib/libraries/extensions/device-connection/microbit/microbit-small.svg b/src/lib/libraries/extensions/peripheral-connection/microbit/microbit-small.svg
similarity index 100%
rename from src/lib/libraries/extensions/device-connection/microbit/microbit-small.svg
rename to src/lib/libraries/extensions/peripheral-connection/microbit/microbit-small.svg
diff --git a/src/lib/libraries/extensions/device-connection/wedo/wedo-button-illustration.svg b/src/lib/libraries/extensions/peripheral-connection/wedo/wedo-button-illustration.svg
similarity index 100%
rename from src/lib/libraries/extensions/device-connection/wedo/wedo-button-illustration.svg
rename to src/lib/libraries/extensions/peripheral-connection/wedo/wedo-button-illustration.svg
diff --git a/src/lib/libraries/extensions/device-connection/wedo/wedo-illustration.svg b/src/lib/libraries/extensions/peripheral-connection/wedo/wedo-illustration.svg
similarity index 100%
rename from src/lib/libraries/extensions/device-connection/wedo/wedo-illustration.svg
rename to src/lib/libraries/extensions/peripheral-connection/wedo/wedo-illustration.svg
diff --git a/src/lib/libraries/extensions/device-connection/wedo/wedo-small.svg b/src/lib/libraries/extensions/peripheral-connection/wedo/wedo-small.svg
similarity index 100%
rename from src/lib/libraries/extensions/device-connection/wedo/wedo-small.svg
rename to src/lib/libraries/extensions/peripheral-connection/wedo/wedo-small.svg