From 59e4784b33e7bbba621835b90670e3a676a9eb51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=A6=E5=BD=92=E4=BA=91=E5=B8=86?= <1138663075@qq.com> Date: Sun, 4 May 2025 00:07:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?chore(submodule):=20=E6=9B=B4=E6=96=B0=20Mi?= =?UTF-8?q?xly3=20=E5=92=8C=20STM32RTC=20=E5=AD=90=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mixly3 | 2 +- origin/libraries/myLib/STM32RTC | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mixly3 b/mixly3 index 802a2fe..b9c0574 160000 --- a/mixly3 +++ b/mixly3 @@ -1 +1 @@ -Subproject commit 802a2fe66bd1faabebdf95a3fa96518d5076089f +Subproject commit b9c0574780b688984a59cc88719c24ae119092a1 diff --git a/origin/libraries/myLib/STM32RTC b/origin/libraries/myLib/STM32RTC index ac3953d..f9b5bb4 160000 --- a/origin/libraries/myLib/STM32RTC +++ b/origin/libraries/myLib/STM32RTC @@ -1 +1 @@ -Subproject commit ac3953dc77e789a80cf7547c0277ce80202b8830 +Subproject commit f9b5bb411d564f71a09eff9774791bf57c74fc6f -- Gitee From 096758140e5c98ae0d40da99d8c9dc1f3ddc6ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=A6=E5=BD=92=E4=BA=91=E5=B8=86?= <1138663075@qq.com> Date: Sun, 4 May 2025 00:54:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?build(deps):=20=E6=9B=B4=E6=96=B0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新 @mixly/arduino 到 1.8.0 版本 - 更新 @mixly/arduino-avr 到 1.9.0 版本 - 更新其他开发依赖到最新版本 - 移除未使用的模块 --- package.json | 32 ++++++++++++++++---------------- src/index.js | 8 -------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index fae7739..a621d8a 100644 --- a/package.json +++ b/package.json @@ -14,22 +14,22 @@ "url": "git@gitee.com:mixly2-package/mixly-board-arduino-stm32.git" }, "devDependencies": { - "@mixly/arduino": "^1.6.0", - "@mixly/arduino-avr": "^1.6.0", - "copy-webpack-plugin": "^11.0.0", - "css-loader": "^6.8.1", - "eslint": "^8.51.0", - "eslint-webpack-plugin": "^4.0.1", - "html-loader": "^4.2.0", - "html-webpack-plugin": "^5.5.3", - "mini-css-extract-plugin": "^2.7.6", - "minimist": "^1.2.5", - "postcss-loader": "^7.3.3", - "style-loader": "^3.3.3", - "webpack": "^5.89.0", - "webpack-cli": "^5.1.4", - "webpack-dev-server": "^4.15.1", - "webpack-merge": "^5.10.0" + "@mixly/arduino": "^1.8.0", + "@mixly/arduino-avr": "^1.9.0", + "copy-webpack-plugin": "^13.0.0", + "css-loader": "^7.1.2", + "eslint": "^9.26.0", + "eslint-webpack-plugin": "^5.0.1", + "html-loader": "^5.1.0", + "html-webpack-plugin": "^5.6.3", + "mini-css-extract-plugin": "^2.9.2", + "minimist": "^1.2.8", + "postcss-loader": "^8.1.1", + "style-loader": "^4.0.0", + "webpack": "^5.99.7", + "webpack-cli": "^6.0.1", + "webpack-dev-server": "^5.2.1", + "webpack-merge": "^6.0.1" }, "dependencies": { "mustache": "^4.2.0" diff --git a/src/index.js b/src/index.js index a4dcf07..56720ad 100644 --- a/src/index.js +++ b/src/index.js @@ -18,13 +18,11 @@ import { ArduinoAVRLogicBlocks, ArduinoAVRMathBlocks, ArduinoAVRPinsBlocks, - ArduinoAVRProceduresBlocks, ArduinoAVRScoopBlocks, ArduinoAVRSerialBlocks, ArduinoAVRStorageBlocks, ArduinoAVRTextBlocks, ArduinoAVRToolsBlocks, - ArduinoAVRVariablesBlocks, ArduinoAVRActuatorGenerators, ArduinoAVRControlGenerators, ArduinoAVRFactoryGenerators, @@ -33,13 +31,11 @@ import { ArduinoAVRLogicGenerators, ArduinoAVRMathGenerators, ArduinoAVRPinsGenerators, - ArduinoAVRProceduresGenerators, ArduinoAVRScoopGenerators, ArduinoAVRSerialGenerators, ArduinoAVRStorageGenerators, ArduinoAVRTextGenerators, ArduinoAVRToolsGenerators, - ArduinoAVRVariablesGenerators } from '@mixly/arduino-avr'; import pins from './pins/pins'; @@ -78,13 +74,11 @@ Object.assign( ArduinoAVRLogicBlocks, ArduinoAVRMathBlocks, ArduinoAVRPinsBlocks, - ArduinoAVRProceduresBlocks, ArduinoAVRScoopBlocks, ArduinoAVRSerialBlocks, ArduinoAVRStorageBlocks, ArduinoAVRTextBlocks, ArduinoAVRToolsBlocks, - ArduinoAVRVariablesBlocks, CommunicateBlocks, DisplayBlocks, SensorBlocks, @@ -102,13 +96,11 @@ Object.assign( ArduinoAVRLogicGenerators, ArduinoAVRMathGenerators, ArduinoAVRPinsGenerators, - ArduinoAVRProceduresGenerators, ArduinoAVRScoopGenerators, ArduinoAVRSerialGenerators, ArduinoAVRStorageGenerators, ArduinoAVRTextGenerators, ArduinoAVRToolsGenerators, - ArduinoAVRVariablesGenerators, CommunicateGenerators, DisplayGenerators, SensorGenerators, -- Gitee From 6485d43412fe72398094641ea9251ac10a8787d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=A6=E5=BD=92=E4=BA=91=E5=B8=86?= <1138663075@qq.com> Date: Sun, 4 May 2025 13:27:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(arduino):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=92=8C=E8=BF=87=E7=A8=8B=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=A7=AF=E6=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 56720ad..5653783 100644 --- a/src/index.js +++ b/src/index.js @@ -4,8 +4,12 @@ import { Profile } from 'mixly'; import { ArduinoTextBlocks, ArduinoTextGenerators, - Procedures, + ArduinoVariablesBlocks, + ArduinoVariablesGenerators, Variables, + ArduinoProceduresBlocks, + ArduinoProceduresGenerators, + Procedures, Arduino } from '@mixly/arduino'; @@ -66,6 +70,8 @@ Object.assign(Profile.default, pins.arduino_stm32f103c); Object.assign( Blockly.Blocks, ArduinoTextBlocks, + ArduinoVariablesBlocks, + ArduinoProceduresBlocks, ArduinoAVRActuatorBlocks, ArduinoAVRControlBlocks, ArduinoAVRFactoryBlocks, @@ -88,6 +94,8 @@ Object.assign( Object.assign( Blockly.Arduino.forBlock, ArduinoTextGenerators, + ArduinoVariablesGenerators, + ArduinoProceduresGenerators, ArduinoAVRActuatorGenerators, ArduinoAVRControlGenerators, ArduinoAVRFactoryGenerators, -- Gitee