joylink/rts-sim-module
6
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
joylink_zhangsai 2023-11-06 13:54:45 +08:00
commit a6d555d4f9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fi/relay.go
View File

@ -30,8 +30,8 @@ func driveWjRelay(w ecs.World, entry *ecs.Entry, td bool) {
}
// 驱动继电器到吸起位置
func DriveRelayUp(w ecs.World, id string) {
w.Execute(func() {
func DriveRelayUp(w ecs.World, id string) error {
result := <-ecs.Request[ecs.EmptyType](w, func() ecs.Result[ecs.EmptyType] {
wd := entity.GetWorldData(w)
entry, ok := wd.EntityMap[id]
if ok {
@ -41,14 +41,16 @@ func DriveRelayUp(w ecs.World, id string) {
driveWjRelay(w, entry, true)
}
} else {
fmt.Printf("未找到id=%s的继电器\n", id)
return ecs.NewErrResult(fmt.Errorf("未找到id=%s的继电器", id))
}
return ecs.NewOkEmptyResult()
})
return result.Err
}
// 驱动继电器到落下位置
func DriveRelayDown(w ecs.World, id string) {
w.Execute(func() {
func DriveRelayDown(w ecs.World, id string) error {
result := <-ecs.Request[ecs.EmptyType](w, func() ecs.Result[ecs.EmptyType] {
wd := entity.GetWorldData(w)
entry, ok := wd.EntityMap[id]
if ok {
@ -58,7 +60,9 @@ func DriveRelayDown(w ecs.World, id string) {
driveWjRelay(w, entry, false)
}
} else {
fmt.Printf("未找到id=%s的继电器\n", id)
return ecs.NewErrResult(fmt.Errorf("未找到id=%s的继电器", id))
}
return ecs.NewOkEmptyResult()
})
return result.Err
}