#define output_on_command_checksum CHECKSUM("output_on_command")
#define output_off_command_checksum CHECKSUM("output_off_command")
#define pwm_period_ms_checksum CHECKSUM("pwm_period_ms")
+#define failsafe_checksum CHECKSUM("failsafe_set_to")
+#define ignore_onhalt_checksum CHECKSUM("ignore_on_halt")
Switch::Switch() {}
//this->dummy_stream = &(StreamOutput::NullStream);
}
+// set the pin to the fail safe value on halt
+void Switch::on_halt(void *arg)
+{
+ if(arg == nullptr) {
+ if(this->ignore_on_halt) return;
+
+ // set pin to failsafe value
+ switch(this->output_type) {
+ case DIGITAL: this->digital_pin->set(this->failsafe); break;
+ case SIGMADELTA: this->sigmadelta_pin->set(this->failsafe); break;
+ case HWPWM: this->pwm_pin->write(0); break;
+ case NONE: break;
+ }
+ }
+}
+
void Switch::on_module_loaded()
{
this->switch_changed = false;
this->register_for_event(ON_MAIN_LOOP);
this->register_for_event(ON_GET_PUBLIC_DATA);
this->register_for_event(ON_SET_PUBLIC_DATA);
+ this->register_for_event(ON_HALT);
// Settings
this->on_config_reload(this);
}
-
// Get config
void Switch::on_config_reload(void *argument)
{
this->input_pin.from_string( THEKERNEL->config->value(switch_checksum, this->name_checksum, input_pin_checksum )->by_default("nc")->as_string())->as_input();
- this->input_pin_behavior = THEKERNEL->config->value(switch_checksum, this->name_checksum, input_pin_behavior_checksum )->by_default(momentary_checksum)->as_number();
- std::string input_on_command = THEKERNEL->config->value(switch_checksum, this->name_checksum, input_on_command_checksum )->by_default("")->as_string();
- std::string input_off_command = THEKERNEL->config->value(switch_checksum, this->name_checksum, input_off_command_checksum )->by_default("")->as_string();
- this->output_on_command = THEKERNEL->config->value(switch_checksum, this->name_checksum, output_on_command_checksum )->by_default("")->as_string();
- this->output_off_command = THEKERNEL->config->value(switch_checksum, this->name_checksum, output_off_command_checksum )->by_default("")->as_string();
- this->switch_state = THEKERNEL->config->value(switch_checksum, this->name_checksum, startup_state_checksum )->by_default(false)->as_bool();
- string type = THEKERNEL->config->value(switch_checksum, this->name_checksum, output_type_checksum )->by_default("")->as_string();
+ this->input_pin_behavior = THEKERNEL->config->value(switch_checksum, this->name_checksum, input_pin_behavior_checksum )->by_default(momentary_checksum)->as_number();
+ std::string input_on_command = THEKERNEL->config->value(switch_checksum, this->name_checksum, input_on_command_checksum )->by_default("")->as_string();
+ std::string input_off_command = THEKERNEL->config->value(switch_checksum, this->name_checksum, input_off_command_checksum )->by_default("")->as_string();
+ this->output_on_command = THEKERNEL->config->value(switch_checksum, this->name_checksum, output_on_command_checksum )->by_default("")->as_string();
+ this->output_off_command = THEKERNEL->config->value(switch_checksum, this->name_checksum, output_off_command_checksum )->by_default("")->as_string();
+ this->switch_state = THEKERNEL->config->value(switch_checksum, this->name_checksum, startup_state_checksum )->by_default(false)->as_bool();
+ string type = THEKERNEL->config->value(switch_checksum, this->name_checksum, output_type_checksum )->by_default("pwm")->as_string();
+ this->failsafe= THEKERNEL->config->value(switch_checksum, this->name_checksum, failsafe_checksum )->by_default(0)->as_number();
+ this->ignore_on_halt= THEKERNEL->config->value(switch_checksum, this->name_checksum, ignore_onhalt_checksum )->by_default(false)->as_bool();
if(type == "pwm"){
this->output_type= SIGMADELTA;
this->sigmadelta_pin= new Pwm();
this->sigmadelta_pin->from_string(THEKERNEL->config->value(switch_checksum, this->name_checksum, output_pin_checksum )->by_default("nc")->as_string())->as_output();
if(this->sigmadelta_pin->connected()) {
- set_low_on_debug(sigmadelta_pin->port_number, sigmadelta_pin->pin);
+ if(failsafe == 1) {
+ set_high_on_debug(sigmadelta_pin->port_number, sigmadelta_pin->pin);
+ }else{
+ set_low_on_debug(sigmadelta_pin->port_number, sigmadelta_pin->pin);
+ }
}else{
this->output_type= NONE;
delete this->sigmadelta_pin;
this->digital_pin= new Pin();
this->digital_pin->from_string(THEKERNEL->config->value(switch_checksum, this->name_checksum, output_pin_checksum )->by_default("nc")->as_string())->as_output();
if(this->digital_pin->connected()) {
- set_low_on_debug(digital_pin->port_number, digital_pin->pin);
+ if(failsafe == 1) {
+ set_high_on_debug(digital_pin->port_number, digital_pin->pin);
+ }else{
+ set_low_on_debug(digital_pin->port_number, digital_pin->pin);
+ }
}else{
this->output_type= NONE;
delete this->digital_pin;
}else if(type == "hwpwm"){
this->output_type= HWPWM;
Pin *pin= new Pin();
- set_low_on_debug(pin->port_number, pin->pin);
pin->from_string(THEKERNEL->config->value(switch_checksum, this->name_checksum, output_pin_checksum )->by_default("nc")->as_string())->as_output();
this->pwm_pin= pin->hardware_pwm();
+ if(failsafe == 1) {
+ set_high_on_debug(pin->port_number, pin->pin);
+ }else{
+ set_low_on_debug(pin->port_number, pin->pin);
+ }
delete pin;
if(this->pwm_pin == nullptr) {
THEKERNEL->streams->printf("Selected Switch output pin is not PWM capable - disabled");
} else if(this->output_type == HWPWM) {
// default is 50Hz
- this->pwm_pin->period_ms(THEKERNEL->config->value(switch_checksum, this->name_checksum, pwm_period_ms_checksum )->by_default(20)->as_number());
+ float p= THEKERNEL->config->value(switch_checksum, this->name_checksum, pwm_period_ms_checksum )->by_default(20)->as_number() * 1000.0F; // ms but fractions are allowed
+ this->pwm_pin->period_us(p);
+
// default is 0% duty cycle
this->switch_value = THEKERNEL->config->value(switch_checksum, this->name_checksum, startup_value_checksum )->by_default(0)->as_number();
if(this->switch_state) {
- this->pwm_pin->write(this->switch_value);
+ this->pwm_pin->write(this->switch_value/100.0F);
} else {
this->pwm_pin->write(0);
}
return;
}
- // drain queue
- THEKERNEL->conveyor->wait_for_empty_queue();
-
+ // we need to sync this with the queue, so we need to wait for queue to empty, however due to certain slicers
+ // issuing redundant swicth on calls regularly we need to optimize by making sure the value is actually changing
+ // hence we need to do the wait for queue in each case rather than just once at the start
if(match_input_on_gcode(gcode)) {
- int v;
if (this->output_type == SIGMADELTA) {
// SIGMADELTA output pin turn on (or off if S0)
if(gcode->has_letter('S')) {
- v = round(gcode->get_value('S') * sigmadelta_pin->max_pwm() / 255.0); // scale by max_pwm so input of 255 and max_pwm of 128 would set value to 128
- this->sigmadelta_pin->pwm(v);
- this->switch_state= (v > 0);
+ int v = round(gcode->get_value('S') * sigmadelta_pin->max_pwm() / 255.0); // scale by max_pwm so input of 255 and max_pwm of 128 would set value to 128
+ if(v != this->sigmadelta_pin->get_pwm()){ // optimize... ignore if already set to the same pwm
+ // drain queue
+ THEKERNEL->conveyor->wait_for_empty_queue();
+ this->sigmadelta_pin->pwm(v);
+ this->switch_state= (v > 0);
+ }
} else {
+ // drain queue
+ THEKERNEL->conveyor->wait_for_empty_queue();
this->sigmadelta_pin->pwm(this->switch_value);
this->switch_state= (this->switch_value > 0);
}
} else if (this->output_type == HWPWM) {
+ // drain queue
+ THEKERNEL->conveyor->wait_for_empty_queue();
// PWM output pin set duty cycle 0 - 100
if(gcode->has_letter('S')) {
- v = gcode->get_value('S');
+ float v = gcode->get_value('S');
if(v > 100) v= 100;
else if(v < 0) v= 0;
- this->pwm_pin->write(v);
+ this->pwm_pin->write(v/100.0F);
this->switch_state= (v != 0);
} else {
this->pwm_pin->write(this->switch_value);
}
} else if (this->output_type == DIGITAL) {
+ // drain queue
+ THEKERNEL->conveyor->wait_for_empty_queue();
// logic pin turn on
this->digital_pin->set(true);
this->switch_state = true;
}
} else if(match_input_off_gcode(gcode)) {
+ // drain queue
+ THEKERNEL->conveyor->wait_for_empty_queue();
this->switch_state = false;
if (this->output_type == SIGMADELTA) {
// SIGMADELTA output pin
if(!pdr->second_element_is(this->name_checksum)) return; // likely fan, but could be anything
// ok this is targeted at us, so send back the requested data
- // this must be static as it will be accessed long after we have returned
- static struct pad_switch pad;
- pad.name = this->name_checksum;
- pad.state = this->switch_state;
- pad.value = this->switch_value;
-
- pdr->set_data_ptr(&pad);
+ // caller has provided the location to write the state to
+ struct pad_switch *pad= static_cast<struct pad_switch *>(pdr->get_data_ptr());
+ pad->name = this->name_checksum;
+ pad->state = this->switch_state;
+ pad->value = this->switch_value;
pdr->set_taken();
}
this->sigmadelta_pin->pwm(this->switch_value); // this requires the value has been set otherwise it switches on to whatever it last was
} else if (this->output_type == HWPWM) {
- this->pwm_pin->write(this->switch_value);
+ this->pwm_pin->write(this->switch_value/100.0F);
} else if (this->output_type == DIGITAL) {
this->digital_pin->set(true);
HCoop / clinton / Smoothieware.git / blobdiff