Allow TABS in config

[clinton/Smoothieware.git] / src / modules / utils / PlayLed / PlayLed.cpp

diff --git a/src/modules/utils/PlayLed/PlayLed.cpp b/src/modules/utils/PlayLed/PlayLed.cpp
index c5f22e1..807afb2 100644 (file)
--- a/src/modules/utils/PlayLed/PlayLed.cpp
+++ b/src/modules/utils/PlayLed/PlayLed.cpp
@@ -8,6 +8,10 @@
  */
 
 #include "PauseButton.h"
+#include "modules/robot/Conveyor.h"
+#include "SlowTicker.h"
+#include "Config.h"
+#include "Pauser.h"
 
 PlayLed::PlayLed(){}
 
@@ -15,22 +19,22 @@ void PlayLed::on_module_loaded()
 {
     register_for_event(ON_CONFIG_RELOAD);
 
-    register_for_event(ON_PLAY);
+    //register_for_event(ON_PLAY);
     //TODO: these two events happen in interrupt context and it's extremely important they don't last long. This should be done by checking the size of the queue once a second or something
     //register_for_event(ON_BLOCK_BEGIN);
     //register_for_event(ON_BLOCK_END);
 
     on_config_reload(this);
 
-    kernel->slow_ticker->attach(4, this, &PlayLed::half_second_tick);
+    THEKERNEL->slow_ticker->attach(4, this, &PlayLed::half_second_tick);
 }
 
 void PlayLed::on_config_reload(void* argument)
 {
     string ledpin = "4.28!";
 
-    ledpin = kernel->config->value( pause_led_pin_checksum )->by_default(ledpin)->as_string(); // check for pause_led_pin first
-    ledpin = kernel->config->value( play_led_pin_checksum  )->by_default(ledpin)->as_string(); // override with play_led_pin if it's found
+    ledpin = THEKERNEL->config->value( pause_led_pin_checksum )->by_default(ledpin)->as_string(); // check for pause_led_pin first
+    ledpin = THEKERNEL->config->value( play_led_pin_checksum  )->by_default(ledpin)->as_string(); // override with play_led_pin if it's found
 
     led.from_string(ledpin)->as_output()->set(false);
 }
@@ -52,8 +56,9 @@ void PlayLed::on_play(void* argument)
 
 uint32_t PlayLed::half_second_tick(uint32_t)
 {
-    if (kernel->pauser->paused())
+    if (THEKERNEL->pauser->paused())
         led.set(!led.get());
+    else led.set(!THEKERNEL->conveyor->queue.is_empty());
 
     return 0;
 }