From 6d1ddb149b73d29be2957b10175e5d580b0cdc30 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Sun, 10 Dec 2023 01:58:09 +0530 Subject: [PATCH] Added Foreman Settings --- package.json | 2 +- src/js/admin-general-view.js | 3 ++- src/pug/templates/admin-general-view.pug | 15 +++++++++------ src/py/bbctrl/Config.py | 2 +- src/resources/onefinity_defaults.json | 2 +- .../onefinity_foreman_pro_defaults.json | 16 ++++++++++++++++ 6 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 src/resources/onefinity_foreman_pro_defaults.json diff --git a/package.json b/package.json index 3aca790..3836c0f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bbctrl", - "version": "1.3.0", + "version": "1.3.1", "homepage": "https://onefinitycnc.com/", "repository": "https://github.com/OneFinityCNC/onefinity", "license": "GPL-3.0+", diff --git a/src/js/admin-general-view.js b/src/js/admin-general-view.js index 8bc2561..52eb31b 100644 --- a/src/js/admin-general-view.js +++ b/src/js/admin-general-view.js @@ -10,7 +10,8 @@ const variant_defaults = { machinist_x35: require("../resources/onefinity_machinist_x35_defaults.json"), woodworker_x35: require("../resources/onefinity_woodworker_x35_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 = { diff --git a/src/pug/templates/admin-general-view.pug b/src/pug/templates/admin-general-view.pug index 15da9ef..29b2e5c 100644 --- a/src/pug/templates/admin-general-view.pug +++ b/src/pug/templates/admin-general-view.pug @@ -26,19 +26,22 @@ script#admin-general-view-template(type="text/x-template") p(slot="body") Select defaults to restore: p.reset-variants(slot="body") 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'") - 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'") - 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'") - 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") 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") h3(slot="header") Pick your Z Slider Type @@ -53,7 +56,7 @@ script#admin-general-view-template(type="text/x-template") div(slot="footer") 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 a(href="/api/log", target="_blank") diff --git a/src/py/bbctrl/Config.py b/src/py/bbctrl/Config.py index cd05b00..59d18ee 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.3.0" + self.version = "1.3.1" # Load config template with open(get_resource('http/config-template.json'), 'r', diff --git a/src/resources/onefinity_defaults.json b/src/resources/onefinity_defaults.json index 6507b71..e3de0aa 100644 --- a/src/resources/onefinity_defaults.json +++ b/src/resources/onefinity_defaults.json @@ -1,5 +1,5 @@ { - "version": "1.3.0", + "version": "1.3.1", "settings": { "junction-accel": 200000, "max-deviation": 0.05, diff --git a/src/resources/onefinity_foreman_pro_defaults.json b/src/resources/onefinity_foreman_pro_defaults.json new file mode 100644 index 0000000..9a2d2bb --- /dev/null +++ b/src/resources/onefinity_foreman_pro_defaults.json @@ -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 + } + ] +} \ No newline at end of file