fix: skærebord aldrig løst på marken, CP genstartes efter off track, tømmevogne venter inde på marken (1.62.196-199)

- tømmevognenes CP-venteplads 20 m inde på marken og 40 m til siden, ikke på F-markøren
- Courseplay stoppet midt i kurset (husket waypoint findes) startes igen fra sidste punkt, højst 3 gange
- skærebord bag på: skift på den frie plads fra monteringen; slår det fejl, sættes det på foran igen;
  kør 20 m fri før ny rute ved skæv indkørsel
- koblingsture regner ankomstafstand ud fra hele sættets længde
This commit is contained in:
2026-10-10 12:47:36 +02:00
parent 7506a4e1e6
commit 59923c1bfa
9 changed files with 219 additions and 13 deletions
+51 -2
View File
@@ -8,6 +8,8 @@ ADFieldWork = {}
ADFieldWork.ARRIVE_DISTANCE = 30
ADFieldWork.IDLE_CONFIRM_MS = 5000
ADFieldWork.UNLOADER_WAIT_INSET_M = 20 -- tømmevognenes venteplads: så langt ind på marken fra kanten ved markøren
ADFieldWork.UNLOADER_WAIT_SIDE_M = 40 -- og så langt til siden langs kanten (væk fra mejetærskernes vej ind)
ADFieldWork.START_TIMEOUT_MS = 60000
ADFieldWork.COURSE_WAIT_MS = 180000
ADFieldWork.PLAYER_DRIVING_KMH = 3
@@ -1122,8 +1124,11 @@ local function beginUnloader(adEnv, field, info, assignment)
local point = ADFieldJobs.nearestPoint(info.points, vx, vz) or {x = info.x, z = info.z}
assignment.phase = "starting"
assignment.since = now()
local handle, err = ADCpBridge.startUnloader(vehicle, point.x, point.z, markerPoint ~= nil and markerPoint.x or point.x,
markerPoint ~= nil and markerPoint.z or point.z, station, function(ok, reason)
-- ventepladsen inde på marken, ikke på F-markøren (ADFieldJobs.waitSpot)
local waitX, waitZ = markerPoint ~= nil and markerPoint.x or point.x, markerPoint ~= nil and markerPoint.z or point.z
local wait = ADFieldJobs.waitSpot(info.verts, waitX, waitZ, info.x, info.z, ADFieldWork.UNLOADER_WAIT_INSET_M, ADFieldWork.UNLOADER_WAIT_SIDE_M)
if wait ~= nil then waitX, waitZ = wait.x, wait.z end
local handle, err = ADCpBridge.startUnloader(vehicle, point.x, point.z, waitX, waitZ, station, function(ok, reason)
if ok then
assignment.phase = "working"
assignment.since = now()
@@ -1464,6 +1469,32 @@ local function collectorStillMs(adEnv, assignment, vehicle)
return now() - assignment.stallSince
end
-- Courseplay stoppede midt i kurset (fx "off track"): start igen fra sidste punkt (ADFieldJobs.shouldRestartCp).
-- -> true når den blev startet igen (så er opgaven ikke færdig).
local function restartUnfinishedCp(adEnv, assignment)
local vehicle = assignment.vehicle
local okIx, rememberedIx = pcall(function()
return vehicle.getCpLastRememberedWaypointIx ~= nil and vehicle:getCpLastRememberedWaypointIx() or nil
end)
local refillEmpty = assignment.refillFillType ~= nil and ADCpBridge.getRefillLevel(vehicle, assignment.refillFillType) <= 0
local restart = ADFieldJobs.shouldRestartCp({
rememberedIx = okIx and rememberedIx or nil,
hasCourse = vehicle.hasCpCourse ~= nil and vehicle:hasCpCourse() == true,
restarts = assignment.cpRestarts, intended = assignment.cpStopIntended, controlled = isControlledByPlayer(vehicle),
helper = assignment.helper == true, refillEmpty = refillEmpty,
collector = assignment.role == "collector" or assignment.role == "baleCollector",
loaded = assignment.role ~= "harvester" and (restLoad(adEnv, vehicle) or 0) > 0,
})
if not restart then return false end
local okStart, started = pcall(ADCpResume.startAtLast, vehicle)
if not okStart or not started then return false end
assignment.cpRestarts = (assignment.cpRestarts or 0) + 1
assignment.idleSince, assignment.cpRestarting, assignment.cpRestartedAt = nil, now(), now()
log(assignment.fieldId, "'%s': Courseplay stoppede midt i kurset (waypoint %d) — startes igen fra sidste punkt (%d/%d)",
ADRuns.vehicleLabel(vehicle), rememberedIx, assignment.cpRestarts, ADFieldJobs.CP_RESTARTS)
return true
end
local function followWorking(adEnv, field, assignment)
local vehicle = assignment.vehicle
if assignment.role == "rake" and field.windrowOffset == nil and now() - assignment.since >= ADFieldWork.WINDROW_MEASURE_MS
@@ -1475,11 +1506,16 @@ local function followWorking(adEnv, field, assignment)
if ADCpBridge.isWorking(vehicle) or isAdActive(vehicle) then
assignment.idleSince = nil
assignment.seenWorking = true
assignment.cpRestarting = nil
if assignment.cpRestartedAt ~= nil and now() - assignment.cpRestartedAt >= ADFieldJobs.CP_RESTART_RESET_MS then
assignment.cpRestarts, assignment.cpRestartedAt = 0, nil
end
if assignment.role == "collector" and ADCpBridge.isWorking(vehicle) then
local okStill, stillMs = pcall(collectorStillMs, adEnv, assignment, vehicle)
if okStill and ADFieldJobs.collectorStalled({role = assignment.role, stillMs = stillMs}) then
-- intet at samle op: stop CP; næste tik afslutter som færdig (rest til lager, marken videre)
assignment.stallSince = nil
assignment.cpStopIntended = true
pcall(ADCpBridge.stop, vehicle)
local text = string.format("'%s' stod stille i %d min uden at samle noget op — opsamlingen stoppes",
ADRuns.vehicleLabel(vehicle), math.floor(ADFieldJobs.COLLECTOR_STALL_MS / 60000))
@@ -1497,8 +1533,16 @@ local function followWorking(adEnv, field, assignment)
end
return
end
-- genstartet (restartUnfinishedCp): giv CP tid til at komme i gang; kom den ikke, afsluttes opgaven som før
if assignment.cpRestarting ~= nil then
if now() - assignment.cpRestarting < ADFieldJobs.CP_RESTART_GRACE_MS then return end
assignment.cpRestarting = nil
assignment.cpRestarts = ADFieldJobs.CP_RESTARTS
log(assignment.fieldId, "'%s': Courseplay kom ikke i gang igen — opgaven afsluttes", ADRuns.vehicleLabel(vehicle))
end
assignment.idleSince = assignment.idleSince or now()
if now() - assignment.idleSince < ADFieldWork.IDLE_CONFIRM_MS then return end
if restartUnfinishedCp(adEnv, assignment) then return end
local rest = assignment.storeId ~= nil and not assignment.deliveredRest and restLoad(adEnv, vehicle) or 0
if rest > 0 and assignment.role == "harvester" and vehicle.spec_combine ~= nil then
-- mejetærsker: ikke selv til siloen med resten — røret skal foldes ud og ramme triggeren (og et skærebord på
@@ -1785,7 +1829,11 @@ function ADFieldWork.startHeaderSwap(adEnv, assignment, toward)
local vx, vz = vehiclePosition(assignment.vehicle)
local target = ADFieldJobs.coursePoint(info.points, vx, vz, info.fruitIndex) or {x = info.x, z = info.z}
mountOpts = {spot = ADFieldJobs.swapSpot(info.verts, vx, vz, target.x, target.z, ADFieldWork.SWAP_INSET_M)}
-- huskes: efter høst sættes skærebordet bag på samme frie sted
assignment.swapSpot = mountOpts.spot
end
elseif assignment.swapSpot ~= nil then
mountOpts = {spot = assignment.swapSpot}
end
local ok, started, why = pcall(mount, adEnv, assignment.vehicle, function(_, okSwap, text)
swap.done, swap.ok, swap.text = true, okSwap, text
@@ -2061,6 +2109,7 @@ function ADFieldWork.windDownHelpers(adEnv, fieldId, stage)
log(fieldId, "tømmevogn '%s' afbrudt under hentning — høsten er færdig", ADRuns.vehicleLabel(vehicle))
elseif assignment.helper and assignment.stage == stage then
if assignment.handle ~= nil then assignment.handle.cancelled = true end
assignment.cpStopIntended = true
ADCpBridge.stop(assignment.vehicle)
assignment.phase = "working"
assignment.idleSince = nil