fix settings bugs

Author: previ

src/common/coderbot.js

@@ -17,17 +17,23 @@ class CoderBot {
     const result = await this.$axios.get(`${this.CB}/listMusicPackages`);
     const packagesInstalled = [];
     const music_packages = JSON.parse(result.data);
+    const musicInstruments = [];
+    const musicAnimals = [];
     Object.entries(music_packages).forEach((key) => {
       const package_key = key[0];
       const music_package = key[1];
       const names = [music_package.name_IT, package_key];
       if (music_package.category == 'instrument') {
         packagesInstalled.push([names, 'instrument']);
+        musicInstruments.push(names);
       } else if (music_package.category == 'animal') {
         packagesInstalled.push([names, 'animal']);
+        musicAnimals.push(names);
       }
     });
     this.$store.commit('setMusicPackages', packagesInstalled);
+    this.$store.commit('setMusicInstruments', musicInstruments);
+    this.$store.commit('setMusicAnimals', musicAnimals);
   }
 
   async loadCNNModels() {

src/components/BlocklyWorkspace.vue

@@ -130,25 +130,25 @@ export default {
       // Blockly.svgResize(this.workspace);
     },
     blocksExtensions(settings) {
-      Blockly.Blocks.CoderBotSettings.instrumentlist = settings.music_instruments;
-      Blockly.Blocks.CoderBotSettings.animalist = settings.music_animals;
+      Blockly.Blocks.CoderBotSettings.instrumentlist = this.$store.getters.musicInstruments;
+      Blockly.Blocks.CoderBotSettings.animalist = this.$store.getters.musicAnimals;
       // coderbot.cfg data (temp workaround, must be fetched from backend)
-      Blockly.Blocks.CoderBotSettings.CODERBOT_MOV_FW_DEF_SPEED = settings.move_fw_speed;
-      Blockly.Blocks.CoderBotSettings.CODERBOT_MOV_FW_DEF_ELAPSE = settings.move_fw_elapse; // to check
-      Blockly.Blocks.CoderBotSettings.CODERBOT_MOV_TR_DEF_SPEED = settings.move_tr_speed;
-      Blockly.Blocks.CoderBotSettings.CODERBOT_MOV_TR_DEF_ELAPSE = settings.move_tr_elapse; // to check
+      Blockly.Blocks.CoderBotSettings.CODERBOT_MOV_FW_DEF_SPEED = settings.moveFwdSpeed;
+      Blockly.Blocks.CoderBotSettings.CODERBOT_MOV_FW_DEF_ELAPSE = settings.moveFwdElapse; // to check
+      Blockly.Blocks.CoderBotSettings.CODERBOT_MOV_TR_DEF_SPEED = settings.moveTurnSpeed;
+      Blockly.Blocks.CoderBotSettings.CODERBOT_MOV_TR_DEF_ELAPSE = settings.moveTurnElapse; // to check
       Blockly.Blocks.CoderBotSettings.CODERBOT_PROG_MOVE_MOTION = false; // should come from config
       Blockly.Blocks.CoderBotSettings.CODERBOT_PROG_MOVE_MPU = false; // should come from config
       Blockly.Blocks.CoderBotSettings.CODERBOT_ENCODER_AVAILABLE = true; // should come from config
-      Blockly.Blocks.CoderBotSettings.CODERBOT_PROG_LEVEL = settings.prog_level;
+      Blockly.Blocks.CoderBotSettings.CODERBOT_PROG_LEVEL = settings.progLevel;
 
       Blockly.Blocks.CoderBotSettings.CODERBOT_PROG_SCROLLBARS = true; // to check
       Blockly.Blocks.CoderBotSettings.CODERBOT_PROG_MAXBLOCKS = -1;
       Blockly.Blocks.CoderBotSettings.CODERBOT_PROG_SAVEONRUN = true; // to check
-      Blockly.Blocks.CoderBotSettings.CODERBOT_CTRL_FW_SPEED = settings.ctrl_fw_speed;
-      Blockly.Blocks.CoderBotSettings.CODERBOT_CTRL_FW_ELAPSE = settings.ctrl_fw_elapse;
-      Blockly.Blocks.CoderBotSettings.CODERBOT_CTRL_TR_SPEED = settings.ctrl_tr_speed;
-      Blockly.Blocks.CoderBotSettings.CODERBOT_CTRL_TR_ELAPSE = settings.ctrl_tr_elapse; // to check
+      Blockly.Blocks.CoderBotSettings.CODERBOT_CTRL_FW_SPEED = settings.ctrlFwdSpeed;
+      Blockly.Blocks.CoderBotSettings.CODERBOT_CTRL_FW_ELAPSE = settings.ctrlFwdElapse;
+      Blockly.Blocks.CoderBotSettings.CODERBOT_CTRL_TR_SPEED = settings.ctrlTurnSpeed;
+      Blockly.Blocks.CoderBotSettings.CODERBOT_CTRL_TR_ELAPSE = settings.ctrlTurnElapse; // to check
       Blockly.Blocks.CoderBotSettings.CODERBOT_CTRL_COUNTER = true; // to check, never used
       Blockly.Blocks.CoderBotSettings.CODERBOT_CTRL_MOVE_MOTION = false; // should come from config
       Blockly.Blocks.CoderBotSettings.CODERBOT_CTRL_MOVE_MPU = false; // should come from config

src/components/ToolboxEditor.vue

@@ -107,7 +107,7 @@ export default {
     const toolbox_full = require('../assets/toolbox_adv.json');
     this.toolbox_editor = toolbox_full;
 
-    this.loadMusicPackages();
+    // this.loadMusicPackages();
 
     if (this.toolbox_in) {
       this.toolbox = this.toolbox_in;
@@ -128,6 +128,7 @@ export default {
     }
   },
   methods: {
+    /*
     loadMusicPackages() {
       this.$axios.get(`${this.CB}/listMusicPackages`).then((result) => {
         this.settings.music_instruments = [];
@@ -145,7 +146,7 @@ export default {
         });
       });
     },
-
+    */
     onChangeCategory() {
       if (this.category_index != null
         && this.toolbox.kind == categoryToolbox) {

src/store/index.js

@@ -9,6 +9,8 @@ const state = {
   status: null,
   settings: null,
   musicPackages: null,
+  musicInstruments: null,
+  musicAnimals: null,
   cnnModules: null,
   activity: null
 };
@@ -33,6 +35,12 @@ const mutations = {
   setMusicPackages(state, val) {
     state.musicPackages = val;
   },
+  setMusicInstruments(state, val) {
+    state.musicInstruments = val;
+  },
+  setMusicAnimals(state, val) {
+    state.musicAnimals = val;
+  },
   setCNNModels(state, val) {
     state.cnnModules = val;
   },
@@ -60,6 +68,12 @@ const getters = {
   musicPackages(state) {
     return state.musicPackages;
   },
+  musicInstruments(state) {
+    return state.musicInstruments;
+  },
+  musicAnimals(state) {
+    return state.musicAnimals;
+  },
   cnnModules(state) {
     return state.cnnModules;
   },