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

1.0.6 Firmware release. More Github cleanup.

Browse Source
This commit is contained in:
OneFinityCNC
2021-02-28 00:58:19 -05:00
parent 7320e5e4e5
commit a0ae0a4e30
26 changed files with 118 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/js/app.js
View File

@@ -118,7 +118,8 @@ module.exports = new Vue({
password: '',
ipAddress: '0.0.0.0',
wifiSSID: '',
confirmShutdown: false
confirmShutdown: false,
diskSpace: ''
}
},
@@ -309,6 +310,7 @@ module.exports = new Vue({
this.check_ip_address();
this.check_ssid();
//.check_disk_space();
}.bind(this))
@@ -341,6 +343,20 @@ module.exports = new Vue({
this.$broadcast('wifiSSID', data);
}.bind(this))
},
// check_disk_space : function() {
// $.ajax({
// type: 'GET',
// url: 'diskinfo.txt',
// data: {hid: this.state.hid},
// cache: false
//
// }).done(function (data) {
// console.debug('>', data);
// this.diskSpace = data;
// this.$broadcast('diskSpace', data);
// }.bind(this))
// },
get_ip_address : function() {
console.debug('get_ip>', this.ipAddress);
@@ -352,11 +368,21 @@ module.exports = new Vue({
return this.wifiSSID;
},
// get_disk_space : function() {
// console.debug('get_disk>', this.diskSpace);
// return this.diskSpace;
// },
shutdown : function() {
this.confirmShutdown = false;
api.put('shutdown');
},
reboot : function() {
this.confirmShutdown = false;
api.put('reboot');
},
connect: function () {
this.sock = new Sock('//' + window.location.host + '/sockjs');

20
src/js/control-view.js
View File

@@ -73,7 +73,8 @@ module.exports = {
ask_home: true,
ask_home_msg: false,
ask_zero_xy_msg: false,
ask_zero_z_msg: false
ask_zero_z_msg: false,
showGcodeMessage: false
}
},
@@ -92,6 +93,19 @@ module.exports = {
},
immediate: true
},
'state.bitDiameter': {
handler: function (bitDiameter) {
console.log("New bitDiameter " + bitDiameter);
console.log("Units: " + this.mach_units);
if(this.mach_units == 'IMPERIAL')
this.tool_diameter = bitDiameter / 25.4;
else
this.tool_diameter = bitDiameter;
console.log("Tool diameter: " + this.tool_diameter);
},
immediate: true
},
mach_units: function (units) {
@@ -508,6 +522,7 @@ module.exports = {
if (typeof toolpath.progress == 'undefined') {
toolpath.filename = file;
this.toolpath_progress = 1;
this.showGcodeMessage = false;
this.toolpath = toolpath;
var state = this.$root.state;
@@ -518,6 +533,7 @@ module.exports = {
}
} else {
this.showGcodeMessage = true;
this.toolpath_progress = toolpath.progress;
this.load_toolpath(file, file_time); // Try again
}
@@ -590,7 +606,7 @@ module.exports = {
home: function (axis) {
this.ask_home = false;
this.ask_home_msg = false;
this.ask_home_msg = false;
if (typeof axis == 'undefined') api.put('home');

4
src/pug/index.pug
View File

@@ -87,13 +87,15 @@ html(lang="en")
li.pure-menu-heading
a.pure-menu-link(href="#help") Help
button.pure-button.pure-button-primary(@click="confirmShutdown = true") Shutdown
button.pure-button.pure-button-primary(@click="confirmShutdown = true", style="width: 100%")
.fa.fa-power-off
message(:show.sync="confirmShutdown")
h3(slot="header") Confirm shutdown?
p(slot="body") Please wait for black screen before switching off power.
div(slot="footer")
button.pure-button(@click="confirmShutdown = false") Cancel
button.pure-button.button-success(@click="shutdown") Shutdown
button.pure-button.button-success(@click="reboot") Restart
#main

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

@@ -29,8 +29,8 @@ script#admin-general-view-template(type="text/x-template")
#admin-general
h2 Firmware
button.pure-button.pure-button-primary(@click="check") Check
button.pure-button.pure-button-primary(@click="upgrade") Upgrade
label.pure-button.pure-button-primary(@click="upload_firmware") Upload
button.pure-button.pure-button-primary(@click="upgrade") Upgrade via Web
label.pure-button.pure-button-primary(@click="upload_firmware") Upgrade via File
form.upload-firmware.file-upload
input(type="file", accept=".bz2", @change="upload")

11
src/pug/templates/control-view.pug
View File

@@ -113,6 +113,17 @@ script#control-view-template(type="text/x-template")
div(slot="footer")
button.pure-button(@click=`toolpath_msg['${axis}'] = false`)
| OK
message(:show.sync="showGcodeMessage")
h3(slot="header") Processing New File
div(slot="body")
h3 Please wait..
p Simulating GCode to check for errors, calculate ETA and generate 3D view.
div(slot="footer")
label Simulating {{(toolpath_progress || 0) | percent}}
message(:show.sync=`ask_home_msg`)
h3(slot="header") Home Machine

2
src/pwr/main.c
View File

@@ -369,7 +369,7 @@ static void validate_input_voltage() {
static void charge_caps() {
IO_PORT_SET(SHUNT_PIN); // Disable shunt (hi)
delay(5);
delay(1000);
IO_PORT_SET(PC2_PIN); //Enable pre-charge circuit
delay(CAP_PRECHARGE_PERIOD); //Wait for Vs caps to charge
IO_PORT_CLR(PC2_PIN); //Disable pre-charge circuit

1
src/py/bbctrl/Ctrl.py
View File

@@ -101,6 +101,7 @@ class Ctrl(object):
def configure(self):
# Indirectly configures state via calls to config() and the AVR
self.config.reload()
self.state.init()
def ready(self):

4
src/py/bbctrl/Mach.py
View File

@@ -51,6 +51,10 @@ axis_homing_procedure = '''
'''
stall_homing_procedure = '''
G91 G1 %(axis)s [#<_%(axis)s_zero_backoff> * -1] F[#<_%(axis)s_search_velocity>]
G4 250
G91 G1 %(axis)s [#<_%(axis)s_zero_backoff>] F[#<_%(axis)s_search_velocity>]
G4 250
G28.2 %(axis)s0 F[#<_%(axis)s_search_velocity>]
G38.6 %(axis)s[#<_%(axis)s_home_travel>]
G91 G1 G53 %(axis)s[#<_%(axis)s_zero_backoff>] F100

3
src/py/bbctrl/Planner.py
View File

@@ -82,6 +82,7 @@ class Planner():
def get_config(self, mdi, with_limits):
state = self.ctrl.state
config = self.ctrl.config
is_pwm = config.get('tool-type') == 'PWM Spindle'
cfg = {
# NOTE Must get current units not configured default units
@@ -89,7 +90,7 @@ class Planner():
'max-vel': state.get_axis_vector('vm', 1000),
'max-accel': state.get_axis_vector('am', 1000000),
'max-jerk': state.get_axis_vector('jm', 1000000),
'rapid-auto-off': config.get('rapid-auto-off'),
'rapid-auto-off': config.get('rapid-auto-off') and is_pwm,
'max-blend-error': config.get('max-deviation'),
'max-merge-error': config.get('max-deviation'),
'junction-accel': config.get('junction-accel'),

17
src/py/bbctrl/State.py
View File

@@ -73,14 +73,25 @@ class State(object):
self.set_callback(str(i) + 'latch_velocity',
lambda name, i = i: self.motor_latch_velocity(i))
self.set_callback('metric', lambda name: 1 if self.is_metric() else 0)
self.set_callback('imperial', lambda name: 0 if self.is_metric() else 1)
#self.set_callback('metric', lambda name: 1 if self.is_metric() else 0)
#self.set_callback('imperial', lambda name: 0 if self.is_metric() else 1)
self.reset()
self.load_files()
def is_metric(self): return self.get('units', 'METRIC') == 'METRIC'
#def is_metric(self): return self.get('units', 'METRIC') == 'METRIC'
def init(self):
# Init machine units
metric = self.ctrl.config.get('units', 'METRIC').upper() == 'METRIC'
self.log.info('INIT Metric %d' % metric)
if not 'metric' in self.vars: self.set('metric', metric)
if not 'imperial' in self.vars: self.set('imperial', not metric)
#Bit diameter for probing
diameter = self.ctrl.config.get('probe-diameter',6.35)
self.log.info('INIT Diameter %f' % diameter)
self.set('bitDiameter',diameter)
def reset(self):

1
src/py/bbctrl/http
View File

@@ -1 +0,0 @@
../../../build/http/

1
src/py/bbctrl/http Symbolic link
View File

@@ -0,0 +1 @@
../../../build/http/

7
src/resources/config-template.json
View File

@@ -462,6 +462,13 @@
},
"probe": {
"probe-diameter": {
"type": "float",
"min": 0,
"max": 10,
"unit": "mm",
"default": 6.35
},
"probe-xdim": {
"type": "float",
"unit": "mm",

14
src/resources/onefinity_machinist_defaults.json
View File

@@ -35,8 +35,8 @@
{
"latch-velocity": 0.1,
"max-accel": 750,
"max-velocity": 12.75,
"search-velocity": 0.844,
"max-velocity": 10,
"search-velocity": 1.688,
"travel-per-rev": 10,
"idle-current": 0.5,
"drive-current": 2.8,
@@ -44,11 +44,11 @@
"enabled": true,
"homing-mode": "stall-min",
"reverse": false,
"stall-microstep": 16,
"stall-microstep": 8,
"min-soft-limit": 0,
"max-switch": "disabled",
"step-angle": 1.8,
"stall-current": 0.9,
"stall-current": 1.0,
"stall-sample-time": 200,
"microsteps": 16,
"stall-volts": 2,
@@ -61,8 +61,8 @@
{
"latch-velocity": 0.1,
"max-accel": 750,
"max-velocity": 12.75,
"search-velocity": 0.844,
"max-velocity": 10,
"search-velocity": 1.688,
"travel-per-rev": 10,
"idle-current": 0.5,
"drive-current": 2.8,
@@ -70,7 +70,7 @@
"enabled": true,
"homing-mode": "stall-min",
"reverse": false,
"stall-microstep": 16,
"stall-microstep": 8,
"min-soft-limit": 0,
"max-switch": "disabled",
"step-angle": 1.8,

12
src/resources/onefinity_woodworker_defaults.json
View File

@@ -35,8 +35,8 @@
{
"latch-velocity": 0.1,
"max-accel": 750,
"max-velocity": 12.75,
"search-velocity": 0.844,
"max-velocity": 10,
"search-velocity": 1.688,
"travel-per-rev": 10,
"idle-current": 0.5,
"drive-current": 2.8,
@@ -44,7 +44,7 @@
"enabled": true,
"homing-mode": "stall-min",
"reverse": false,
"stall-microstep": 16,
"stall-microstep": 8,
"min-soft-limit": 0,
"max-switch": "disabled",
"step-angle": 1.8,
@@ -61,8 +61,8 @@
{
"latch-velocity": 0.1,
"max-accel": 750,
"max-velocity": 12.75,
"search-velocity": 0.844,
"max-velocity": 10,
"search-velocity": 1.688,
"travel-per-rev": 10,
"idle-current": 0.5,
"drive-current": 2.8,
@@ -70,7 +70,7 @@
"enabled": true,
"homing-mode": "stall-min",
"reverse": false,
"stall-microstep": 16,
"stall-microstep": 8,
"min-soft-limit": 0,
"max-switch": "disabled",
"step-angle": 1.8,