From 61d211b1d5caca4dc2d30777212c2842852759f5 Mon Sep 17 00:00:00 2001 From: Gabriel Moreira Minossi Date: Thu, 14 Jan 2021 21:42:33 -0300 Subject: [PATCH 1/2] Adding energy specific status --- Libraries/utils/utility.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Libraries/utils/utility.lua b/Libraries/utils/utility.lua index 2a8d6d4..5f76eae 100644 --- a/Libraries/utils/utility.lua +++ b/Libraries/utils/utility.lua @@ -2,7 +2,6 @@ Component = require("component") Event = require("event") local uc = require("unicode") local utility = {} -local modem = Component.modem function utility.machine(address) local machineAddress = Component.get(address) @@ -71,7 +70,7 @@ end function utility.componentChange(broadcastPort) local function sendAddress(event, address, type) - modem.broadcast(broadcastPort, event, address, type) + Component.modem.broadcast(broadcastPort, event, address, type) end Event.listen("component_added", sendAddress) end From 6b69730059cbffc5112fb0c5e040b04f54cce979 Mon Sep 17 00:00:00 2001 From: Gabriel Moreira Minossi Date: Sat, 16 Jan 2021 16:47:39 -0300 Subject: [PATCH 2/2] Fixing setup and main loop Adding libraries to the home folder waiting 0 seconds on main loop --- .../monitor-system/domain/energy/get-energy-status-usecase.lua | 2 +- Programs/monitor-system/init.lua | 2 +- setup.lua | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Programs/monitor-system/domain/energy/get-energy-status-usecase.lua b/Programs/monitor-system/domain/energy/get-energy-status-usecase.lua index 804666c..a726861 100755 --- a/Programs/monitor-system/domain/energy/get-energy-status-usecase.lua +++ b/Programs/monitor-system/domain/energy/get-energy-status-usecase.lua @@ -17,7 +17,7 @@ local function exec(address, name) local state = {} if (currentEnergy == maximumEnergy) then - state = {name = changeRate .. " EU/s", color = Colors.workingColor} + state = {name = (changeRate > 0 and "+" or "") .. changeRate .. " EU/s", color = Colors.workingColor} elseif currentEnergy == 0 then state = {name = changeRate .. " EU/s", color = Colors.errorColor} elseif changeRate > 0 then diff --git a/Programs/monitor-system/init.lua b/Programs/monitor-system/init.lua index 70d9d96..5ae180c 100755 --- a/Programs/monitor-system/init.lua +++ b/Programs/monitor-system/init.lua @@ -66,7 +66,7 @@ Page.setup(energyBufferAddresses.batteryBuffer1) while true do Page.update() - os.sleep(0.2) + os.sleep(0) end --[[ diff --git a/setup.lua b/setup.lua index a504e67..88691ba 100644 --- a/setup.lua +++ b/setup.lua @@ -27,6 +27,7 @@ shell.execute("tar -xf InfOS.tar") shell.execute("rm -f InfOS.tar") shell.setWorkingDirectory("/home/") +shell.execute("cp -ru InfOS/Libraries lib") shell.execute("rm -f .shrc") shell.execute("cp InfOS/.shrc .shrc") shell.execute("rm -f setup.lua")