feat: variabel arbejdsbredde stilles til 50 m; parkeringsture efter indlæsning kan overtages af marker (v1.62.37)

This commit is contained in:
2026-10-06 12:15:59 +02:00
parent e4bc08fbe2
commit 804dc17901
5 changed files with 154 additions and 4 deletions
+101
View File
@@ -420,6 +420,82 @@ local function courseplayWidth(vehicle)
return nil
end
-- Unrealistic-redskaber med variabel bredde (sektioner, fx Pöttinger Servo 25: 1,2–120 m) stilles til
-- VARIABLE_TARGET_WIDTH ved påkobling (brugerønske 6/10: Courseplays maksimum). Står de på minimum, afvises de
-- som "bredde ukendt" (< 1,5 m), og helt åbne er de bredere end Courseplay kan lave kursus til.
ADCpBridge.VARIABLE_TARGET_WIDTH = 50
-- widths[k] = bredde med k sektioner pr. side slået til (k = 0..n) -> det k der giver størst bredde <= target
function ADCpBridge.pickSectionCount(widths, target)
local best, bestWidth = 0, -1
for k, w in pairs(widths) do
if type(w) == "number" and w <= target + 0.01 and w > bestWidth then best, bestWidth = k, w end
end
return best
end
local function currentVariableWidth(object)
local okL, left = pcall(object.getVariableWorkWidth, object, true)
local okR, right = pcall(object.getVariableWorkWidth, object)
if not okL or not okR or type(left) ~= "number" or type(right) ~= "number" then return nil end
return math.abs(left) + math.abs(right)
end
local warnedNoApi = {}
-- -> liste af {name, before, after} for de redskaber der blev stillet
function ADCpBridge.setVariableWidth(vehicle, target)
target = target or ADCpBridge.VARIABLE_TARGET_WIDTH
local changed = {}
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.getVariableWorkWidth ~= nil then
local name = object.getName ~= nil and object:getName() or "?"
if object.setSectionsActive == nil then
if not warnedNoApi[name] then
warnedNoApi[name] = true
local keys = {}
for k in pairs(spec) do table.insert(keys, tostring(k)) end
Logging.warning("ADSmartPickup: bredde: '%s' har variabel bredde, men ingen setSectionsActive — felter: %s", name, table.concat(keys, ","))
end
else
local before = currentVariableWidth(object)
local center, left, right = {}, {}, {}
for i, section in ipairs(spec.sections) do
local ref = section.maxWidthNode or section.node
local dist = 0
if ref ~= nil and object.rootNode ~= nil then
local okD, x = pcall(function() local lx = localToLocal(ref, object.rootNode, 0, 0, 0) return lx end)
dist = okD and math.abs(x or 0) or 0
end
if section.isCenter then table.insert(center, i)
elseif section.isLeft then table.insert(left, {i = i, d = dist})
else table.insert(right, {i = i, d = dist}) end
end
table.sort(left, function(a, b) return a.d < b.d end)
table.sort(right, function(a, b) return a.d < b.d end)
local n = math.min(#left, #right)
local function ids(k)
local list = {}
for _, i in ipairs(center) do table.insert(list, i) end
for j = 1, k do table.insert(list, left[j].i); table.insert(list, right[j].i) end
return list
end
local widths = {}
for k = 0, n do
if pcall(object.setSectionsActive, object, ids(k)) then widths[k] = currentVariableWidth(object) end
end
local k = ADCpBridge.pickSectionCount(widths, target)
pcall(object.setSectionsActive, object, ids(k))
local after = currentVariableWidth(object)
table.insert(changed, {name = name, before = before, after = after})
Logging.info("ADSmartPickup: bredde: '%s' stillet fra %.1f m til %.1f m (%d af %d sektioner pr. side, mål %d m)",
name, before or -1, after or -1, k, n, target)
end
end
end
return changed
end
-- Vinhøster uden AI-markører: bredden er vinrækken (3 m = Courseplays vin-gitter for druer).
ADCpBridge.VINE_ROW_WIDTH = 3
function ADCpBridge.widthOrVine(width, hasVineCutter)
@@ -428,7 +504,23 @@ function ADCpBridge.widthOrVine(width, hasVineCutter)
return width
end
local function hasSettableVariableWidth(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.setSectionsActive ~= nil then return true end
end
return false
end
ADCpBridge.hasSettableVariableWidth = hasSettableVariableWidth
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
if (width or 0) < 1.5 and hasSettableVariableWidth(vehicle) then return ADCpBridge.VARIABLE_TARGET_WIDTH end
return width
end
function ADCpBridge.getMeasuredWorkWidth(vehicle)
local hasVine = false
for _, object in ipairs(collect(vehicle)) do
if object.spec_vineCutter ~= nil then hasVine = true end
@@ -616,6 +708,15 @@ function ADCpBridge.setVineOffset(vehicle, value)
end
function ADCpBridge.start(vehicle, fieldX, fieldZ, onDone, opts)
local okVar, errVar = pcall(ADCpBridge.setVariableWidth, vehicle)
if not okVar then Logging.warning("ADSmartPickup: bredde: %s", tostring(errVar)) end
-- lykkedes det ikke at stille en variabel bredde, startes Courseplay ikke med en halv meter (fryser spillet, 26/9)
if hasSettableVariableWidth(vehicle) then
local measured = ADCpBridge.getMeasuredWorkWidth(vehicle)
if (measured or 0) < 1.5 then
return nil, string.format("arbejdsbredden kunne ikke stilles (%.1f m)", measured or 0)
end
end
opts = opts or {}
if not ADCpBridge.isAvailable() then
return nil, "Courseplay (FIELDWORK_CP) findes ikke"