From 5561de530bb43f0b816a0b464f174b4642e960a1 Mon Sep 17 00:00:00 2001 From: Laurens Valk Date: Fri, 9 Oct 2020 19:13:32 +0200 Subject: [PATCH] Rename CPlusHub to TechnicHub --- package.json | 2 +- src/components/editor-snippets.ts | 6 +++--- src/protocols/lwp3-bootloader.ts | 4 ++-- src/sagas/flash-firmware.ts | 4 ++-- yarn.lock | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 37efcc4a..f18a49db 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@blueprintjs/core": "^3.30.1", - "@pybricks/firmware": "2.8.0", + "@pybricks/firmware": "3.0.0", "@pybricks/mpy-cross-v5": "^1.1.0", "@shopify/react-i18n": "^5.0.0", "@testing-library/jest-dom": "^5.8.0", diff --git a/src/components/editor-snippets.ts b/src/components/editor-snippets.ts index dd4faef6..741c10d0 100644 --- a/src/components/editor-snippets.ts +++ b/src/components/editor-snippets.ts @@ -18,13 +18,13 @@ ace.define('ace/snippets/python', ['require', 'exports', 'module'], function ( ) { // IMPORTANT!!!!! // Snippets must be indented with tab character, not spaces! - exports.snippetText = `snippet cplushub - from pybricks.hubs import CPlusHub + exports.snippetText = `snippet technichub + from pybricks.hubs import TechnicHub from pybricks.pupdevices import Motor from pybricks.parameters import Port, Stop from pybricks.tools import wait - hub = CPlusHub() + hub = TechnicHub() snippet cityhub from pybricks.hubs import CityHub from pybricks.pupdevices import Motor diff --git a/src/protocols/lwp3-bootloader.ts b/src/protocols/lwp3-bootloader.ts index d4907413..8bf6e238 100644 --- a/src/protocols/lwp3-bootloader.ts +++ b/src/protocols/lwp3-bootloader.ts @@ -26,7 +26,7 @@ export const MaxMessageSize = 20; export enum HubType { MoveHub = 0x40, CityHub = 0x41, - CPlusHub = 0x80, + TechnicHub = 0x80, } /** @@ -74,7 +74,7 @@ export const MaxProgramFlashSize: ReadonlyMap = new Map< >([ [HubType.MoveHub, 14], [HubType.CityHub, 32], - [HubType.CPlusHub, 32], + [HubType.TechnicHub, 32], ]); /** diff --git a/src/sagas/flash-firmware.ts b/src/sagas/flash-firmware.ts index 114056b2..048d450b 100644 --- a/src/sagas/flash-firmware.ts +++ b/src/sagas/flash-firmware.ts @@ -2,8 +2,8 @@ // Copyright (c) 2020 The Pybricks Authors import cityHubZip from '@pybricks/firmware/build/cityhub.zip'; -import cPlusHubZip from '@pybricks/firmware/build/cplushub.zip'; import moveHubZip from '@pybricks/firmware/build/movehub.zip'; +import technicHubZip from '@pybricks/firmware/build/technichub.zip'; import JSZip from 'jszip'; import { Effect, @@ -63,7 +63,7 @@ import { fmod, sumComplement32 } from '../utils/math'; const firmwareZipMap = new Map([ [HubType.CityHub, cityHubZip], - [HubType.CPlusHub, cPlusHubZip], + [HubType.TechnicHub, technicHubZip], [HubType.MoveHub, moveHubZip], ]); diff --git a/yarn.lock b/yarn.lock index 42baf6d7..16467189 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1405,10 +1405,10 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== -"@pybricks/firmware@2.8.0": - version "2.8.0" - resolved "https://npm.pkg.github.com/download/@pybricks/firmware/2.8.0/2c9ce7e6852350020eccfc26b0165d542d5dae266674a6a7431f5855c8a8fe2c#d0b190305512fe217baa4eb9198e42c22d16d677" - integrity sha512-k27ejwWKCE60Nt9o4GS3s11ecHCxbq0Wd69c73WhDILfWiX6oyGtPXGNvCvpuZTvUd7iemVQ9pEgQ1bgfvZKKA== +"@pybricks/firmware@3.0.0": + version "3.0.0" + resolved "https://npm.pkg.github.com/download/@pybricks/firmware/3.0.0/7dddf6adf6037c2e5fa9edd55ff02a9ddfffac55fe4a66bb3b7529626b92bb46#4c19f5de6419cd5ce75e33a78921c1f6deff847c" + integrity sha512-ojaWr1ET/KUqRVytJ6CcSrGTG4Hd6oELw53+wceneHNLZIMRXjAsvuVndhVcRc1OJ23tPPlV8PblZPZRyEhRKA== "@pybricks/mpy-cross-v5@^1.1.0": version "1.1.0"