fix up some style issues in the laser PR

[clinton/Smoothieware.git] / src / modules / tools / laser / Laser.h

diff --git a/src/modules/tools/laser/Laser.h b/src/modules/tools/laser/Laser.h
index 556cfca..003202a 100644 (file)
--- a/src/modules/tools/laser/Laser.h
+++ b/src/modules/tools/laser/Laser.h
@@ -25,12 +25,17 @@ class Laser : public Module{
         void on_halt(void* argument);
         void on_gcode_received(void *argument);
         void on_console_line_received(void *argument);
+        void on_get_public_data(void* argument);
+
+        void set_scale(float s) { scale= s/100; }
+        float get_scale() const { return scale*100; }
+        bool set_laser_power(float p);
+        float get_current_power() const;
 
     private:
         uint32_t set_proportional_power(uint32_t dummy);
         bool get_laser_power(float& power) const;
         float current_speed_ratio(const Block *block) const;
-        void turn_laser_off();
 
         mbed::PwmOut *pwm_pin;    // PWM output to regulate the laser power
         Pin *ttl_pin;                          // TTL output to fire laser
@@ -38,10 +43,14 @@ class Laser : public Module{
         float laser_minimum_power; // value used to tickle the laser on moves.  Also minimum value for auto-scaling
         float laser_maximum_s_value; // Value of S code that will represent max power
         float scale;
+        int32_t fire_duration; // manual fire command duration
+        int32_t ms_per_tick; // ms between each ticks, depends on PWM frequency
+
         struct {
             bool laser_on:1;      // set if the laser is on
             bool pwm_inverting:1; // stores whether the PWM period should be inverted
-            bool ttl_used:1;           // stores whether we have a TTL output
+            bool ttl_used:1;        // stores whether we have a TTL output
             bool ttl_inverting:1;   // stores whether the TTL output should be inverted
+            bool manual_fire:1;     // set when manually firing
         };
 };