Skip to content

M
MarlinKimbra
Commit a3cde075 authored by Franco (nextime) Lanza's avatar Franco (nextime) Lanza
Browse files
Options

Fix build issue with new LASER_PULSE_METHOD

parent 599c8a93
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
MK/module/laser/laser.cpp
View file @ a3cde075
...@@ -27,6 +27,9 @@ laser_t laser; ...@@ -27,6 +27,9 @@ laser_t laser;
#if ENABLED(LASER_PULSE_METHOD) #if ENABLED(LASER_PULSE_METHOD)
#define pulsebit(x) (1 << x) #define pulsebit(x) (1 << x)
#ifndef PE3 // Undef'd in fastio.h.
#define PE3 3
#endif
#endif #endif
void timer3_init(int pin) { void timer3_init(int pin) {
...@@ -217,9 +220,10 @@ void laser_fire(float intensity = 100.0){ ...@@ -217,9 +220,10 @@ void laser_fire(float intensity = 100.0){
// At least some CO2-drivers need it, not sure about laserdiode drivers. // At least some CO2-drivers need it, not sure about laserdiode drivers.
#if(ENABLED(LASER_REMAP_INTENSITY)) #if(ENABLED(LASER_REMAP_INTENSITY))
#if LASER_REMAP_INTENSITY != 0 #if LASER_REMAP_INTENSITY != 0
#define OldRange (255.0 - 0.0); float OldRange, NewRange;
#define NewRange (255.0 - LASER_REMAP_INTENSITY); OldRange = (255.0 - 0.0);
intensity = intensity * NewRange / OldRange + LASER_REMAP_INTENSITY; NewRange = (intensity - LASER_REMAP_INTENSITY);
intensity = (float)(((((float)intensity - 0) * NewRange) / OldRange) + LASER_REMAP_INTENSITY);
#endif #endif
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment