feat: påfyldning fra paller (løse og i palleskur); risplanterens stiklinger genkendes (v1.62.16)

This commit is contained in:
2026-10-04 16:40:58 +02:00
parent ad6436ab1b
commit 389a111c89
6 changed files with 356 additions and 9 deletions
+63 -3
View File
@@ -172,6 +172,7 @@ function ADFieldWork.getRigs(adEnv)
if role == "seeder" then
rig.seedFruits = ADCpBridge.getSeedFruits(vehicle)
rig.hasSeeds = ADCpBridge.hasSeeds(vehicle)
rig.seedsOnPallets = not rig.hasSeeds and ADFieldWork.seedsOnPallets(vehicle)
end
if role == "weeder" then rig.mechanical = ADCpBridge.isMechanicalWeeder(vehicle) end
table.insert(rigs, rig)
@@ -298,6 +299,30 @@ function ADFieldWork.release(assignment, phase)
ADFieldJobs.state.assignments[assignment.vehicleId] = nil
end
-- Findes såmaskinens frø (SEEDS eller fx ris-stiklinger) på paller hos gården?
function ADFieldWork.seedsOnPallets(vehicle)
if ADPalletRefill == nil or vehicle == nil or vehicle.getOwnerFarmId == nil then return false end
local ok, result = pcall(function()
local fillType = ADCpBridge.getRefillFillType(vehicle, "seeder")
return fillType ~= nil and ADPalletRefill.hasAny(vehicle:getOwnerFarmId(), fillType)
end)
return ok and result == true
end
-- Tom og ingen station med varen: paller (løse eller i palleskur). -> true når påfyldningen er startet
local function startPalletRefill(adEnv, assignment, vehicle, fillType, label)
if ADPalletRefill == nil then return false end
local ok, source = pcall(ADPalletRefill.findSource, adEnv, vehicle, fillType)
if not ok or source == nil then return false end
assignment.pallet = ADPalletRefill.newJob(source, fillType)
assignment.phase, assignment.since = "palletRefill", now()
assignment.startX, assignment.startZ = vehiclePosition(vehicle)
startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, source.markerId, nil)
log(assignment.fieldId, "'%s' er tom — henter %s fra %s ved %s", tostring(label), ADPalletRefill.fillName(fillType),
tostring(source.kind), tostring(source.markerName))
return true
end
local function fail(fieldId, text)
note(fieldId, {retryAt = now() + ADFieldModel.RETRY_MS, reason = {text = tostring(text)}})
log(fieldId, "%s", tostring(text))
@@ -334,7 +359,10 @@ local function acceptFor(field, info, role)
return function(candidate) return ADManualTransport.acceptsHarvester(candidate, fruit) end
elseif role == "seeder" then
local fruitIndex = ADFieldWork.sowFruitIndex(field)
return function(candidate) return candidate.hasSeeds and fruitIndex ~= nil and candidate.seedFruits[fruitIndex] == true end
-- tom såmaskine er med, når dens frø findes på paller (risplanter + stiklingepaller, in-game 4/10)
return function(candidate)
return (candidate.hasSeeds or candidate.seedsOnPallets) and fruitIndex ~= nil and candidate.seedFruits[fruitIndex] == true
end
elseif role == "weeder" then
local large = (info.weed or 0) > ADFieldModel.WEED_MECHANICAL_MAX
return function(candidate) return not (large and candidate.mechanical) end
@@ -434,6 +462,7 @@ function ADFieldWork.dispatchPool(adEnv, field, info, role, roleAccept, decision
if role == "seeder" then
candidate.seedFruits = ADCpBridge.getSeedFruits(implement.vehicle)
candidate.hasSeeds = ADCpBridge.hasSeeds(implement.vehicle)
candidate.seedsOnPallets = not candidate.hasSeeds and ADFieldWork.seedsOnPallets(implement.vehicle)
end
if role == "weeder" then candidate.mechanical = ADCpBridge.isMechanicalWeeder(implement.vehicle) end
if roleAccept ~= nil and not roleAccept(candidate) then return false end
@@ -564,8 +593,14 @@ function ADFieldWork.dispatch(adEnv, field, info, decision)
else
local refill = refillPlan(adEnv, field.id, rig.vehicle, role, info.x, info.z)
if refill ~= nil and refill.empty and refill.refillId == nil then
-- tom og intet sted at fylde op: ud på marken ville den bare køre kurset uden at sprede
fail(field.id, string.format("'%s' er tom for %s og der er ingen påfyldning med AutoDrive-markør — fyld den op", rig.label, fillTypeName(refill.fillType)))
-- tom og ingen station: paller (palleskur/løse); ellers ville den bare køre kurset uden at sprede
ADFieldJobs.state.assignments[rig.id] = assignment
if startPalletRefill(adEnv, assignment, rig.vehicle, refill.fillType, rig.label) then
note(field.id, {reason = false})
return
end
ADFieldJobs.state.assignments[rig.id] = nil
fail(field.id, string.format("'%s' er tom for %s og der er ingen påfyldning eller palle med AutoDrive-markør — fyld den op", rig.label, fillTypeName(refill.fillType)))
return
end
assignment.startX, assignment.startZ = rig.x, rig.z
@@ -1301,6 +1336,10 @@ function ADFieldWork.follow(adEnv, assignment)
-- som almindelig udsendelse: tom såmaskine/sprøjte fyldes op på vejen, uden påfyldning køres den hjem igen
local refill = refillPlan(adEnv, assignment.fieldId, vehicle, assignment.role, info.x, info.z)
local nextDrive = ADPool.nextDrive(refill)
if nextDrive == "empty" and startPalletRefill(adEnv, assignment, vehicle, refill.fillType, assignment.pool.implementName) then
assignment.width = width
return
end
if nextDrive == "empty" then
ADFieldWork.release(assignment)
ADHitch.returnHome(adEnv, vehicle)
@@ -1350,6 +1389,27 @@ function ADFieldWork.follow(adEnv, assignment)
end
end
end
elseif assignment.phase == "palletRefill" then
local okTick, result, why = pcall(ADPalletRefill.tick, adEnv, assignment, ADFieldJobs.TICK_MS or 1000)
if not okTick then
result, why = "failed", tostring(result)
end
if result == "done" then
log(assignment.fieldId, "'%s' fyldt op med %.0f %s fra paller — kører til %s", ADRuns.vehicleLabel(vehicle), assignment.pallet.filled or 0,
ADPalletRefill.fillName(assignment.pallet.fillType), tostring(info ~= nil and info.markerName or "?"))
assignment.pallet = nil
assignment.phase, assignment.since = "driving", now()
assignment.startX, assignment.startZ = vehiclePosition(vehicle)
startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, info.markerId, nil)
assignment.drive = {mode = adEnv.AutoDrive.MODE_DRIVETO, first = info.markerId}
elseif result == "failed" then
ADFieldWork.release(assignment)
fail(assignment.fieldId, string.format("påfyldning fra paller mislykkedes for '%s' (%s)", ADRuns.vehicleLabel(vehicle), tostring(why)))
if not (ADHitch ~= nil and ADHitch.returnHome(adEnv, vehicle)) then
local park = parkMarkerId(adEnv, vehicle)
if park ~= nil then startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) end
end
end
elseif assignment.phase == "waitingCourse" then
if now() - assignment.since > ADFieldWork.COURSE_WAIT_MS then
ADFieldWork.release(assignment)