diff --git a/reactor-plc/renderer.lua b/reactor-plc/renderer.lua index 0700ebe..9830751 100644 --- a/reactor-plc/renderer.lua +++ b/reactor-plc/renderer.lua @@ -70,9 +70,9 @@ end function renderer.ui_ready() return ui.display ~= nil end -- handle a mouse event ----@param event mouse_interaction +---@param event mouse_interaction|nil function renderer.handle_mouse(event) - if ui.display ~= nil then + if ui.display ~= nil and event ~= nil then ui.display.handle_mouse(event) end end diff --git a/reactor-plc/startup.lua b/reactor-plc/startup.lua index bd40fce..afe733f 100644 --- a/reactor-plc/startup.lua +++ b/reactor-plc/startup.lua @@ -18,7 +18,7 @@ local plc = require("reactor-plc.plc") local renderer = require("reactor-plc.renderer") local threads = require("reactor-plc.threads") -local R_PLC_VERSION = "v1.1.17" +local R_PLC_VERSION = "v1.2.0" local println = util.println local println_ts = util.println_ts diff --git a/reactor-plc/threads.lua b/reactor-plc/threads.lua index 8470430..8dbea6d 100644 --- a/reactor-plc/threads.lua +++ b/reactor-plc/threads.lua @@ -257,9 +257,9 @@ function threads.thread__main(smem, init) -- update indicators databus.tx_hw_status(plc_state) - elseif event == "mouse_click" then - -- handle a monitor touch event - renderer.handle_mouse(core.events.click(param1, param2, param3)) + elseif event == "mouse_click" or event == "mouse_up" or event == "mouse_drag" or event == "mouse_scroll" then + -- handle a mouse event + renderer.handle_mouse(core.events.new_mouse_event(event, param1, param2, param3)) elseif event == "clock_start" then -- start loop clock loop_clock.start() diff --git a/rtu/renderer.lua b/rtu/renderer.lua index f79f19e..490959c 100644 --- a/rtu/renderer.lua +++ b/rtu/renderer.lua @@ -71,9 +71,9 @@ end function renderer.ui_ready() return ui.display ~= nil end -- handle a mouse event ----@param event mouse_interaction +---@param event mouse_interaction|nil function renderer.handle_mouse(event) - if ui.display ~= nil then + if ui.display ~= nil and event ~= nil then ui.display.handle_mouse(event) end end diff --git a/rtu/startup.lua b/rtu/startup.lua index e2d9d94..8612d72 100644 --- a/rtu/startup.lua +++ b/rtu/startup.lua @@ -28,7 +28,7 @@ local sna_rtu = require("rtu.dev.sna_rtu") local sps_rtu = require("rtu.dev.sps_rtu") local turbinev_rtu = require("rtu.dev.turbinev_rtu") -local RTU_VERSION = "v1.0.5" +local RTU_VERSION = "v1.1.0" local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE local RTU_UNIT_HW_STATE = databus.RTU_UNIT_HW_STATE diff --git a/rtu/threads.lua b/rtu/threads.lua index 9dac9f1..046525c 100644 --- a/rtu/threads.lua +++ b/rtu/threads.lua @@ -229,9 +229,9 @@ function threads.thread__main(smem) end end end - elseif event == "mouse_click" then - -- handle a monitor touch event - renderer.handle_mouse(core.events.click(param1, param2, param3)) + elseif event == "mouse_click" or event == "mouse_up" or event == "mouse_drag" or event == "mouse_scroll" then + -- handle a mouse event + renderer.handle_mouse(core.events.new_mouse_event(event, param1, param2, param3)) end -- check for termination request