minor fixes

Author: mrfrase3

buildspec.yml

@@ -10,7 +10,7 @@ phases:
   build:
     commands:
       - yarn build
-      - echo '["https://compile.duino.app"]' > dist/servers.json
+      - cp dist/servers-beta.json dist/servers.json
 artifacts:
   files:
     - '**/*'

public/servers-beta.json

@@ -0,0 +1,3 @@
+[
+  "https://compile-beta.duino.app"
+]

src/components/settings/monitor.vue

@@ -0,0 +1,65 @@
+<template>
+  <v-card outlined>
+    <v-card-title>
+      Serial Monitor
+    </v-card-title>
+    <v-card-text>
+      <v-row>
+        <v-col cols="12" sm="6" md="4" class="pt-0">
+          <v-select
+            v-model="settings.value.encoding"
+            :items="encodings"
+            label="Encoding"
+            outlined
+          />
+        </v-col>
+      </v-row>
+    </v-card-text>
+  </v-card>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      settings: { value: {} },
+      encodings: [
+        { value: 'ascii', text: 'ASCII' },
+        { value: 'utf8', text: 'UTF-8 (unicode + emojis)' },
+        { value: 'utf16le', text: 'UTF-16 LE' },
+        { value: 'ucs2', text: 'UCS-2' },
+        { value: 'base64', text: 'Base64' },
+        { value: 'hex', text: 'Hex' },
+        { value: 'latin1', text: 'Latin1' },
+      ],
+    };
+  },
+  methods: {
+    loadSettings() {
+      const { Setting } = this.$FeathersVuex.api;
+      const { data } = Setting.findInStore({ query: { key: 'monitor' } });
+      if (data[0]) {
+        [this.settings] = data;
+        return;
+      }
+      const settings = new Setting({ key: 'monitor' });
+      settings.save();
+      this.settings = settings;
+    },
+    handleSave(to, from) {
+      if (JSON.stringify(to) === JSON.stringify(from)) return false;
+      this.settings.save();
+      return true;
+    },
+  },
+  mounted() {
+    this.loadSettings();
+  },
+  watch: {
+    'settings.value.encoding': {
+      handler(to, from) { this.handleSave(to, from); },
+    },
+  },
+};
+</script>

src/plugins/compile-server.js

@@ -167,7 +167,7 @@ class CompileServer extends EventEmitter {
     const board = store.getters['boards/find']({ query: { uuid: store.getters.currentBoard } }).data[0];
     if (!board) return 'arduino:avr:uno';
     return Object.keys(board.config)
-      .filter((i) => !board.config_options
+      .filter((i) => board.config[i] && !board.config_options
         .find((c) => c.option === i).values
         .find((v) => v.value === board.config[i]).isDefault)
       .reduce((a, i) => `${a}:${i}=${board.config[i]}`, board.fqbn);
@@ -202,13 +202,13 @@ class CompileServer extends EventEmitter {
       .map((f) => ({ content: f.body, name: `${project.ref}/${f.name}` }));
     this.emit('console.progress', { percent: 0, message: 'Initialising Libraries...' });
     const libs = await this._getLibs(project);
-    if (libs.length) {
-      await this.serverReq('libraries/cache', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ libs }),
-      });
-    }
+    // if (libs.length) {
+    //   await this.serverReq('libraries/cache', {
+    //     method: 'POST',
+    //     headers: { 'Content-Type': 'application/json' },
+    //     body: JSON.stringify({ libs }),
+    //   });
+    // }
     this.emit('console.progress', { percent: 0.25 * mod, message: 'Compiling code...' });
     const req = {
       fqbn: this._getFqbn(),

src/plugins/serial/base-serial.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-unused-vars */
 /* eslint-disable class-methods-use-this */
 import EventEmitter from 'events';
+import store from '@/store';
 
 /*
 Interface should emit the following:
@@ -28,7 +29,6 @@ class BaseSerial extends EventEmitter {
     this.mute = false;
     this.baud = Number(window.localStorage.currentBaudRate) || 115200;
     this.lastBaud = 115200;
-    this.encoding = 'ascii';
     this.devices = [];
     this.currentDevice = null;
     this.connected = false;
@@ -39,6 +39,11 @@ class BaseSerial extends EventEmitter {
     // console.log('debug', this.DEBUG);
   }
 
+  get encoding() {
+    const [settings] = store.getters['settings/find']({ query: { key: 'monitor' } }).data;
+    return settings?.value?.encoding || 'ascii';
+  }
+
   install(Vue) {
     // eslint-disable-next-line no-param-reassign
     Vue.$serial = this;

src/store/services/boards.js

@@ -16,7 +16,11 @@ class Board extends BaseModel {
         if (!this.config_options) return {};
         const config = {};
         this.config_options.forEach((con) => {
-          config[con.option] = (con.values.find((val) => val.selected) || {}).value;
+          config[con.option] = (
+            con.values.find((val) => val.selected)
+            || con.values.find((val) => val.isDefault)
+            || {}
+          ).value;
         });
         return config;
       },

src/store/tools.js

@@ -41,4 +41,7 @@ export const settingsDefaults = {
   compiler: {
     verbose: false,
   },
+  monitor: {
+    encoding: 'ascii',
+  },
 };

src/views/tools/Settings.vue

@@ -12,17 +12,22 @@
     <v-col cols="12">
       <compiler />
     </v-col>
+    <v-col cols="12">
+      <monitor />
+    </v-col>
   </v-row>
 </template>
 
 <script>
 import Editor from '../../components/settings/editor.vue';
 import Compiler from '../../components/settings/compiler.vue';
+import Monitor from '../../components/settings/monitor.vue';
 
 export default {
   components: {
     Editor,
     Compiler,
+    Monitor,
   },
 };
 </script>