feat: fold redskaber med variabel bredde ud før bredden måles og kurset lægges (v1.62.116)

This commit is contained in:
2026-10-09 01:06:53 +02:00
parent 7f1bc7d149
commit aa1d90dac5
5 changed files with 45 additions and 2 deletions
+27
View File
@@ -601,6 +601,33 @@ local function hasSettableVariableWidth(vehicle)
end
ADCpBridge.hasSettableVariableWidth = hasSettableVariableWidth
-- Redskaber med variabel bredde måles på sektionernes yderkant — sammenfoldet giver det for lidt (in-game 9/10:
-- BiG M 450 målt til 20,8 m sammenfoldet, slog 40,8 m udfoldet). Fold dem ud før måling og kursus.
-- -> true hvis et redskab med variabel bredde er sammenfoldet (og udfoldning er sat i gang)
function ADCpBridge.unfoldVariableWidth(vehicle)
local started = false
for _, object in ipairs(collect(vehicle)) do
local spec = object.spec_variableWorkWidth
if spec ~= nil and type(spec.sections) == "table" and #spec.sections > 0 and object.spec_foldable ~= nil
and object.getIsUnfolded ~= nil and not object:getIsUnfolded() and object.setFoldDirection ~= nil then
pcall(object.setFoldDirection, object, object.spec_foldable.turnOnFoldDirection or 1)
started = true
end
end
return started
end
-- Er alle redskaber med variabel bredde foldet ud?
function ADCpBridge.variableWidthUnfolded(vehicle)
for _, object in ipairs(collect(vehicle)) do
local spec = object.spec_variableWorkWidth
if spec ~= nil and type(spec.sections) == "table" and #spec.sections > 0 and object.getIsUnfolded ~= nil and not object:getIsUnfolded() then
return false
end
end
return true
end
function ADCpBridge.getWorkWidth(vehicle)
local width = ADCpBridge.getMeasuredWorkWidth(vehicle)
-- variabel bredde på minimum (Servo 25: 1,2 m): stilles til målbredden når arbejdet starter
+1 -1
View File
@@ -28,7 +28,7 @@ ADFieldJobs.now = 0
ADFieldJobs.loaded = false
-- awaitingPlayer: høster med manuel transport, spilleren kører den til marken (tæller som i gang)
ADFieldJobs.ACTIVE_PHASES = {fetching = true, driving = true, starting = true, waitingCourse = true, working = true, awaitingPlayer = true}
ADFieldJobs.ACTIVE_PHASES = {fetching = true, driving = true, starting = true, waitingCourse = true, unfolding = true, working = true, awaitingPlayer = true}
-- Andel græs i mellemhøjde (høstbart, men halv ydelse) der får en afbrudt slåning til at vente.
ADFieldJobs.REGROW_RATIO = 0.1
+15
View File
@@ -1133,6 +1133,8 @@ local function courseOptions(adEnv, field, assignment)
return {}, nil
end
ADFieldWork.UNFOLD_WAIT_MS = 20000
local function beginWork(adEnv, field, info, assignment)
local vehicle = assignment.vehicle
-- aldrig Courseplay med tom tank (den kører kurset uden at sprede/så)
@@ -1146,6 +1148,13 @@ local function beginWork(adEnv, field, info, assignment)
end
if assignment.role == "unloader" then return beginUnloader(adEnv, field, info, assignment) end
if assignment.role == "baleCollector" then return beginBaleCollector(adEnv, field, info, assignment) end
-- variabel bredde: fold ud og vent, før bredden måles og kurset lægges (in-game 9/10: BiG M 450 målt sammenfoldet)
if not assignment.unfoldedForWidth and ADCpBridge.unfoldVariableWidth ~= nil and ADCpBridge.unfoldVariableWidth(vehicle) then
assignment.phase, assignment.since = "unfolding", now()
log(field.id, "'%s' foldes ud før bredden måles", ADRuns.vehicleLabel(vehicle))
return
end
assignment.unfoldedForWidth = nil
-- høsteren: halmskår efter planen (hakkes = fra; samles op/presses = skår)
if assignment.role == "harvester" then
local keepStraw = field.plan.straw == "collect" or field.plan.straw == "bale"
@@ -1725,6 +1734,12 @@ function ADFieldWork.follow(adEnv, assignment)
if park ~= nil then startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) end
end
end
elseif assignment.phase == "unfolding" then
-- udfoldet (eller 20 s gået): mål og start
if ADCpBridge.variableWidthUnfolded(vehicle) or now() - assignment.since > ADFieldWork.UNFOLD_WAIT_MS then
assignment.unfoldedForWidth = true
beginWork(adEnv, field, info, assignment)
end
elseif assignment.phase == "waitingCourse" then
if now() - assignment.since > ADFieldWork.COURSE_WAIT_MS then
ADFieldWork.release(assignment)
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<modDesc descVersion="107">
<author>masterdraco</author>
<version>1.62.115.0</version>
<version>1.62.116.0</version>
<title>
<en>AD Smart Pickup</en>
</title>