Skip to content

Commit cf32485

Browse files
authored
Merge pull request #783 from Courseplay/loop-turn
feat: loop turns are now a setting
2 parents 72e291d + 1f1d5f5 commit cf32485

30 files changed

Lines changed: 65 additions & 1 deletion

config/MasterTranslations.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,14 @@
563563
<Text language="de"><![CDATA[Aktiviert den Pathfinder für Wendemanöver, zum Beispiel um Objekten oder der Frucht auszuweichen.]]></Text>
564564
<Text language="en"><![CDATA[Enables using the pathfinder in turns, for example to avoid obstacles and fruit.]]></Text>
565565
</Translation>
566+
<Translation name="CP_vehicle_setting_loopTurnsOnHeadland_title">
567+
<Text language="de"><![CDATA[Wendeschleife im Vorgewende]]></Text>
568+
<Text language="en"><![CDATA[Loop turn on headland]]></Text>
569+
</Translation>
570+
<Translation name="CP_vehicle_setting_loopTurnsOnHeadland_tooltip">
571+
<Text language="de"><![CDATA[Anstatt eines normalen Wendemanövers im Vorgewende, wird eine Schleife gefahren. Das erste Vorgewende sollte runde Ecken haben!]]></Text>
572+
<Text language="en"><![CDATA[Instead of performing a normal turn on headland, the vehicle will drive a loop. The first headland should have round corners!]]></Text>
573+
</Translation>
566574
<Translation name="CP_vehicle_setting_foldImplementAtEnd_title">
567575
<Text language="de"><![CDATA[Geräte am Ende einklappen]]></Text>
568576
<Text language="en"><![CDATA[Fold tools at course end]]></Text>

config/VehicleSettingsSetup.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
<!--Pathfinder Reverse-->
3737
<Setting classType="AIParameterBooleanSetting" name="allowReversePathfinding" defaultBool="true" isExpertModeOnly="true" isVisible="areCourseSettingsVisible"/>
3838
<Setting classType="AIParameterBooleanSetting" name="allowPathfinderTurns" defaultBool="false" isExpertModeOnly="true" isVisible="areCourseSettingsVisible"/>
39+
<!--Loop turns on headland-->
40+
<Setting classType="AIParameterBooleanSetting" name="loopTurnsOnHeadland" defaultBool="false" isExpertModeOnly="true" isVisible="areCourseSettingsVisible"/>
3941
</SettingSubTitle>
4042

4143
<SettingSubTitle title="implement">

scripts/ai/turns/AITurn.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ function CourseTurn:generateCalculatedTurn()
743743
local turnManeuver
744744
if self.turnContext:isHeadlandCorner() then
745745
self:debug('This is a headland turn')
746-
if self.hasChainedAttachments then
746+
if self.settings.loopTurnsOnHeadland:getValue() then
747747
-- do a 270° turn forward only
748748
turnManeuver = LoopTurnManeuver(self.vehicle, self.turnContext, self.vehicle:getAIDirectionNode(),
749749
self.turningRadius, self.workWidth, self.steeringLength)

translations/translation_br.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@
181181
<text name="CP_vehicle_setting_allowReversePathfinding_tooltip" text="Quando aplicável, permitir gerar rotas contendo marcha a ré"/>
182182
<text name="CP_vehicle_setting_allowPathfinderTurns_title" text="Permite a rota nas manobras"/>
183183
<text name="CP_vehicle_setting_allowPathfinderTurns_tooltip" text="Permite usar rotas em curvas, para evitar obstáculos e plantações"/>
184+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_title" text="Loop turn on headland"/>
185+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_tooltip" text="Instead of performing a normal turn on headland, the vehicle will drive a loop. The first headland should have round corners!"/>
184186
<text name="CP_vehicle_setting_foldImplementAtEnd_title" text="Dobrar implemento no final da rota"/>
185187
<text name="CP_vehicle_setting_foldImplementAtEnd_tooltip" text="Ativar / desativar dobrar o implemento no final da rota."/>
186188
<text name="CP_vehicle_setting_returnToStart_title" text="Voltar ao ponto inicial"/>

translations/translation_cs.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@
181181
<text name="CP_vehicle_setting_allowReversePathfinding_tooltip" text="如有必要,允许路线生成包含倒车步骤的路径。 "/>
182182
<text name="CP_vehicle_setting_allowPathfinderTurns_title" text="允许路线查找避行"/>
183183
<text name="CP_vehicle_setting_allowPathfinderTurns_tooltip" text="如果有必要,允许路径查找生成带有弯道的路径,例如规避障碍或作物。"/>
184+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_title" text="Loop turn on headland"/>
185+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_tooltip" text="Instead of performing a normal turn on headland, the vehicle will drive a loop. The first headland should have round corners!"/>
184186
<text name="CP_vehicle_setting_foldImplementAtEnd_title" text="工作结束时收起工具"/>
185187
<text name="CP_vehicle_setting_foldImplementAtEnd_tooltip" text="开启/关闭 工作结束时工具的自动收起。"/>
186188
<text name="CP_vehicle_setting_returnToStart_title" text="返回起始位置"/>

translations/translation_ct.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@
181181
<text name="CP_vehicle_setting_allowReversePathfinding_tooltip" text="如有必要,允許路線生成包含倒車步驟的路徑。 "/>
182182
<text name="CP_vehicle_setting_allowPathfinderTurns_title" text="允許路徑查找避行"/>
183183
<text name="CP_vehicle_setting_allowPathfinderTurns_tooltip" text="如果有必要,允許路徑查找生成帶有彎道的路徑,例如規避障礙或作物。"/>
184+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_title" text="Loop turn on headland"/>
185+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_tooltip" text="Instead of performing a normal turn on headland, the vehicle will drive a loop. The first headland should have round corners!"/>
184186
<text name="CP_vehicle_setting_foldImplementAtEnd_title" text="工作結束時收起工具"/>
185187
<text name="CP_vehicle_setting_foldImplementAtEnd_tooltip" text="開啟/關閉 工作結束時工具自動收起。"/>
186188
<text name="CP_vehicle_setting_returnToStart_title" text="返回起始點"/>

translations/translation_cz.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@
181181
<text name="CP_vehicle_setting_allowReversePathfinding_tooltip" text="Pokud je aktivní, použije se při generování trasy i couvání."/>
182182
<text name="CP_vehicle_setting_allowPathfinderTurns_title" text="Umožnit používání generování trasy v zatáčkách"/>
183183
<text name="CP_vehicle_setting_allowPathfinderTurns_tooltip" text="Umožňuje používat generování trasy v zatáčkách, například k vyhýbání se překážkám a plodinám."/>
184+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_title" text="Loop turn on headland"/>
185+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_tooltip" text="Instead of performing a normal turn on headland, the vehicle will drive a loop. The first headland should have round corners!"/>
184186
<text name="CP_vehicle_setting_foldImplementAtEnd_title" text="Složit nářadí na konci trasy"/>
185187
<text name="CP_vehicle_setting_foldImplementAtEnd_tooltip" text="Zapnout/vypnout složení nářadí do transportní pozice po ukončení práce."/>
186188
<text name="CP_vehicle_setting_returnToStart_title" text="Návrat na počáteční bod"/>

translations/translation_da.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@
181181
<text name="CP_vehicle_setting_allowReversePathfinding_tooltip" text="Tillad Pathfinder at generer en baglens rute."/>
182182
<text name="CP_vehicle_setting_allowPathfinderTurns_title" text="Benyt Pathfinder ved vendemanøvre"/>
183183
<text name="CP_vehicle_setting_allowPathfinderTurns_tooltip" text="Aktiver Pathfinder for vendemanøvre, f.eks. for at undvige objekter eller afgrøde."/>
184+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_title" text="Loop turn on headland"/>
185+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_tooltip" text="Instead of performing a normal turn on headland, the vehicle will drive a loop. The first headland should have round corners!"/>
184186
<text name="CP_vehicle_setting_foldImplementAtEnd_title" text="Sammenklap redskab"/>
185187
<text name="CP_vehicle_setting_foldImplementAtEnd_tooltip" text="Sammenklap redskab ved afslutning ja/nej."/>
186188
<text name="CP_vehicle_setting_returnToStart_title" text="Tilbage til start punket"/>

translations/translation_de.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@
181181
<text name="CP_vehicle_setting_allowReversePathfinding_tooltip" text="Erlaubt dem Pathfinder, einen Rückwärtskurs zu generieren."/>
182182
<text name="CP_vehicle_setting_allowPathfinderTurns_title" text="Pathfinder im Wendemanöver benutzen"/>
183183
<text name="CP_vehicle_setting_allowPathfinderTurns_tooltip" text="Aktiviert den Pathfinder für Wendemanöver, zum Beispiel um Objekten oder der Frucht auszuweichen."/>
184+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_title" text="Wendeschleife im Vorgewende"/>
185+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_tooltip" text="Anstatt eines normalen Wendemanövers im Vorgewende, wird eine Schleife gefahren. Das erste Vorgewende sollte runde Ecken haben!"/>
184186
<text name="CP_vehicle_setting_foldImplementAtEnd_title" text="Geräte am Ende einklappen"/>
185187
<text name="CP_vehicle_setting_foldImplementAtEnd_tooltip" text="Geräte am Ende des Kurses einklappen oder nicht."/>
186188
<text name="CP_vehicle_setting_returnToStart_title" text="Zum Startpunkt zurückfahren"/>

translations/translation_ea.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@
181181
<text name="CP_vehicle_setting_allowReversePathfinding_tooltip" text="Permita que el buscador de rutas utilice conducción en marcha atrás"/>
182182
<text name="CP_vehicle_setting_allowPathfinderTurns_title" text="Buscador de caminos en giros."/>
183183
<text name="CP_vehicle_setting_allowPathfinderTurns_tooltip" text="Permite usar el buscador de caminos en giros, por ejemplo, para evitar obstáculos y frutas."/>
184+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_title" text="Loop turn on headland"/>
185+
<text name="CP_vehicle_setting_loopTurnsOnHeadland_tooltip" text="Instead of performing a normal turn on headland, the vehicle will drive a loop. The first headland should have round corners!"/>
184186
<text name="CP_vehicle_setting_foldImplementAtEnd_title" text="Plegar Herramientas al final de la ruta"/>
185187
<text name="CP_vehicle_setting_foldImplementAtEnd_tooltip" text="Habilita/Deshabilita el plegado automático de herramientas al final de la ruta."/>
186188
<text name="CP_vehicle_setting_returnToStart_title" text="Regresar al Punto de Inicio."/>

0 commit comments

Comments
 (0)