From 807db81bdd99812bbdbbf05aefd42901628d4cf3 Mon Sep 17 00:00:00 2001 From: Harsh Sharma Date: Wed, 16 Mar 2022 12:35:57 -0500 Subject: Fixed fpga loader --- src/Device/Device.cpp | 86 ++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 45 deletions(-) (limited to 'src/Device') diff --git a/src/Device/Device.cpp b/src/Device/Device.cpp index 04dbfef..e4ec02a 100644 --- a/src/Device/Device.cpp +++ b/src/Device/Device.cpp @@ -402,7 +402,7 @@ void Device::printJson() { void Device::printVersion(std::string name) { printInfo( - "%s %s\nCopyright (C) 2021 by Multi-Tech Systems\nThis program is free " + "%s %s\nCopyright (C) 2022 by Multi-Tech Systems\nThis program is free " "software; you may redistribute it under the terms of\nthe GNU General " "Public License version 2 or (at your option) any later version.\nThis " "program has absolutely no warranty.", @@ -412,41 +412,43 @@ void Device::printVersion(std::string name) { void Device::printUsage(std::string program) { std::vector showResults; - printf("Usage: %s [ OPTIONS ] OBJECT [--] [ ARGUMENTS ]\n", - program.c_str()); - printf("where OBJECT := {\n"); - printf(" init |\n"); - printf(" show SHOW-NAME |\n"); - printf(" store STORE-NAME |\n"); - printf(" json |\n"); - printf(" load-fpga FPGA-OPTIONS |\n"); - printf(" }\n"); + printf("Usage: %s [ OPTIONS ] OBJECT [--] [ ARGUMENTS ]\n", program.c_str()); + printf("Legacy OBJECT options:\n"); + printf(" init : init & make device info json\n"); + printf(" json : init & make device info json\n"); + printf(" show : show data for file\n"); + printf(" show-trigger : show trigger data for file\n"); + printf(" store : store data for file\n"); + printf(" store-trigger : store trigger data for file\n"); + printf(" load-fpga : load fpga version\n"); + printf("Updated OBJECT options:\n"); + printf(" -I, --init : init & make device info json\n"); + printf(" -j, --json : output device info json\n"); + printf(" -s, --show : show data for file\n"); + printf(" -S, --show-trigger : show trigger data for file\n"); + printf(" -t, --store : store data for file\n"); + printf(" -T, --store-trigger : store trigger data for file\n"); + printf(" -l, --load-fpga : update fpga version\n"); + printf(" -c, --check : check fpga version\n"); + printf(" -v, --version : show version\n"); + printf(" -h, --help : show help\n"); printf("\n"); - printf(" FPGA-OPTIONS := {\n"); - printf(" -c Check FPGA Version\n"); - printf(" -i Specify input file. Default is " - "mtcdt-fpga-v31.hex for a MultiConnect Conduit\n"); - printf(" and mtcap-fpga-v31.hex for MultiConnect Access " - "Point\n"); - printf(" -p Specify port 1 or 2 (MultiConnect Conduit " - "Only)\n"); - printf( - " -s Print FPGA versions supported by the utility\n"); - printf(" Examples :=\n"); - printf(" %s load-fpga -c Check existing " - "FPGA version\n", - program.c_str()); - printf(" %s load-fpga -i Upgrade the FPGA " - "on the default port using the file specified\n", - program.c_str()); - printf(" %s load-fpga -p 2 -i Upgrade the FPGA " - "on ap2 using the file specified\n", - program.c_str()); - printf(" %s Upgrade the FPGA " - "on the default port and upgrade file\n", - program.c_str()); - printf(" }\n"); - printf(" SHOW-NAME := {\n"); + printf("Options\n"); + printf(" -V, --verbose : show additional debug output\n"); + printf("FPGA\n"); + printf("Arguments:\n"); + printf(" -p, --path : path for card\n"); + printf(" : options: 1 for ap1, 2 for ap2 everything else\n"); + printf(" : is an expected full path. i.e. /dev/spidevX.X\n"); + printf(" -i, --input : input file for upgrade\n"); + printf(" : files are stored in /usr/lib/mts-flash-binaries\n"); + printf("Usage:\n"); + printf(" Load : mts-io-sysfs -l -p -i \n"); + printf(" Check : mts-io-sysfs -c -p \n"); + printf("\n"); + printf("show-name:\n"); + printf("Usage:\n"); + printf("--show-name \n"); printDir("", showResults); sort(showResults.begin(), showResults.end()); // Unix file tree is not sorted @@ -455,9 +457,10 @@ void Device::printUsage(std::string program) { if (!regex_match(showResult, showFilters)) printf(" %s\n", showResult.c_str()); } - printf(" }\n"); printf("\n"); - printf(" STORE-NAME := {\n"); + printf("store-name:\n"); + printf("Usage:\n"); + printf("--store-name \n"); for (std::string showResult : showResults) { if (showResult == "radio-reset") { printf(" %s { 0 }\n", showResult.c_str()); @@ -476,15 +479,8 @@ void Device::printUsage(std::string program) { printf(" %s BOOLEAN\n", showResult.c_str()); } } - printf(" OPTIONS := {\n"); - printf(" --verbose\n"); - printf(" }\n"); - printf("\n"); - printf(" BOOLEAN := { OFF | ON }\n"); - printf(" OFF := 0\n"); - printf(" ON := 1\n"); printf("\n"); - exitHandler(1); + exitHandler(0); } void Device::show(std::string name) { -- cgit v1.2.3