muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Foreman Settings

Browse Source
This commit is contained in:
sanjayk03-dev
2023-12-10 01:58:09 +05:30
parent cf72ad1c40
commit 6d1ddb149b
6 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "bbctrl", "name": "bbctrl",
"version": "1.3.0", "version": "1.3.1",
"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+",

3
src/js/admin-general-view.js
View File

@@ -10,7 +10,8 @@ const variant_defaults = {
machinist_x35: require("../resources/onefinity_machinist_x35_defaults.json"), machinist_x35: require("../resources/onefinity_machinist_x35_defaults.json"),
woodworker_x35: require("../resources/onefinity_woodworker_x35_defaults.json"), woodworker_x35: require("../resources/onefinity_woodworker_x35_defaults.json"),
woodworker_x50: require("../resources/onefinity_woodworker_x50_defaults.json"), woodworker_x50: require("../resources/onefinity_woodworker_x50_defaults.json"),
journeyman_x50: require("../resources/onefinity_journeyman_x50_defaults.json") journeyman_x50: require("../resources/onefinity_journeyman_x50_defaults.json"),
foreman_pro: require('../resources/onefinity_foreman_pro_defaults.json')
}; };
const z_slider_defaults = { const z_slider_defaults = {

15
src/pug/templates/admin-general-view.pug
View File

@@ -26,19 +26,22 @@ script#admin-general-view-template(type="text/x-template")
p(slot="body") Select defaults to restore: p(slot="body") Select defaults to restore:
p.reset-variants(slot="body") p.reset-variants(slot="body")
input#tab1(type="radio", name="reset_variant" @click="reset_variant = 'machinist_x35'") input#tab1(type="radio", name="reset_variant" @click="reset_variant = 'machinist_x35'")
label(for="tab1", title="Machinist X-35") Machinist X-35 label(for="tab1", title="Machinist X-35") Machinist X-35 / Original (16x16")
input#tab2(type="radio", name="reset_variant" @click="reset_variant = 'woodworker_x35'") input#tab2(type="radio", name="reset_variant" @click="reset_variant = 'woodworker_x35'")
label(for="tab2", title="Woodworker X-35") Woodworker X-35 label(for="tab2", title="Woodworker X-35") Woodworker X-35 / Original (32x32")
input#tab3(type="radio", name="reset_variant" @click="reset_variant = 'woodworker_x50'") input#tab3(type="radio", name="reset_variant" @click="reset_variant = 'woodworker_x50'")
label(for="tab3", title="Woodworker X-50") Woodworker X-50 label(for="tab3", title="Woodworker X-50") Woodworker X-50 / Pro (32x32")
input#tab4(type="radio", name="reset_variant" @click="reset_variant = 'journeyman_x50'") input#tab4(type="radio", name="reset_variant" @click="reset_variant = 'journeyman_x50'")
label(for="tab4", title="Journeyman X-50") Journeyman X-50 label(for="tab4", title="Journeyman X-50") Journeyman X-50 / Pro (48x32")
input#tab5(type="radio", name="reset_variant" @click="reset_variant = 'foreman_pro'")
label(for="tab5", title="Foreman Pro") Foreman Pro (48x48")
div(slot="footer") div(slot="footer")
button.pure-button(@click="confirmReset = false") Cancel button.pure-button(@click="confirmReset = false") Cancel
button.pure-button.pure-button-primary(@click="next") next button.pure-button.pure-button-primary(@click="next") Next
message(:show.sync="z_slider") message(:show.sync="z_slider")
h3(slot="header") Pick your Z Slider Type h3(slot="header") Pick your Z Slider Type
@@ -53,7 +56,7 @@ script#admin-general-view-template(type="text/x-template")
div(slot="footer") div(slot="footer")
button.pure-button(@click="z_slider = false") Cancel button.pure-button(@click="z_slider = false") Cancel
button.pure-button.pure-button-primary(@click="set_z_slider") set z slider button.pure-button.pure-button-primary(@click="set_z_slider") Set Z slider
h2 Debugging h2 Debugging
a(href="/api/log", target="_blank") a(href="/api/log", target="_blank")

2
src/py/bbctrl/Config.py
View File

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

2
src/resources/onefinity_defaults.json
View File

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

16
src/resources/onefinity_foreman_pro_defaults.json Normal file
View File

@@ -0,0 +1,16 @@
{
"motors": [
{
"max-soft-limit": 1220,
"travel-per-rev": 16
},
{
"max-soft-limit": 1225,
"travel-per-rev": 16
},
{
"max-soft-limit": 1225,
"travel-per-rev": 16
}
]
}