From 99f926c7fe0251a414bfed11363df51c9f796dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Sat, 22 Mar 2025 20:10:07 +0800 Subject: [PATCH] =?UTF-8?q?Update(boards):=20=E8=B0=83=E6=95=B4micropython?= =?UTF-8?q?=5Fesp32s3=E6=9D=BF=E8=BD=BD=E6=98=BE=E7=A4=BA=E4=B8=8B=20`?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9B=BE=E5=83=8F`=20=E5=9B=BE=E5=BD=A2?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../micropython/generators/display_onboard.js | 20 ++-- .../blocks/esp32_profile.js | 107 +++++++++++++++++- .../micropython_esp32s3/generators/pins.js | 17 ++- .../micropython_esp32s3/template.xml | 8 +- 4 files changed, 130 insertions(+), 22 deletions(-) diff --git a/boards/default_src/micropython/generators/display_onboard.js b/boards/default_src/micropython/generators/display_onboard.js index a880ea3b..89e0ad04 100644 --- a/boards/default_src/micropython/generators/display_onboard.js +++ b/boards/default_src/micropython/generators/display_onboard.js @@ -1,14 +1,20 @@ -import { Boards } from 'mixly'; +import { Boards, JSFuncs } from 'mixly'; export const display_show_image = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); - if (version == "educore"){ - generator.definitions_['import_' + version + 'oled'] = "from " + version + " import oled"; - var code = "oled.print(" + data + ")\n"; - }else{ - generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; - var code = "onboard_matrix.shows(" + data + ")\n"; + if (JSFuncs.getPlatform() === 'Python ESP32-S3') { + generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; + var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); + var code = "onboard_tft.image(" + data + ", color=0xffff)\n"; + } else { + if (version == "educore") { + generator.definitions_['import_' + version + '_oled'] = "from " + version + " import oled"; + var code = "oled.print(" + data + ")\n"; + } else { + generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; + var code = "onboard_matrix.shows(" + data + ")\n"; + } } return code; } diff --git a/boards/default_src/micropython_esp32s3/blocks/esp32_profile.js b/boards/default_src/micropython_esp32s3/blocks/esp32_profile.js index 1b52c147..8581837d 100644 --- a/boards/default_src/micropython_esp32s3/blocks/esp32_profile.js +++ b/boards/default_src/micropython_esp32s3/blocks/esp32_profile.js @@ -29,8 +29,105 @@ pins["元控青春"] = { tts_voice: Profile.generate(['0-16']), tts_builtin_music: Profile.generate(['0-47']), tts_bgmusic: Profile.generate(['0-15']), - builtinimg: [["HEART", "onboard_matrix.HEART"], ["HEART_SMALL", "onboard_matrix.HEART_SMALL"], ["HAPPY", "onboard_matrix.HAPPY"], ["SAD", "onboard_matrix.SAD"], ["SMILE", "onboard_matrix.SMILE"], ["SILLY", "onboard_matrix.SILLY"], ["FABULOUS", "onboard_matrix.FABULOUS"], ["SURPRISED", "onboard_matrix.SURPRISED"], ["ASLEEP", "onboard_matrix.ASLEEP"], ["ANGRY", "onboard_matrix.ANGRY"], ["CONFUSED", "onboard_matrix.CONFUSED"], ["NO", "onboard_matrix.NO"], ["YES", "onboard_matrix.YES"], ["LEFT_ARROW", "onboard_matrix.LEFT_ARROW"], ["RIGHT_ARROW", "onboard_matrix.RIGHT_ARROW"], ["DRESS", "onboard_matrix.DRESS"], ["TRANSFORMERS", "onboard_matrix.TRANSFORMERS"], ["SCISSORS", "onboard_matrix.SCISSORS"], ["EXIT", "onboard_matrix.EXIT"], ["TREE", "onboard_matrix.TREE"], ["PACMAN", "onboard_matrix.PACMAN"], ["TARGET", "onboard_matrix.TARGET"], ["TSHIRT", "onboard_matrix.TSHIRT"], ["ROLLERSKATE", "onboard_matrix.ROLLERSKATE"], ["DUCK", "onboard_matrix.DUCK"], ["HOUSE", "onboard_matrix.HOUSE"], ["TORTOISE", "onboard_matrix.TORTOISE"], ["BUTTERFLY", "onboard_matrix.BUTTERFLY"], ["STICKFIGURE", "onboard_matrix.STICKFIGURE"], ["GHOST", "onboard_matrix.GHOST"], ["PITCHFORK", "onboard_matrix.PITCHFORK"], ["MUSIC_QUAVERS", "onboard_matrix.MUSIC_QUAVERS"], ["MUSIC_QUAVER", "onboard_matrix.MUSIC_QUAVER"], ["MUSIC_CROTCHET", "onboard_matrix.MUSIC_CROTCHET"], ["COW", "onboard_matrix.COW"], ["RABBIT", "onboard_matrix.RABBIT"], ["SQUARE_SMALL", "onboard_matrix.SQUARE_SMALL"], ["SQUARE", "onboard_matrix.SQUARE"], ["DIAMOND_SMALL", "onboard_matrix.DIAMOND_SMALL"], ["DIAMOND", "onboard_matrix.DIAMOND"], ["CHESSBOARD", "onboard_matrix.CHESSBOARD"], ["TRIANGLE_LEFT", "onboard_matrix.TRIANGLE_LEFT"], ["TRIANGLE", "onboard_matrix.TRIANGLE"], ["SNAKE", "onboard_matrix.SNAKE"], ["UMBRELLA", "onboard_matrix.UMBRELLA"], ["SKULL", "onboard_matrix.SKULL"], ["GIRAFFE", "onboard_matrix.GIRAFFE"], ["SWORD", "onboard_matrix.SWORD"]], - //builtinimg: [["HEART", "onboard_matrix.HEART"],["HEART_SMALL", "onboard_matrix.HEART_SMALL"],["HAPPY", "onboard_matrix.HAPPY"],["SAD", "onboard_matrix.SAD"],["SMILE", "onboard_matrix.SMILE"],["SILLY", "onboard_matrix.SILLY"],["FABULOUS", "onboard_matrix.FABULOUS"],["SURPRISED", "onboard_matrix.SURPRISED"],["ASLEEP", "onboard_matrix.ASLEEP"],["ANGRY", "onboard_matrix.ANGRY"],["CONFUSED", "onboard_matrix.CONFUSED"],["NO", "onboard_matrix.NO"],["YES", "onboard_matrix.YES"]], + builtinimg: [ + ["Heart", "expression_picture.Heart"], + ["Angry", "expression_picture.Angry"], + ["Bored", "expression_picture.Bored"], + ["Confused", "expression_picture.Confused"], + ["Happy", "expression_picture.Happy"], + ["Paper", "expression_picture.Paper"], + ["Rock", "expression_picture.Rock"], + ["Sad", "expression_picture.Sad"], + ["Scissors", "expression_picture.Scissors"], + ["Silly", "expression_picture.Silly"], + ["Sleep", "expression_picture.Sleep"], + ["Small_heart", "expression_picture.Small_heart"], + ["Small_paper", "expression_picture.Small_paper"], + ["Small_rock", "expression_picture.Small_rock"], + ["Small_scissors", "expression_picture.Small_scissors"], + ["Smile", "expression_picture.Smile"], + ["Surprise", "expression_picture.Surprise"], + ["Wonderful", "expression_picture.Wonderful"], + ["Eyes_Angry", "eye_picture.Eyes_Angry"], + ["Awake", "eye_picture.Awake"], + ["Black_eye", "eye_picture.Black_eye"], + ["Bottom_left", "eye_picture.Bottom_left"], + ["Bottom_right", "eye_picture.Bottom_right"], + ["Crazy_1", "eye_picture.Crazy_1"], + ["Crazy_2", "eye_picture.Crazy_2"], + ["Disappointed", "eye_picture.Disappointed"], + ["Dizzy", "eye_picture.Dizzy"], + ["Down", "eye_picture.Down"], + ["Evil", "eye_picture.Evil"], + ["Hurt", "eye_picture.Hurt"], + ["Knocked_out", "eye_picture.Knocked_out"], + ["Love", "eye_picture.Love"], + ["Middle_left", "eye_picture.Middle_left"], + ["Middle_right", "eye_picture.Middle_right"], + ["Neutral", "eye_picture.Neutral"], + ["Nuclear", "eye_picture.Nuclear"], + ["Pinch_left", "eye_picture.Pinch_left"], + ["Pinch_middle", "eye_picture.Pinch_middle"], + ["Pinch_right", "eye_picture.Pinch_right"], + ["Tear", "eye_picture.Tear"], + ["Tired_left", "eye_picture.Tired_left"], + ["Tired_middle", "eye_picture.Tired_middle"], + ["Tired_right", "eye_picture.Tired_right"], + ["Toxic", "eye_picture.Toxic"], + ["Up", "eye_picture.Up"], + ["Winking", "eye_picture.Winking"], + ["Accept", "informatio_picture.Accept"], + ["Backward", "informatio_picture.Backward"], + ["Decline", "informatio_picture.Decline"], + ["Forward", "informatio_picture.Forward"], + ["Left", "informatio_picture.Left"], + ["No_go", "informatio_picture.No_go"], + ["Question_mark", "informatio_picture.Question_mark"], + ["Right", "informatio_picture.Right"], + ["Stop_1", "informatio_picture.Stop_1"], + ["Stop_2", "informatio_picture.Stop_2"], + ["Thumbs_down", "informatio_picture.Thumbs_down"], + ["Thumbs_up", "informatio_picture.Thumbs_up"], + ["Warning", "informatio_picture.Warning"], + ["Bomb", "object_picture.Bomb"], + ["Boom", "object_picture.Boom"], + ["Fire", "object_picture.Fire"], + ["Flowers", "object_picture.Flowers"], + ["Forest", "object_picture.Forest"], + ["Lightning", "object_picture.Lightning"], + ["Light_off", "object_picture.Light_off"], + ["Light_on", "object_picture.Light_on"], + ["Night", "object_picture.Night"], + ["Pirate", "object_picture.Pirate"], + ["Snow", "object_picture.Snow"], + ["Target", "object_picture.Target"], + ["Bar_0", "progres_picture.Bar_0"], + ["Bar_1", "progres_picture.Bar_1"], + ["Bar_2", "progres_picture.Bar_2"], + ["Bar_3", "progres_picture.Bar_3"], + ["Bar_4", "progres_picture.Bar_4"], + ["Dial_0", "progres_picture.Dial_0"], + ["Dial_1", "progres_picture.Dial_1"], + ["Dial_2", "progres_picture.Dial_2"], + ["Dial_3", "progres_picture.Dial_3"], + ["Dial_4", "progres_picture.Dial_4"], + ["Dots_0", "progres_picture.Dots_0"], + ["Dots_1", "progres_picture.Dots_1"], + ["Dots_2", "progres_picture.Dots_2"], + ["Dots_3", "progres_picture.Dots_3"], + ["Hourglass_0", "progres_picture.Hourglass_0"], + ["Hourglass_1", "progres_picture.Hourglass_1"], + ["Hourglass_2", "progres_picture.Hourglass_2"], + ["Timer_0", "progres_picture.Timer_0"], + ["Timer_1", "progres_picture.Timer_1"], + ["Timer_2", "progres_picture.Timer_2"], + ["Timer_3", "progres_picture.Timer_3"], + ["Timer_4", "progres_picture.Timer_4"], + ["Water_level_0", "progres_picture.Water_level_0"], + ["Water_level_1", "progres_picture.Water_level_1"], + ["Water_level_2", "progres_picture.Water_level_2"], + ["Water_level_3", "progres_picture.Water_level_3"] + ], builtinimg_extern: [["HEART", "matrix32x12.Matrix.HEART"], ["HEART_SMALL", "matrix32x12.Matrix.HEART_SMALL"], ["HAPPY", "matrix32x12.Matrix.HAPPY"], ["SAD", "matrix32x12.Matrix.SAD"], ["SMILE", "matrix32x12.Matrix.SMILE"], ["SILLY", "matrix32x12.Matrix.SILLY"], ["FABULOUS", "matrix32x12.Matrix.FABULOUS"], ["SURPRISED", "matrix32x12.Matrix.SURPRISED"], ["ASLEEP", "matrix32x12.Matrix.ASLEEP"], ["ANGRY", "matrix32x12.Matrix.ANGRY"], ["CONFUSED", "matrix32x12.Matrix.CONFUSED"], ["NO", "matrix32x12.Matrix.NO"], ["YES", "matrix32x12.Matrix.YES"], ["LEFT_ARROW", "matrix32x12.Matrix.LEFT_ARROW"], ["RIGHT_ARROW", "matrix32x12.Matrix.RIGHT_ARROW"], ["DRESS", "matrix32x12.Matrix.DRESS"], ["TRANSFORMERS", "matrix32x12.Matrix.TRANSFORMERS"], ["SCISSORS", "matrix32x12.Matrix.SCISSORS"], ["EXIT", "matrix32x12.Matrix.EXIT"], ["TREE", "matrix32x12.Matrix.TREE"], ["PACMAN", "matrix32x12.Matrix.PACMAN"], ["TARGET", "matrix32x12.Matrix.TARGET"], ["TSHIRT", "matrix32x12.Matrix.TSHIRT"], ["ROLLERSKATE", "matrix32x12.Matrix.ROLLERSKATE"], ["DUCK", "matrix32x12.Matrix.DUCK"], ["HOUSE", "matrix32x12.Matrix.HOUSE"], ["TORTOISE", "matrix32x12.Matrix.TORTOISE"], ["BUTTERFLY", "matrix32x12.Matrix.BUTTERFLY"], ["STICKFIGURE", "matrix32x12.Matrix.STICKFIGURE"], ["GHOST", "matrix32x12.Matrix.GHOST"], ["PITCHFORK", "matrix32x12.Matrix.PITCHFORK"], ["onboard_music_QUAVERS", "matrix32x12.Matrix.onboard_music_QUAVERS"], ["onboard_music_QUAVER", "matrix32x12.Matrix.onboard_music_QUAVER"], ["onboard_music_CROTCHET", "matrix32x12.Matrix.onboard_music_CROTCHET"], ["COW", "matrix32x12.Matrix.COW"], ["RABBIT", "matrix32x12.Matrix.RABBIT"], ["SQUARE_SMALL", "matrix32x12.Matrix.SQUARE_SMALL"], ["SQUARE", "matrix32x12.Matrix.SQUARE"], ["DIAMOND_SMALL", "matrix32x12.Matrix.DIAMOND_SMALL"], ["DIAMOND", "matrix32x12.Matrix.DIAMOND"], ["CHESSBOARD", "matrix32x12.Matrix.CHESSBOARD"], ["TRIANGLE_LEFT", "matrix32x12.Matrix.TRIANGLE_LEFT"], ["TRIANGLE", "matrix32x12.Matrix.TRIANGLE"], ["SNAKE", "matrix32x12.Matrix.SNAKE"], ["UMBRELLA", "matrix32x12.Matrix.UMBRELLA"], ["SKULL", "matrix32x12.Matrix.SKULL"], ["GIRAFFE", "matrix32x12.Matrix.GIRAFFE"], ["SWORD", "matrix32x12.Matrix.SWORD"]], imglist: [["ALL_CLOCKS", "matrix.Image.ALL_CLOCKS"], ["ALL_ARROWS", "matrix.Image.ALL_ARROWS"]], playlist: [["DADADADUM", "spk_midi.DADADADUM"], ["ENTERTAINER", "spk_midi.ENTERTAINER"], ["PRELUDE", "spk_midi.PRELUDE"], ["ODE", "spk_midi.ODE"], ["NYAN", "spk_midi.NYAN"], ["RINGTONE", "spk_midi.RINGTONE"], ["FUNK", "spk_midi.FUNK"], ["BLUES", "spk_midi.BLUES"], ["BIRTHDAY", "spk_midi.BIRTHDAY"], ["WEDDING", "spk_midi.WEDDING"], ["FUNERAL", "spk_midi.FUNERAL"], ["PUNCHLINE", "spk_midi.PUNCHLINE"], ["PYTHON", "spk_midi.PYTHON"], ["BADDY", "spk_midi.BADDY"], ["CHASE", "spk_midi.CHASE"], ["BA_DING", "spk_midi.BA_DING"], ["WAWAWAWAA", "spk_midi.WAWAWAWAA"], ["JUMP_UP", "spk_midi.JUMP_UP"], ["JUMP_DOWN", "spk_midi.JUMP_DOWN"], ["POWER_UP", "spk_midi.POWER_UP"], ["POWER_DOWN", "spk_midi.POWER_DOWN"]], @@ -74,8 +171,7 @@ pins["元控自强"] = { tts_voice: Profile.generate(['0-16']), tts_builtin_music: Profile.generate(['0-47']), tts_bgmusic: Profile.generate(['0-15']), - builtinimg: [["HEART", "onboard_matrix.HEART"], ["HEART_SMALL", "onboard_matrix.HEART_SMALL"], ["HAPPY", "onboard_matrix.HAPPY"], ["SAD", "onboard_matrix.SAD"], ["SMILE", "onboard_matrix.SMILE"], ["SILLY", "onboard_matrix.SILLY"], ["FABULOUS", "onboard_matrix.FABULOUS"], ["SURPRISED", "onboard_matrix.SURPRISED"], ["ASLEEP", "onboard_matrix.ASLEEP"], ["ANGRY", "onboard_matrix.ANGRY"], ["CONFUSED", "onboard_matrix.CONFUSED"], ["NO", "onboard_matrix.NO"], ["YES", "onboard_matrix.YES"], ["LEFT_ARROW", "onboard_matrix.LEFT_ARROW"], ["RIGHT_ARROW", "onboard_matrix.RIGHT_ARROW"], ["DRESS", "onboard_matrix.DRESS"], ["TRANSFORMERS", "onboard_matrix.TRANSFORMERS"], ["SCISSORS", "onboard_matrix.SCISSORS"], ["EXIT", "onboard_matrix.EXIT"], ["TREE", "onboard_matrix.TREE"], ["PACMAN", "onboard_matrix.PACMAN"], ["TARGET", "onboard_matrix.TARGET"], ["TSHIRT", "onboard_matrix.TSHIRT"], ["ROLLERSKATE", "onboard_matrix.ROLLERSKATE"], ["DUCK", "onboard_matrix.DUCK"], ["HOUSE", "onboard_matrix.HOUSE"], ["TORTOISE", "onboard_matrix.TORTOISE"], ["BUTTERFLY", "onboard_matrix.BUTTERFLY"], ["STICKFIGURE", "onboard_matrix.STICKFIGURE"], ["GHOST", "onboard_matrix.GHOST"], ["PITCHFORK", "onboard_matrix.PITCHFORK"], ["MUSIC_QUAVERS", "onboard_matrix.MUSIC_QUAVERS"], ["MUSIC_QUAVER", "onboard_matrix.MUSIC_QUAVER"], ["MUSIC_CROTCHET", "onboard_matrix.MUSIC_CROTCHET"], ["COW", "onboard_matrix.COW"], ["RABBIT", "onboard_matrix.RABBIT"], ["SQUARE_SMALL", "onboard_matrix.SQUARE_SMALL"], ["SQUARE", "onboard_matrix.SQUARE"], ["DIAMOND_SMALL", "onboard_matrix.DIAMOND_SMALL"], ["DIAMOND", "onboard_matrix.DIAMOND"], ["CHESSBOARD", "onboard_matrix.CHESSBOARD"], ["TRIANGLE_LEFT", "onboard_matrix.TRIANGLE_LEFT"], ["TRIANGLE", "onboard_matrix.TRIANGLE"], ["SNAKE", "onboard_matrix.SNAKE"], ["UMBRELLA", "onboard_matrix.UMBRELLA"], ["SKULL", "onboard_matrix.SKULL"], ["GIRAFFE", "onboard_matrix.GIRAFFE"], ["SWORD", "onboard_matrix.SWORD"]], - //builtinimg: [["HEART", "onboard_matrix.HEART"],["HEART_SMALL", "onboard_matrix.HEART_SMALL"],["HAPPY", "onboard_matrix.HAPPY"],["SAD", "onboard_matrix.SAD"],["SMILE", "onboard_matrix.SMILE"],["SILLY", "onboard_matrix.SILLY"],["FABULOUS", "onboard_matrix.FABULOUS"],["SURPRISED", "onboard_matrix.SURPRISED"],["ASLEEP", "onboard_matrix.ASLEEP"],["ANGRY", "onboard_matrix.ANGRY"],["CONFUSED", "onboard_matrix.CONFUSED"],["NO", "onboard_matrix.NO"],["YES", "onboard_matrix.YES"]], + builtinimg: pins["元控青春"].builtinimg, builtinimg_extern: [["HEART", "matrix32x12.Matrix.HEART"], ["HEART_SMALL", "matrix32x12.Matrix.HEART_SMALL"], ["HAPPY", "matrix32x12.Matrix.HAPPY"], ["SAD", "matrix32x12.Matrix.SAD"], ["SMILE", "matrix32x12.Matrix.SMILE"], ["SILLY", "matrix32x12.Matrix.SILLY"], ["FABULOUS", "matrix32x12.Matrix.FABULOUS"], ["SURPRISED", "matrix32x12.Matrix.SURPRISED"], ["ASLEEP", "matrix32x12.Matrix.ASLEEP"], ["ANGRY", "matrix32x12.Matrix.ANGRY"], ["CONFUSED", "matrix32x12.Matrix.CONFUSED"], ["NO", "matrix32x12.Matrix.NO"], ["YES", "matrix32x12.Matrix.YES"], ["LEFT_ARROW", "matrix32x12.Matrix.LEFT_ARROW"], ["RIGHT_ARROW", "matrix32x12.Matrix.RIGHT_ARROW"], ["DRESS", "matrix32x12.Matrix.DRESS"], ["TRANSFORMERS", "matrix32x12.Matrix.TRANSFORMERS"], ["SCISSORS", "matrix32x12.Matrix.SCISSORS"], ["EXIT", "matrix32x12.Matrix.EXIT"], ["TREE", "matrix32x12.Matrix.TREE"], ["PACMAN", "matrix32x12.Matrix.PACMAN"], ["TARGET", "matrix32x12.Matrix.TARGET"], ["TSHIRT", "matrix32x12.Matrix.TSHIRT"], ["ROLLERSKATE", "matrix32x12.Matrix.ROLLERSKATE"], ["DUCK", "matrix32x12.Matrix.DUCK"], ["HOUSE", "matrix32x12.Matrix.HOUSE"], ["TORTOISE", "matrix32x12.Matrix.TORTOISE"], ["BUTTERFLY", "matrix32x12.Matrix.BUTTERFLY"], ["STICKFIGURE", "matrix32x12.Matrix.STICKFIGURE"], ["GHOST", "matrix32x12.Matrix.GHOST"], ["PITCHFORK", "matrix32x12.Matrix.PITCHFORK"], ["onboard_music_QUAVERS", "matrix32x12.Matrix.onboard_music_QUAVERS"], ["onboard_music_QUAVER", "matrix32x12.Matrix.onboard_music_QUAVER"], ["onboard_music_CROTCHET", "matrix32x12.Matrix.onboard_music_CROTCHET"], ["COW", "matrix32x12.Matrix.COW"], ["RABBIT", "matrix32x12.Matrix.RABBIT"], ["SQUARE_SMALL", "matrix32x12.Matrix.SQUARE_SMALL"], ["SQUARE", "matrix32x12.Matrix.SQUARE"], ["DIAMOND_SMALL", "matrix32x12.Matrix.DIAMOND_SMALL"], ["DIAMOND", "matrix32x12.Matrix.DIAMOND"], ["CHESSBOARD", "matrix32x12.Matrix.CHESSBOARD"], ["TRIANGLE_LEFT", "matrix32x12.Matrix.TRIANGLE_LEFT"], ["TRIANGLE", "matrix32x12.Matrix.TRIANGLE"], ["SNAKE", "matrix32x12.Matrix.SNAKE"], ["UMBRELLA", "matrix32x12.Matrix.UMBRELLA"], ["SKULL", "matrix32x12.Matrix.SKULL"], ["GIRAFFE", "matrix32x12.Matrix.GIRAFFE"], ["SWORD", "matrix32x12.Matrix.SWORD"]], imglist: [["ALL_CLOCKS", "matrix.Image.ALL_CLOCKS"], ["ALL_ARROWS", "matrix.Image.ALL_ARROWS"]], playlist: [["DADADADUM", "onboard_music.DADADADUM"], ["ENTERTAINER", "onboard_music.ENTERTAINER"], ["PRELUDE", "onboard_music.PRELUDE"], ["ODE", "onboard_music.ODE"], ["NYAN", "onboard_music.NYAN"], ["RINGTONE", "onboard_music.RINGTONE"], ["FUNK", "onboard_music.FUNK"], ["BLUES", "onboard_music.BLUES"], ["BIRTHDAY", "onboard_music.BIRTHDAY"], ["WEDDING", "onboard_music.WEDDING"], ["FUNERAL", "onboard_music.FUNERAL"], ["PUNCHLINE", "onboard_music.PUNCHLINE"], ["PYTHON", "onboard_music.PYTHON"], ["BADDY", "onboard_music.BADDY"], ["CHASE", "onboard_music.CHASE"], ["BA_DING", "onboard_music.BA_DING"], ["WAWAWAWAA", "onboard_music.WAWAWAWAA"], ["JUMP_UP", "onboard_music.JUMP_UP"], ["JUMP_DOWN", "onboard_music.JUMP_DOWN"], ["POWER_UP", "onboard_music.POWER_UP"], ["POWER_DOWN", "onboard_music.POWER_DOWN"]], @@ -119,8 +215,7 @@ pins["ESP32S2 Generic"] = { tts_voice: Profile.generate(['0-16']), tts_builtin_music: Profile.generate(['0-47']), tts_bgmusic: Profile.generate(['0-15']), - builtinimg: [["HEART", "onboard_matrix.HEART"], ["HEART_SMALL", "onboard_matrix.HEART_SMALL"], ["HAPPY", "onboard_matrix.HAPPY"], ["SAD", "onboard_matrix.SAD"], ["SMILE", "onboard_matrix.SMILE"], ["SILLY", "onboard_matrix.SILLY"], ["FABULOUS", "onboard_matrix.FABULOUS"], ["SURPRISED", "onboard_matrix.SURPRISED"], ["ASLEEP", "onboard_matrix.ASLEEP"], ["ANGRY", "onboard_matrix.ANGRY"], ["CONFUSED", "onboard_matrix.CONFUSED"], ["NO", "onboard_matrix.NO"], ["YES", "onboard_matrix.YES"], ["LEFT_ARROW", "onboard_matrix.LEFT_ARROW"], ["RIGHT_ARROW", "onboard_matrix.RIGHT_ARROW"], ["DRESS", "onboard_matrix.DRESS"], ["TRANSFORMERS", "onboard_matrix.TRANSFORMERS"], ["SCISSORS", "onboard_matrix.SCISSORS"], ["EXIT", "onboard_matrix.EXIT"], ["TREE", "onboard_matrix.TREE"], ["PACMAN", "onboard_matrix.PACMAN"], ["TARGET", "onboard_matrix.TARGET"], ["TSHIRT", "onboard_matrix.TSHIRT"], ["ROLLERSKATE", "onboard_matrix.ROLLERSKATE"], ["DUCK", "onboard_matrix.DUCK"], ["HOUSE", "onboard_matrix.HOUSE"], ["TORTOISE", "onboard_matrix.TORTOISE"], ["BUTTERFLY", "onboard_matrix.BUTTERFLY"], ["STICKFIGURE", "onboard_matrix.STICKFIGURE"], ["GHOST", "onboard_matrix.GHOST"], ["PITCHFORK", "onboard_matrix.PITCHFORK"], ["MUSIC_QUAVERS", "onboard_matrix.MUSIC_QUAVERS"], ["MUSIC_QUAVER", "onboard_matrix.MUSIC_QUAVER"], ["MUSIC_CROTCHET", "onboard_matrix.MUSIC_CROTCHET"], ["COW", "onboard_matrix.COW"], ["RABBIT", "onboard_matrix.RABBIT"], ["SQUARE_SMALL", "onboard_matrix.SQUARE_SMALL"], ["SQUARE", "onboard_matrix.SQUARE"], ["DIAMOND_SMALL", "onboard_matrix.DIAMOND_SMALL"], ["DIAMOND", "onboard_matrix.DIAMOND"], ["CHESSBOARD", "onboard_matrix.CHESSBOARD"], ["TRIANGLE_LEFT", "onboard_matrix.TRIANGLE_LEFT"], ["TRIANGLE", "onboard_matrix.TRIANGLE"], ["SNAKE", "onboard_matrix.SNAKE"], ["UMBRELLA", "onboard_matrix.UMBRELLA"], ["SKULL", "onboard_matrix.SKULL"], ["GIRAFFE", "onboard_matrix.GIRAFFE"], ["SWORD", "onboard_matrix.SWORD"]], - //builtinimg: [["HEART", "onboard_matrix.HEART"],["HEART_SMALL", "onboard_matrix.HEART_SMALL"],["HAPPY", "onboard_matrix.HAPPY"],["SAD", "onboard_matrix.SAD"],["SMILE", "onboard_matrix.SMILE"],["SILLY", "onboard_matrix.SILLY"],["FABULOUS", "onboard_matrix.FABULOUS"],["SURPRISED", "onboard_matrix.SURPRISED"],["ASLEEP", "onboard_matrix.ASLEEP"],["ANGRY", "onboard_matrix.ANGRY"],["CONFUSED", "onboard_matrix.CONFUSED"],["NO", "onboard_matrix.NO"],["YES", "onboard_matrix.YES"]], + builtinimg: pins["元控青春"].builtinimg, builtinimg_extern: [["HEART", "matrix32x12.Matrix.HEART"], ["HEART_SMALL", "matrix32x12.Matrix.HEART_SMALL"], ["HAPPY", "matrix32x12.Matrix.HAPPY"], ["SAD", "matrix32x12.Matrix.SAD"], ["SMILE", "matrix32x12.Matrix.SMILE"], ["SILLY", "matrix32x12.Matrix.SILLY"], ["FABULOUS", "matrix32x12.Matrix.FABULOUS"], ["SURPRISED", "matrix32x12.Matrix.SURPRISED"], ["ASLEEP", "matrix32x12.Matrix.ASLEEP"], ["ANGRY", "matrix32x12.Matrix.ANGRY"], ["CONFUSED", "matrix32x12.Matrix.CONFUSED"], ["NO", "matrix32x12.Matrix.NO"], ["YES", "matrix32x12.Matrix.YES"], ["LEFT_ARROW", "matrix32x12.Matrix.LEFT_ARROW"], ["RIGHT_ARROW", "matrix32x12.Matrix.RIGHT_ARROW"], ["DRESS", "matrix32x12.Matrix.DRESS"], ["TRANSFORMERS", "matrix32x12.Matrix.TRANSFORMERS"], ["SCISSORS", "matrix32x12.Matrix.SCISSORS"], ["EXIT", "matrix32x12.Matrix.EXIT"], ["TREE", "matrix32x12.Matrix.TREE"], ["PACMAN", "matrix32x12.Matrix.PACMAN"], ["TARGET", "matrix32x12.Matrix.TARGET"], ["TSHIRT", "matrix32x12.Matrix.TSHIRT"], ["ROLLERSKATE", "matrix32x12.Matrix.ROLLERSKATE"], ["DUCK", "matrix32x12.Matrix.DUCK"], ["HOUSE", "matrix32x12.Matrix.HOUSE"], ["TORTOISE", "matrix32x12.Matrix.TORTOISE"], ["BUTTERFLY", "matrix32x12.Matrix.BUTTERFLY"], ["STICKFIGURE", "matrix32x12.Matrix.STICKFIGURE"], ["GHOST", "matrix32x12.Matrix.GHOST"], ["PITCHFORK", "matrix32x12.Matrix.PITCHFORK"], ["onboard_music_QUAVERS", "matrix32x12.Matrix.onboard_music_QUAVERS"], ["onboard_music_QUAVER", "matrix32x12.Matrix.onboard_music_QUAVER"], ["onboard_music_CROTCHET", "matrix32x12.Matrix.onboard_music_CROTCHET"], ["COW", "matrix32x12.Matrix.COW"], ["RABBIT", "matrix32x12.Matrix.RABBIT"], ["SQUARE_SMALL", "matrix32x12.Matrix.SQUARE_SMALL"], ["SQUARE", "matrix32x12.Matrix.SQUARE"], ["DIAMOND_SMALL", "matrix32x12.Matrix.DIAMOND_SMALL"], ["DIAMOND", "matrix32x12.Matrix.DIAMOND"], ["CHESSBOARD", "matrix32x12.Matrix.CHESSBOARD"], ["TRIANGLE_LEFT", "matrix32x12.Matrix.TRIANGLE_LEFT"], ["TRIANGLE", "matrix32x12.Matrix.TRIANGLE"], ["SNAKE", "matrix32x12.Matrix.SNAKE"], ["UMBRELLA", "matrix32x12.Matrix.UMBRELLA"], ["SKULL", "matrix32x12.Matrix.SKULL"], ["GIRAFFE", "matrix32x12.Matrix.GIRAFFE"], ["SWORD", "matrix32x12.Matrix.SWORD"]], imglist: [["ALL_CLOCKS", "matrix.Image.ALL_CLOCKS"], ["ALL_ARROWS", "matrix.Image.ALL_ARROWS"]], playlist: [["DADADADUM", ".DADADADUM"], ["ENTERTAINER", ".ENTERTAINER"], ["PRELUDE", ".PRELUDE"], ["ODE", ".ODE"], ["NYAN", ".NYAN"], ["RINGTONE", ".RINGTONE"], ["FUNK", ".FUNK"], ["BLUES", ".BLUES"], ["BIRTHDAY", ".BIRTHDAY"], ["WEDDING", ".WEDDING"], ["FUNERAL", ".FUNERAL"], ["PUNCHLINE", ".PUNCHLINE"], ["PYTHON", ".PYTHON"], ["BADDY", ".BADDY"], ["CHASE", ".CHASE"], ["BA_DING", ".BA_DING"], ["WAWAWAWAA", ".WAWAWAWAA"], ["JUMP_UP", ".JUMP_UP"], ["JUMP_DOWN", ".JUMP_DOWN"], ["POWER_UP", ".POWER_UP"], ["POWER_DOWN", ".POWER_DOWN"]], diff --git a/boards/default_src/micropython_esp32s3/generators/pins.js b/boards/default_src/micropython_esp32s3/generators/pins.js index d3ec0760..c6ac1ec2 100644 --- a/boards/default_src/micropython_esp32s3/generators/pins.js +++ b/boards/default_src/micropython_esp32s3/generators/pins.js @@ -1,7 +1,7 @@ export const pins_digital = function (_, generator) { - var code = this.getFieldValue('PIN'); + const code = this.getFieldValue('PIN'); return [code, generator.ORDER_ATOMIC]; -} +}; export const pins_button = pins_digital; export const pins_buttonB = pins_digital; @@ -30,7 +30,6 @@ export const pins_touch_pin = pins_digital; export const pins_touch = pins_digital; export const pins_interrupt = pins_digital; export const pins_serial = pins_digital; -export const pins_builtinimg = pins_digital; export const pins_builtinimg_extern = pins_digital; export const pins_imglist = pins_digital; export const pins_playlist = pins_digital; @@ -46,4 +45,14 @@ export const pins_tone_notes = pins_digital; export const pins_radio_power = pins_digital; export const pins_radio_datarate = pins_digital; export const pins_one_more = pins_digital; -export const pins_digital_dot = pins_digital; \ No newline at end of file +export const pins_digital_dot = pins_digital; + +export const pins_builtinimg = function (_, generator) { + const PIN_VALUE = this.getFieldValue('PIN'); + const data = PIN_VALUE.split('.'); + if (data.length !== 2) { + throw Error('pin value error'); + } + generator.definitions_[`import_${data[0]}_${data[1]}`] = `from ${data[0]} import ${data[1]}`; + return [data[1], generator.ORDER_ATOMIC]; +}; \ No newline at end of file diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml index cd19f01d..e2096d17 100644 --- a/boards/default_src/micropython_esp32s3/template.xml +++ b/boards/default_src/micropython_esp32s3/template.xml @@ -1841,16 +1841,14 @@ - + - - + - - +