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

Merge pull request #53 from dacarley/laser-zeroing

Browse Source 
Laser zeroing
This commit is contained in:
OneFinityCNC
2021-10-09 00:14:20 -04:00
committed by GitHub
parent bcdcda73af 78fce9e9da
commit 939e017331
3 changed files with 4 additions and 2 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.0.9", "version": "1.0.9b1",
"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+",

1
scripts/install.sh
View File

@@ -24,6 +24,7 @@ if $UPDATE_PY; then
fi fi
if $UPDATE_AVR; then if $UPDATE_AVR; then
chmod +x ./scripts/avr109-flash.py
./scripts/avr109-flash.py src/avr/bbctrl-avr-firmware.hex ./scripts/avr109-flash.py src/avr/bbctrl-avr-firmware.hex
fi fi

3
src/avr/src/spindle.c
View File

@@ -34,6 +34,7 @@
#include "command.h" #include "command.h"
#include "exec.h" #include "exec.h"
#include "util.h" #include "util.h"
#include "state.h"
#include <math.h> #include <math.h>
@@ -147,7 +148,7 @@ static power_update_t _get_power_update() {
float power = _speed_to_power(spindle.speed); float power = _speed_to_power(spindle.speed);
// Handle dynamic power // Handle dynamic power
if (spindle.dynamic_power && spindle.inv_feed) { if (state_get() == STATE_RUNNING && spindle.dynamic_power && spindle.inv_feed) {
float scale = spindle.inv_feed * exec_get_velocity(); float scale = spindle.inv_feed * exec_get_velocity();
if (scale < 1) power *= scale; if (scale < 1) power *= scale;
} }