Skip to content

Fix User and HMI files in ARSim cmd line interface #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sclaiborne merged 4 commits into from
Feb 2, 2024
Merged

Fix User and HMI files in ARSim cmd line interface #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6da32ce
Add user and hmi file arg logging
sclaiborne Nov 27, 2023
ff0972e
Fix bug with hmi files
sclaiborne Nov 27, 2023
ca226e2
Fix user and hmi files breaking if not specified
sclaiborne Nov 27, 2023
3fec08b
Merge branch 'main' into bugFix/user-files-fix
sclaiborne Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions CmdLineARSim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ def main():
parser.add_argument('-c','--configuration', nargs='+', type=str, help='AS configuration you want to build')
parser.add_argument('-bm', '--buildMode', type=str, help='AS build mode you want executed', default='None', choices=['Rebuild', 'Build','BuildAndTransfer', 'BuildAndCreateCompactFlash', 'None'])
parser.add_argument('-ss', '--startSim', action='store_true', help='Option to have ARSim start after ARSim creation')
parser.add_argument('-uf', '--userFiles', type=str, help='Path to the folder containing user files to get included with simulator')
parser.add_argument('-hf', '--hmiFiles', type=str, help='Path to the folder containing HMI files to get included with simulator')
parser.add_argument('-uf', '--userFiles', type=str, help='Path to the folder containing user files to get included with simulator', default='')
parser.add_argument('-hf', '--hmiFiles', type=str, help='Path to the folder containing HMI files to get included with simulator', default='')
parser.add_argument('-l', '--logLevel', type=str.upper, help='Log level', choices=['DEBUG','INFO','WARNING', 'ERROR'], default='')
parser.add_argument('-v','--version', action='version', version='%(prog)s {version}'.format(version=_version.__version__))
args = parser.parse_args()
Expand All @@ -59,6 +59,8 @@ def main():
logging.debug('The configuration(s) to be built is: %s', args.configuration)
logging.debug('Build mode: %s', args.buildMode)
logging.debug('Start simulation when creation is complete: %s', args.startSim)
logging.debug('User files: %s', args.userFiles)
logging.debug('HMI files: %s', args.hmiFiles)

project = ASTools.Project(args.project)

Expand Down Expand Up @@ -90,12 +92,12 @@ def main():
project.createSim(config, destination=destination, startSim=args.startSim)

# Add custom directory with user partition data if configured.
if args.userFiles != '' and args.userFiles != None:
if args.userFiles != '':
userPath = os.path.join(destination, 'ARSimUser')
shutil.copytree(args.userFiles, userPath)

# Add custom directory with HMI data if configured.
if args.hmiFiles != '' and args.hmiFiles != None:
if args.hmiFiles != '':
hmiPath = os.path.join(destination, 'HMI')
shutil.copytree(args.hmiFiles, hmiPath, ignore=shutil.ignore_patterns('node_modules'))

Expand Down