Adds the interrupt signal to the delay component, reorganises BCI files and circuit code improvements (#61393)

Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com>
This commit is contained in:
Watermelon914
2021-09-19 08:21:52 +01:00
committed by GitHub
parent f2b6fcb253
commit 21e5cfe8d2
16 changed files with 75 additions and 56 deletions
@@ -8,32 +8,43 @@
*/
/obj/item/circuit_component/delay
display_name = "Delay"
desc = "A component that delays a signal by a specified duration."
desc = "A component that delays a signal by a specified duration. Timer gets reset when triggered again."
/// Amount to delay by
var/datum/port/input/delay_amount
/// Input signal to fire the delay
var/datum/port/input/trigger
/// Interrupts the delay before it fires
var/datum/port/input/interrupt
var/timer_id = TIMER_ID_NULL
/// The output of the signal
var/datum/port/output/output
/obj/item/circuit_component/delay/populate_ports()
delay_amount = add_input_port("Delay", PORT_TYPE_NUMBER, trigger = null)
trigger = add_input_port("Trigger", PORT_TYPE_SIGNAL)
trigger = add_input_port("Trigger", PORT_TYPE_SIGNAL, trigger = .proc/trigger_delay)
interrupt = add_input_port("Interrupt", PORT_TYPE_SIGNAL, trigger = .proc/interrupt_timer)
output = add_output_port("Result", PORT_TYPE_SIGNAL)
/obj/item/circuit_component/delay/input_received(datum/port/input/port)
if(!COMPONENT_TRIGGERED_BY(trigger, port))
return
/obj/item/circuit_component/delay/proc/trigger_delay(datum/port/input/port)
CIRCUIT_TRIGGER
var/delay = delay_amount.value
if(delay > COMP_DELAY_MIN_VALUE)
// Convert delay into deciseconds
addtimer(CALLBACK(output, /datum/port/output.proc/set_output, trigger.value), delay*10)
timer_id = addtimer(CALLBACK(output, /datum/port/output.proc/set_output, trigger.value), delay*10, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_OVERRIDE)
else
if(timer_id != TIMER_ID_NULL)
deltimer(timer_id)
timer_id = TIMER_ID_NULL
output.set_output(trigger.value)
/obj/item/circuit_component/delay/proc/interrupt_timer(datum/port/input/port)
CIRCUIT_TRIGGER
if(timer_id != TIMER_ID_NULL)
deltimer(timer_id)
timer_id = TIMER_ID_NULL
#undef COMP_DELAY_MIN_VALUE