feat: intet græsarbejde om vinteren; stillestående opsamler stoppes (v1.62.71)

This commit is contained in:
2026-10-07 23:59:29 +02:00
parent 0e07651532
commit f0204d72a7
7 changed files with 51 additions and 2 deletions
+24
View File
@@ -1272,6 +1272,18 @@ local function followManual(adEnv, field, info, assignment)
end
end
-- Opsamleren står stille med Courseplay aktiv og fyldes ikke: tæl tiden (bevægelse eller mere last nulstiller).
local function collectorStillMs(adEnv, assignment, vehicle)
local speed = vehicle.getLastSpeed ~= nil and vehicle:getLastSpeed() or 0
local fill = restLoad(adEnv, vehicle) or 0
if speed > 0.5 or fill > (assignment.stallFill or -1) + 1 then
assignment.stallSince, assignment.stallFill = nil, fill
return 0
end
assignment.stallSince = assignment.stallSince or now()
return now() - assignment.stallSince
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
@@ -1283,6 +1295,18 @@ local function followWorking(adEnv, field, assignment)
if ADCpBridge.isWorking(vehicle) or isAdActive(vehicle) then
assignment.idleSince = nil
assignment.seenWorking = true
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
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))
log(assignment.fieldId, "%s", text)
ADFieldJobs.notify(string.format("F%s: %s", tostring(assignment.fieldId), text), true)
end
end
return
end
-- genoptaget efter indlæsning: CP starter asynkront — vent til den kører, før "står stille" betyder færdig