Skip to content

Commit

Permalink
IMPROVEMENT: Move template files to vehicle type subdirectory, to all…
Browse files Browse the repository at this point in the history
…ow future expansion with ArduPlane, Rover, etc

Move the user files to the windows userappdata instead of commonappdata
  • Loading branch information
amilcarlucas committed Apr 29, 2024
1 parent 7e8d853 commit 6b14e5e
Show file tree
Hide file tree
Showing 214 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion copy_magfit_pdef_to_template_dirs.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import sys

# Define the source directory and the file to be copied
BASE_TARGET_DIR = 'vehicle_examples/diatone_taycan_mxc'
BASE_TARGET_DIR = 'vehicle_templates/ArduCopter/diatone_taycan_mxc'
FILE_TO_COPY = '22_inflight_magnetometer_fit_setup.pdef.xml'

# Ensure the base target directory exists
Expand Down
2 changes: 1 addition & 1 deletion install_windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ for %%f in (
4.6.0-DEV-params
) do (
set "src=apm.pdef.%%f.xml"
set "dest=vehicle_examples\diatone_taycan_mxc\%%f\apm.pdef.xml"
set "dest=vehicle_templates\ArduCopter\diatone_taycan_mxc\%%f\apm.pdef.xml"
rem remove the old linux softlinks
del !dest!
rem echo Copying !src! to !dest!
Expand Down
8 changes: 4 additions & 4 deletions package.bat
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ copy apm.pdef.4.4.4-params.xml dist
copy apm.pdef.4.5.1-params.xml dist
copy apm.pdef.4.6.0-DEV-params.xml dist
copy file_documentation.json dist
xcopy /E /I /Y vehicle_examples\diatone_taycan_mxc\4.3.8-params dist\4.3.8-params
xcopy /E /I /Y vehicle_examples\diatone_taycan_mxc\4.4.4-params dist\4.4.4-params
xcopy /E /I /Y vehicle_templates\ArduCopter\diatone_taycan_mxc\4.3.8-params dist\4.3.8-params
xcopy /E /I /Y vehicle_templates\ArduCopter\diatone_taycan_mxc\4.4.4-params dist\4.4.4-params
xcopy /E /I /Y 4.4.4-test-params dist\4.4.4-test-params
xcopy /E /I /Y vehicle_examples\diatone_taycan_mxc\4.5.1-params dist\4.5.1-params
xcopy /E /I /Y vehicle_examples\diatone_taycan_mxc\4.6.0-DEV-params dist\4.6.0-DEV-params
xcopy /E /I /Y vehicle_templates\ArduCopter\diatone_taycan_mxc\4.5.1-params dist\4.5.1-params
xcopy /E /I /Y vehicle_templates\ArduCopter\diatone_taycan_mxc\4.6.0-DEV-params dist\4.6.0-DEV-params
xcopy /E /I /Y images dist\images
copy *.md dist
copy MethodicConfigurator\*.png dist
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../apm.pdef.4.3.8-params.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../apm.pdef.4.4.4-params.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../apm.pdef.4.5.1-params.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../apm.pdef.4.6.0-DEV-params.xml
17 changes: 10 additions & 7 deletions windows/ardupilot_methodic_configurator.iss
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,26 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
Source: "..\MethodicConfigurator\dist\ardupilot_methodic_configurator\ardupilot_methodic_configurator.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\MethodicConfigurator\dist\ardupilot_methodic_configurator\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
Source: "..\vehicle_examples\diatone_taycan_mxc\4.3.8-params\*.*"; DestDir: "{commonappdata}\.ardupilot_methodic_configurator\vehicle_examples\diatone_taycan_mxc\4.3.8-params"; Flags: ignoreversion
Source: "..\vehicle_examples\diatone_taycan_mxc\4.4.4-params\*.*"; DestDir: "{commonappdata}\.ardupilot_methodic_configurator\vehicle_examples\diatone_taycan_mxc\4.4.4-params"; Flags: ignoreversion
Source: "..\vehicle_examples\diatone_taycan_mxc\4.5.1-params\*.*"; DestDir: "{commonappdata}\.ardupilot_methodic_configurator\vehicle_examples\diatone_taycan_mxc\4.5.1-params"; Flags: ignoreversion
Source: "..\vehicle_examples\diatone_taycan_mxc\4.6.0-DEV-params\*.*"; DestDir: "{commonappdata}\.ardupilot_methodic_configurator\vehicle_examples\diatone_taycan_mxc\4.6.0-DEV-params"; Flags: ignoreversion
Source: "..\vehicle_templates\ArduCopter\diatone_taycan_mxc\4.3.8-params\*.*"; DestDir: "{commonappdata}\.ardupilot_methodic_configurator\vehicle_templates\ArduCopter\diatone_taycan_mxc\4.3.8-params"; Flags: ignoreversion
Source: "..\vehicle_templates\ArduCopter\diatone_taycan_mxc\4.4.4-params\*.*"; DestDir: "{commonappdata}\.ardupilot_methodic_configurator\vehicle_templates\ArduCopter\diatone_taycan_mxc\4.4.4-params"; Flags: ignoreversion
Source: "..\vehicle_templates\ArduCopter\diatone_taycan_mxc\4.5.1-params\*.*"; DestDir: "{commonappdata}\.ardupilot_methodic_configurator\vehicle_templates\ArduCopter\diatone_taycan_mxc\4.5.1-params"; Flags: ignoreversion
Source: "..\vehicle_templates\ArduCopter\diatone_taycan_mxc\4.6.0-DEV-params\*.*"; DestDir: "{commonappdata}\.ardupilot_methodic_configurator\vehicle_templates\ArduCopter\diatone_taycan_mxc\4.6.0-DEV-params"; Flags: ignoreversion
Source: "..\windows\version.txt"; DestDir: "{commonappdata}\.ardupilot_methodic_configurator"; Flags: ignoreversion
Source: "..\windows\MethodicConfigurator.ico"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\MethodicConfigurator\ArduPilot_icon.png"; DestDir: "{app}\_internal"; Flags: ignoreversion
Source: "..\MethodicConfigurator\ArduPilot_logo.png"; DestDir: "{app}\_internal"; Flags: ignoreversion
Source: "..\MethodicConfigurator\file_documentation.json"; DestDir: "{app}\_internal"; Flags: ignoreversion
Source: "..\credits\*.*"; DestDir: "{app}\credits"; Flags: ignoreversion

[Dirs]
Name: "{userappdata}\.ardupilot_methodic_configurator\vehicles"; Flags: uninsneveruninstall

[Icons]
Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; WorkingDir: "{commonappdata}\.ardupilot_methodic_configurator\vehicle_examples"; Tasks: desktopicon; IconFilename: "{app}\MethodicConfigurator.ico"
Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; WorkingDir: "{userappdata}\.ardupilot_methodic_configurator\vehicles"; Tasks: desktopicon; IconFilename: "{app}\MethodicConfigurator.ico"
Name: "{group}\Documentation"; Filename: "https://github.com/ArduPilot/MethodicConfigurator/blob/master/USERMANUAL.md"
Name: "{group}\Vehicle Examples"; Filename: "{commonappdata}\.ardupilot_methodic_configurator\vehicle_examples"
Name: "{group}\Vehicle Templates"; Filename: "{commonappdata}\.ardupilot_methodic_configurator\vehicle_templates\ArduCopter"
Name: "{group}\ArduPilot MethodicConfigurator Forum"; Filename: "https://discuss.ardupilot.org/t/new-ardupilot-methodic-configurator-gui/115038/"
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; WorkingDir: "{commonappdata}\.ardupilot_methodic_configurator\vehicle_examples"; IconFilename: "{app}\MethodicConfigurator.ico"
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; WorkingDir: "{userappdata}\.ardupilot_methodic_configurator\vehicles"; IconFilename: "{app}\MethodicConfigurator.ico"

[Run]
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
Expand Down

0 comments on commit 6b14e5e

Please sign in to comment.