From 59fef72a84d3e064e827e58842eda07ba86952a2 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Sun, 13 Oct 2024 23:32:26 +0530 Subject: [PATCH] changed from 1.5.0 to 1.6.0, added rotary feature --- package.json | 2 +- pakage-lock.json | 2 +- src/js/app.js | 15 +++++++++++++++ src/pug/index.pug | 8 ++++++-- src/py/bbctrl/Config.py | 2 +- src/resources/images/rotary.svg | 1 + src/resources/onefinity_defaults.json | 2 +- 7 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 src/resources/images/rotary.svg diff --git a/package.json b/package.json index fbcc99d..33f88aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bbctrl", - "version": "1.5.0", + "version": "1.6.0", "homepage": "https://onefinitycnc.com/", "repository": "https://github.com/OneFinityCNC/onefinity", "license": "GPL-3.0+", diff --git a/pakage-lock.json b/pakage-lock.json index e8d9eb1..f9314f9 100644 --- a/pakage-lock.json +++ b/pakage-lock.json @@ -1,6 +1,6 @@ { "name": "bbctrl", - "version": "1.5.0", + "version": "1.6.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/src/js/app.js b/src/js/app.js index 4f39d1d..a513d2d 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -311,6 +311,21 @@ module.exports = new Vue({ return semverLt(this.config.full_version, this.latestVersion); }, + toggle_rotary: async function() { + let motor = this.config.motors[2]; + if(motor['axis'] == 'A'){ + motor['axis'] = 'Y'; + } else { + motor['axis'] = 'A'; + } + try { + await api.put("config/save", this.config); + } catch (error) { + console.error("Restore failed:", error); + alert("Error occured"); + } + }, + showShutdownDialog: function() { SvelteComponents.showDialog("Shutdown"); }, diff --git a/src/pug/index.pug b/src/pug/index.pug index bb92eba..253db33 100644 --- a/src/pug/index.pug +++ b/src/pug/index.pug @@ -77,7 +77,7 @@ html(lang="en") .brand img(src="/images/onefinity_logo.png") .version - div Version: v{{config.full_version}} Beta 3 + div Version: v{{config.full_version}} Alpha 1 div IP Address: {{config.ip}} div WiFi: {{config.wifiName}} a.upgrade-link(v-if="show_upgrade()", href="#admin-general") @@ -88,6 +88,10 @@ html(lang="en") .fa.fa-thermometer-full(class="error", v-if="80 <= state.rpi_temp", title="Raspberry Pi temperature too high.") + + .rotary + button(@click="toggle_rotary") + img(src="/images/rotary.svg", alt="rotary") .whitespace @@ -124,7 +128,7 @@ html(lang="en") label seconds. div(slot="footer") - button.pure-button.pure-button-primary(@click="errorShow = false") Ok + button.pure-button.pure-button-primary(@click="errorShow = false") OK message(:show.sync="confirmUpgrade") h3(slot="header") Upgrade Firmware? diff --git a/src/py/bbctrl/Config.py b/src/py/bbctrl/Config.py index bf0e246..bbe3bda 100644 --- a/src/py/bbctrl/Config.py +++ b/src/py/bbctrl/Config.py @@ -43,7 +43,7 @@ class Config(object): self.values = {} try: - self.version = "1.5.0" + self.version = "1.6.0" # Load config template with open(get_resource('http/config-template.json'), 'r', diff --git a/src/resources/images/rotary.svg b/src/resources/images/rotary.svg new file mode 100644 index 0000000..df952c8 --- /dev/null +++ b/src/resources/images/rotary.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/resources/onefinity_defaults.json b/src/resources/onefinity_defaults.json index 106305f..a021e98 100644 --- a/src/resources/onefinity_defaults.json +++ b/src/resources/onefinity_defaults.json @@ -1,5 +1,5 @@ { - "version": "1.5.0", + "version": "1.6.0", "settings": { "junction-accel": 200000, "max-deviation": 0.05,