Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Courseplay/courseplay
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 815318a26ed3cd67e852052b70a596372a6631c4
Choose a base ref
..
head repository: Courseplay/courseplay
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dc692d328adf1adf2644b9f93aef85cfb3466e4b
Choose a head ref
Showing with 5 additions and 5 deletions.
  1. +1 −1 base.lua
  2. +1 −1 modDesc.xml
  3. +3 −3 toolManager.lua
2 changes: 1 addition & 1 deletion base.lua
Original file line number Diff line number Diff line change
@@ -331,7 +331,7 @@ function courseplay:onDraw()
local isDriving = self:getIsCourseplayDriving();

--WORKWIDTH DISPLAY
if self.cp.settings.driverMode:get() ~= 7 and self.cp.timers.showWorkWidth and self.cp.timers.showWorkWidth > 0 then
if self.cp.settings.driverMode:get() ~= courseplay.MODE_BALE_COLLECTOR and self.cp.timers.showWorkWidth and self.cp.timers.showWorkWidth > 0 then
if courseplay:timerIsThrough(self, 'showWorkWidth') then -- stop showing, reset timer
courseplay:resetCustomTimer(self, 'showWorkWidth');
else -- timer running, show
2 changes: 1 addition & 1 deletion modDesc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<modDesc descVersion="53">
<version>6.4.0.4</version>
<version>6.4.0.5</version>
<author><![CDATA[Courseplay.devTeam]]></author>
<title>
<en>CoursePlay</en>
6 changes: 3 additions & 3 deletions toolManager.lua
Original file line number Diff line number Diff line change
@@ -168,7 +168,7 @@ function courseplay:updateWorkTools(vehicle, workTool, isImplement)

local isAllowedOkay,isDisallowedOkay = CpManager.validModeSetupHandler:isModeValid(mode,workTool)
if isAllowedOkay and isDisallowedOkay then
if mode == 5 then
if mode == courseplay.MODE_TRANSPORT then
-- For reversing purpose ?? still needed ?
if isImplement then
hasWorkTool = true;
@@ -182,7 +182,7 @@ function courseplay:updateWorkTools(vehicle, workTool, isImplement)


-- MODE 4: FERTILIZER AND SEEDING
if mode == 4 then
if mode == courseplay.MODE_SEED_FERTILIZE then
if isAllowedOkay and isDisallowedOkay then
vehicle.cp.hasMachinetoFill = true;
end;
@@ -385,7 +385,7 @@ function courseplay:setAutoTurnDiameter(vehicle, hasWorkTool)
courseplay:debug(('%s: Set turnDiameterAuto to %.2fm (2 x vehicleTurnRadius)'):format(nameNum(vehicle), vehicle.cp.turnDiameterAuto), courseplay.DBG_IMPLEMENTS);
local mode = vehicle.cp.settings.driverMode:get()
-- Check if we have worktools and if we are in a valid mode
if hasWorkTool and (mode == 2 or mode == 3 or mode == 4 or mode == 6) then
if hasWorkTool and (mode == courseplay.MODE_COMBI or mode == courseplay.MODE_OVERLOADER or mode == courseplay.MODE_SEED_FERTILIZE or mode == courseplay.MODE_FIELDWORK) then
courseplay:debug(('%s: getHighestToolTurnDiameter(%s)'):format(nameNum(vehicle), vehicle.name), courseplay.DBG_IMPLEMENTS);

local toolTurnDiameter = AIDriverUtil.getTurningRadius(vehicle) * 2