Skip to content

Fixes #17. Use new lua seq library for paths #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nmarks99 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes #17. Use new lua seq library for paths #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d650aba
Fixes #17. Use new lua seq library for paths
nmarks99 Jul 6, 2026
bb2e372
remove unused path.db
nmarks99 Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions urRobotApp/Db/path.db
View file
Open in desktop

This file was deleted.

13 changes: 11 additions & 2 deletions urRobotApp/iocsh/load_paths.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
local db = require("db")

NPATHS = tonumber(N)
KMAX = tonumber(K)
for n = 1, NPATHS do
Expand All @@ -7,6 +9,13 @@ for n = 1, NPATHS do
end
end
for n = 1, NPATHS do
local macros = string.format("P=%s,N=%d,KMAX=%d,DESC='Path %d',CTRL_PORT='%s'", P, n, KMAX, n, CTRL_PORT)
dbLoadRecords("$(URROBOT)/urRobotApp/Db/path.db", macros)
db.record("stringout", P .. "Path" .. n) {
DESC = "Description of path",
VAL = "Path " .. n
}
db.record("bo", P .. "Path" .. n .. ":Go") {
ZNAM = "Idle",
ONAM = "Go",
}
luaLoadFile("paths_seq.lua", string.format("P=%s,N=%d,KMAX=%d,CTRL_PORT=%s,STATE=path_seq_%d", P, n, KMAX, CTRL_PORT, n))
end
1 change: 1 addition & 0 deletions urRobotApp/iocsh/paths.iocsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

# Add $(URROBOT)/urRobotApp/src/lua to LUA_SCRIPT_PATH
epicsEnvSet("LUA_SCRIPT_PATH", "$(LUA_SCRIPT_PATH=):$(URROBOT)/urRobotApp/src/lua")
luaAddModule("$(LUA)")

# Load waypoint and path databases
luash("$(URROBOT)/urRobotApp/iocsh/load_waypoints.lua", "P=$(PREFIX),N=$(N_WP=30)")
Expand Down
2 changes: 1 addition & 1 deletion urRobotApp/op/adl/path10x.adl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@ menu {
height=20
}
control {
chan="$(P)Path$(N):Go.PROC"
chan="$(P)Path$(N):Go.VAL"
clr=14
bclr=51
}
Expand Down
2 changes: 1 addition & 1 deletion urRobotApp/op/adl/path30x.adl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2888,7 +2888,7 @@ menu {
height=20
}
control {
chan="$(P)Path$(N):Go.PROC"
chan="$(P)Path$(N):Go.VAL"
clr=14
bclr=51
}
Expand Down
20 changes: 10 additions & 10 deletions urRobotApp/op/adl/path_top10x.adl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ display {
height=20
}
control {
chan="$(P)Path$(N1):Go.PROC"
chan="$(P)Path$(N1):Go.VAL"
clr=14
bclr=51
}
Expand All @@ -110,7 +110,7 @@ display {
height=20
}
control {
chan="$(P)Path$(N2):Go.PROC"
chan="$(P)Path$(N2):Go.VAL"
clr=14
bclr=51
}
Expand All @@ -125,7 +125,7 @@ display {
height=20
}
control {
chan="$(P)Path$(N3):Go.PROC"
chan="$(P)Path$(N3):Go.VAL"
clr=14
bclr=51
}
Expand All @@ -140,7 +140,7 @@ display {
height=20
}
control {
chan="$(P)Path$(N4):Go.PROC"
chan="$(P)Path$(N4):Go.VAL"
clr=14
bclr=51
}
Expand All @@ -155,7 +155,7 @@ display {
height=20
}
control {
chan="$(P)Path$(N5):Go.PROC"
chan="$(P)Path$(N5):Go.VAL"
clr=14
bclr=51
}
Expand Down Expand Up @@ -397,7 +397,7 @@ text {
height=20
}
control {
chan="$(P)Path$(N6):Go.PROC"
chan="$(P)Path$(N6):Go.VAL"
clr=14
bclr=51
}
Expand Down Expand Up @@ -442,7 +442,7 @@ text {
height=20
}
control {
chan="$(P)Path$(N7):Go.PROC"
chan="$(P)Path$(N7):Go.VAL"
clr=14
bclr=51
}
Expand Down Expand Up @@ -487,7 +487,7 @@ text {
height=20
}
control {
chan="$(P)Path$(N8):Go.PROC"
chan="$(P)Path$(N8):Go.VAL"
clr=14
bclr=51
}
Expand Down Expand Up @@ -532,7 +532,7 @@ text {
height=20
}
control {
chan="$(P)Path$(N9):Go.PROC"
chan="$(P)Path$(N9):Go.VAL"
clr=14
bclr=51
}
Expand Down Expand Up @@ -577,7 +577,7 @@ text {
height=20
}
control {
chan="$(P)Path$(N10):Go.PROC"
chan="$(P)Path$(N10):Go.VAL"
clr=14
bclr=51
}
Expand Down
10 changes: 5 additions & 5 deletions urRobotApp/op/adl/path_top5x.adl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ display {
height=20
}
control {
chan="$(P)Path$(N1):Go.PROC"
chan="$(P)Path$(N1):Go.VAL"
clr=14
bclr=51
}
Expand All @@ -110,7 +110,7 @@ display {
height=20
}
control {
chan="$(P)Path$(N2):Go.PROC"
chan="$(P)Path$(N2):Go.VAL"
clr=14
bclr=51
}
Expand All @@ -125,7 +125,7 @@ display {
height=20
}
control {
chan="$(P)Path$(N3):Go.PROC"
chan="$(P)Path$(N3):Go.VAL"
clr=14
bclr=51
}
Expand All @@ -140,7 +140,7 @@ display {
height=20
}
control {
chan="$(P)Path$(N4):Go.PROC"
chan="$(P)Path$(N4):Go.VAL"
clr=14
bclr=51
}
Expand All @@ -155,7 +155,7 @@ display {
height=20
}
control {
chan="$(P)Path$(N5):Go.PROC"
chan="$(P)Path$(N5):Go.VAL"
clr=14
bclr=51
}
Expand Down
4 changes: 2 additions & 2 deletions urRobotApp/op/ui/autoconvert/path10x.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2820,7 +2820,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N):Go.PROC</string>
<string>$(P)Path$(N):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -5707,4 +5707,4 @@ caMenu{
<zorder>caTextEntry_20</zorder>
</widget>
</widget>
</ui>
</ui>
4 changes: 2 additions & 2 deletions urRobotApp/op/ui/autoconvert/path30x.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7860,7 +7860,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N):Go.PROC</string>
<string>$(P)Path$(N):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -15407,4 +15407,4 @@ caMenu{
<zorder>caTextEntry_60</zorder>
</widget>
</widget>
</ui>
</ui>
22 changes: 11 additions & 11 deletions urRobotApp/op/ui/autoconvert/path_top10x.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N1):Go.PROC</string>
<string>$(P)Path$(N1):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -162,7 +162,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N2):Go.PROC</string>
<string>$(P)Path$(N2):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -201,7 +201,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N3):Go.PROC</string>
<string>$(P)Path$(N3):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -240,7 +240,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N4):Go.PROC</string>
<string>$(P)Path$(N4):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -279,7 +279,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N5):Go.PROC</string>
<string>$(P)Path$(N5):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -999,7 +999,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N6):Go.PROC</string>
<string>$(P)Path$(N6):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -1131,7 +1131,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N7):Go.PROC</string>
<string>$(P)Path$(N7):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -1263,7 +1263,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N8):Go.PROC</string>
<string>$(P)Path$(N8):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -1395,7 +1395,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N9):Go.PROC</string>
<string>$(P)Path$(N9):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -1527,7 +1527,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N10):Go.PROC</string>
<string>$(P)Path$(N10):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -1696,4 +1696,4 @@ caMenu{
<zorder>caMessageButton_10</zorder>
</widget>
</widget>
</ui>
</ui>
12 changes: 6 additions & 6 deletions urRobotApp/op/ui/autoconvert/path_top5x.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N1):Go.PROC</string>
<string>$(P)Path$(N1):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -162,7 +162,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N2):Go.PROC</string>
<string>$(P)Path$(N2):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -201,7 +201,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N3):Go.PROC</string>
<string>$(P)Path$(N3):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -240,7 +240,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N4):Go.PROC</string>
<string>$(P)Path$(N4):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -279,7 +279,7 @@ caMenu{
<enum>EPushButton::WidthAndHeight</enum>
</property>
<property name="channel">
<string>$(P)Path$(N5):Go.PROC</string>
<string>$(P)Path$(N5):Go.VAL</string>
</property>
<property name="foreground">
<color alpha="255">
Expand Down Expand Up @@ -1021,4 +1021,4 @@ caMenu{
<zorder>caMessageButton_5</zorder>
</widget>
</widget>
</ui>
</ui>
Loading
Loading