18069996051/mixly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mixgo_sant 修改sant_g2

Browse Source
This commit is contained in:
Irene-Maxine
2025-01-10 15:11:10 +08:00
parent 701a2597c8
commit cd53d4873a
5 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
boards/default_src/micropython/generators/actuator_onboard.js
View File

@@ -51,9 +51,9 @@ export const esp32_onboard_music_stop = function (block, generator) {
export const esp32_onboard_music_play_list = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2]
var lst = generator.valueToCode(this, 'LIST', generator.ORDER_ASSIGNMENT);
if (version == 'mixgo_zero') {
generator.definitions_['import_mixgo_zero_voice_spk_midi'] = "from mixgo_zero_voice import spk_midi";
var code = "spk_midi.play(" + lst + ")\n";
if (version == 'mixgo_sant') {
generator.definitions_['import_mixgo_sant_onboard_music'] = "from mixgo_sant import onboard_music";
var code = "onboard_music.play(" + lst + ")\n";
} else if (version == 'mixgo_nova') {
generator.definitions_['import_mixgo_nova_voice_spk_midi'] = "from mixgo_nova_voice import spk_midi";
var code = "spk_midi.play(" + lst + ")\n";

8
boards/default_src/micropython/generators/sensor_extern.js
View File

@@ -232,11 +232,10 @@ export const radar_set_DETECTION_THRESHOLD = function (_, generator) {
}
export const radar_set_DETECTION_THRESHOLD_SANT = function (_, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
generator.definitions_['import_'+version +'_ext_mmw'] = 'from '+ version +' import ext_mmw';
generator.definitions_['import_sant_g2_ext_mmw'] = 'from sant_g2 import ext_mmw';
var value = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var value2 = generator.valueToCode(this, 'VAR2', generator.ORDER_ATOMIC);
var code = 'ext_mmw.threshold(' + value +')\n'+ 'ext.mmw.delay_ms(' + value2 +')\n';
var code = 'ext_mmw.threshold(' + value +')\n'+ 'ext_mmw.delay_ms(' + value2 +')\n';
return code;
}
@@ -248,8 +247,7 @@ export const interaction_whether_to_interaction = function(_,generator){
}
export const interaction_whether_to_interaction_SANT = function(_,generator){
var version = Boards.getSelectedBoardKey().split(':')[2];
generator.definitions_['import_'+version +'_ext_mmw'] = 'from '+ version +' import ext_mmw';
generator.definitions_['import_sant_g2_ext_mmw'] = 'from sant_g2 import ext_mmw';
var code = 'ext_mmw.result()';
return [code,generator.ORDER_ATOMIC];
}

4
boards/default_src/micropython_esp32s3/blocks/esp32_profile.js
View File

@@ -47,7 +47,7 @@ pins["元控青春"] = {
digital_dot: [["0", "0"], ["1", "1"], ["2", "2"]],
};
pins["元控"] = {
pins["元控自强"] = {
description: "MicroPython[ESP32C3 MixGo CE]",
digital_pin: Profile.generate(['0-18', '21', '33-48']),
input_pin: Profile.generate(['0-18', '21', '33-48']),
@@ -78,7 +78,7 @@ pins["元控"] = {
//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_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"]],
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"]],
playlist_extern: [["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"]],
tone_notes: [
["NOTE_C3", "131"], ["NOTE_D3", "147"], ["NOTE_E3", "165"], ["NOTE_F3", "175"], ["NOTE_G3", "196"], ["NOTE_A3", "220"], ["NOTE_B3", "247"],

18
boards/default_src/micropython_esp32s3/generators/sant_g2.js
View File

@@ -21,12 +21,14 @@ import { Boards } from 'mixly';
// }
export const mini_g2_rfid_readid = function (_, generator) {
generator.definitions_['import_mini_g2'] = 'import mini_g2';
var version = Boards.getSelectedBoardKey().split(':')[2];
if (version == "mixgo_mini") {
generator.definitions_['import_mini_g2_ext_rfid'] = 'from mini_g2 import ext_rfid';
var code = 'ext_rfid.read_card(0, x="id")';
} else {
} else if(version == "mixgo_sant"){
generator.definitions_['import_sant_g2_ext_rfid'] = 'from sant_g2 import ext_rfid';
var code = 'ext_rfid.read_card(0, x="id")';
}else {
generator.definitions_['import_mini_g2'] = 'import mini_g2';
var code = 'mini_g2.ext_rc522.read_card(0, x="id")';
}
@@ -39,6 +41,9 @@ export const mini_g2_rfid_readcontent = function (_, generator) {
if (version == "mixgo_mini") {
generator.definitions_['import_mini_g2_ext_rfid'] = 'from mini_g2 import ext_rfid';
var code = 'ext_rfid.read_card(' + sector + ')';
}else if(version == "mixgo_sant"){
generator.definitions_['import_sant_g2_ext_rfid'] = 'from sant_g2 import ext_rfid';
var code = 'ext_rfid.read_card(' + sector + ')';
} else {
generator.definitions_['import_mini_g2'] = 'import mini_g2';
var code = 'mini_g2.ext_rc522.read_card(' + sector + ')';
@@ -53,6 +58,9 @@ export const mini_g2_rfid_write = function (_, generator) {
if (version == "mixgo_mini") {
generator.definitions_['import_mini_g2_ext_rfid'] = 'from mini_g2 import ext_rfid';
var code = 'ext_rfid.write_card(' + cnt + ',' + sector + ')\n';
}else if(version == "mixgo_sant"){
generator.definitions_['import_sant_g2_ext_rfid'] = 'from sant_g2 import ext_rfid';
var code = 'ext_rfid.write_card(' + cnt + ',' + sector + ')\n';
} else {
generator.definitions_['import_mini_g2'] = 'import mini_g2';
var code = 'mini_g2.ext_rc522.write_card(' + cnt + ',' + sector + ')\n';
@@ -67,6 +75,9 @@ export const mini_g2_rfid_write_outcome = function (_, generator) {
if (version == "mixgo_mini") {
generator.definitions_['import_mini_g2_ext_rfid'] = 'from mini_g2 import ext_rfid';
var code = 'ext_rfid.write_card(' + cnt + ',' + sector + ')';
}else if(version == "mixgo_sant"){
generator.definitions_['import_sant_g2_ext_rfid'] = 'from sant_g2 import ext_rfid';
var code = 'ext_rfid.write_card(' + cnt + ',' + sector + ')';
} else {
generator.definitions_['import_mini_g2'] = 'import mini_g2';
var code = 'mini_g2.ext_rc522.write_card(' + cnt + ',' + sector + ')';
@@ -80,6 +91,9 @@ export const mini_g2_rfid_status = function (_, generator) {
if (version == "mixgo_mini") {
generator.definitions_['import_mini_g2_ext_rfid'] = 'from mini_g2 import ext_rfid';
var code = 'ext_rfid.scan_card()==' + key;
}else if(version == "mixgo_sant"){
generator.definitions_['import_sant_g2_ext_rfid'] = 'from sant_g2 import ext_rfid';
var code = 'ext_rfid.scan_card()==' + key;
} else {
generator.definitions_['import_mini_g2'] = 'import mini_g2';
var code = 'mini_g2.ext_rc522.scan_card()==' + key;

23
boards/default_src/micropython_esp32s3/origin/build/lib/mini_g2.py
View File

@@ -1,23 +0,0 @@
"""
MINI G2 -MixGo MINI EXT G2
MicroPython library for the MINI G2 (Expansion board for MixGo MINI)
=======================================================
@dahanzimin From the Mixly Team
"""
import gc
from machine import Pin, SoftI2C
'''i2c-extboard'''
ext_i2c = SoftI2C(scl=Pin(7), sda=Pin(8), freq=400000)
'''RFID_Sensor'''
try :
import rc522
ext_rfid = rc522.RC522(ext_i2c)
except Exception as e:
print("Warning: Failed to communicate with SI522A (RFID) or",e)
'''Reclaim memory'''
gc.collect()