changed from 1.5.0 to 1.6.0, added rotary feature

This commit is contained in:
sanjayk03-dev
2024-10-13 23:32:26 +05:30
parent 5cbc9ae780
commit 59fef72a84
7 changed files with 26 additions and 6 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "bbctrl", "name": "bbctrl",
"version": "1.5.0", "version": "1.6.0",
"homepage": "https://onefinitycnc.com/", "homepage": "https://onefinitycnc.com/",
"repository": "https://github.com/OneFinityCNC/onefinity", "repository": "https://github.com/OneFinityCNC/onefinity",
"license": "GPL-3.0+", "license": "GPL-3.0+",

View File

@@ -1,6 +1,6 @@
{ {
"name": "bbctrl", "name": "bbctrl",
"version": "1.5.0", "version": "1.6.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {

View File

@@ -311,6 +311,21 @@ module.exports = new Vue({
return semverLt(this.config.full_version, this.latestVersion); 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() { showShutdownDialog: function() {
SvelteComponents.showDialog("Shutdown"); SvelteComponents.showDialog("Shutdown");
}, },

View File

@@ -77,7 +77,7 @@ html(lang="en")
.brand .brand
img(src="/images/onefinity_logo.png") img(src="/images/onefinity_logo.png")
.version .version
div Version: v{{config.full_version}} Beta 3 div Version: v{{config.full_version}} Alpha 1
div IP Address: {{config.ip}} div IP Address: {{config.ip}}
div WiFi: {{config.wifiName}} div WiFi: {{config.wifiName}}
a.upgrade-link(v-if="show_upgrade()", href="#admin-general") a.upgrade-link(v-if="show_upgrade()", href="#admin-general")
@@ -88,6 +88,10 @@ html(lang="en")
.fa.fa-thermometer-full(class="error", .fa.fa-thermometer-full(class="error",
v-if="80 <= state.rpi_temp", v-if="80 <= state.rpi_temp",
title="Raspberry Pi temperature too high.") title="Raspberry Pi temperature too high.")
.rotary
button(@click="toggle_rotary")
img(src="/images/rotary.svg", alt="rotary")
.whitespace .whitespace
@@ -124,7 +128,7 @@ html(lang="en")
label seconds. label seconds.
div(slot="footer") 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") message(:show.sync="confirmUpgrade")
h3(slot="header") Upgrade Firmware? h3(slot="header") Upgrade Firmware?

View File

@@ -43,7 +43,7 @@ class Config(object):
self.values = {} self.values = {}
try: try:
self.version = "1.5.0" self.version = "1.6.0"
# Load config template # Load config template
with open(get_resource('http/config-template.json'), 'r', with open(get_resource('http/config-template.json'), 'r',

View File

@@ -0,0 +1 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 97.13 92.11"><defs><style>.cls-1{fill:#231f20;}</style></defs><path class="cls-1" d="M73,74.28,62.24,76a11.5,11.5,0,0,1-1.76.14,11.38,11.38,0,0,1-6.68-2.19,11.23,11.23,0,0,1-4.51-7.43L47.6,55.68a11.35,11.35,0,0,1,9.48-13l10.78-1.68a11.37,11.37,0,0,1,13,9.47L82.52,61.3A11.38,11.38,0,0,1,73,74.28Z" transform="translate(-16.43 -12.45)"/><path class="cls-1" d="M109.85,47.8l-9.74,2.31A36.08,36.08,0,0,0,35.23,38.18l9.5,4.1L20,60.68,16.43,30.1l9.48,4.07A46.09,46.09,0,0,1,109.85,47.8Z" transform="translate(-16.43 -12.45)"/><path class="cls-1" d="M113.57,86.54l-9.22-4A46.1,46.1,0,0,1,20.24,69.2L30,66.89A36.08,36.08,0,0,0,95,78.55l-9.76-4.19L110,56Z" transform="translate(-16.43 -12.45)"/></svg>

After

Width:  |  Height:  |  Size: 779 B

View File

@@ -1,5 +1,5 @@
{ {
"version": "1.5.0", "version": "1.6.0",
"settings": { "settings": {
"junction-accel": 200000, "junction-accel": 200000,
"max-deviation": 0.05, "max-deviation": 0.05,