fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

changed dir from version to ver to keep it shorter

Browse Source 
added "hw_ver compare" as command option so we can replace hw_ver in future
This commit is contained in:
ufoncz 2014-04-27 15:12:05 +02:00
parent fd95adc710
commit 5ea1105451
6 changed files with 245 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
makefiles/config_px4fmu-v1_default.mk
View File

@ -57,6 +57,7 @@ MODULES += systemcmds/config
MODULES += systemcmds/nshterm
MODULES += systemcmds/hw_ver
MODULES += systemcmds/dumpfile
MODULES += systemcmds/ver
#
# General system control

2
makefiles/config_px4fmu-v2_default.mk
View File

@ -65,7 +65,7 @@ MODULES += systemcmds/nshterm
MODULES += systemcmds/mtd
MODULES += systemcmds/hw_ver
MODULES += systemcmds/dumpfile
MODULES += systemcmds/version
MODULES += systemcmds/ver
#
# General system control

7
src/systemcmds/version/module.mk → src/systemcmds/ver/module.mk
View File

@ -32,11 +32,12 @@
############################################################################
#
# Show and test hardware version
# "version" nsh-command displays version infromation for hw,sw, gcc,build etc
# can be also included and used in own code via "ver.h"
#
MODULE_COMMAND = version
SRCS = version.c
MODULE_COMMAND = ver
SRCS = ver.c
MODULE_STACKSIZE = 1024

175
src/systemcmds/ver/ver.c Normal file
View File

@ -0,0 +1,175 @@
/****************************************************************************
*
* Copyright (c) 2012-2014 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/**
* @file ver.c
*
* Version command, unifies way of showing versions of HW, SW, Build, gcc
* In case you want to add new version just extend version_main function
*
* External use of the version functions is possible, include "vercmd.h"
* and use functions from header with prefix ver_
*
* @author Vladimir Kulla <ufon@kullaonline.net>
*/
#include <nuttx/config.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <version/version.h>
#include "ver.h"
// string constants for version commands
static const char sz_ver_hw_str[] = "hw";
static const char sz_ver_hwcmp_str[]= "hwcmp";
static const char sz_ver_git_str[] = "git";
static const char sz_ver_date_str[] = "date";
static const char sz_ver_gcc_str[] = "gcc";
static const char sz_ver_all_str[] = "all";
static void usage(const char *reason)
{
if (reason != NULL) {
printf("%s\n", reason);
}
printf("usage: version {hw|hwcmp|git|date|gcc|all}\n\n");
}
void ver_githash(int bShowPrefix)
{
if (bShowPrefix == 1) {
printf("FW git-hash: ");
}
printf("%s\n", FW_GIT);
}
void ver_hwarch(int bShowPrefix)
{
if (bShowPrefix == 1) {
printf("HW arch: ");
}
printf("%s\n", HW_ARCH);
}
void ver_date(int bShowPrefix)
{
if (bShowPrefix == 1) {
printf("Build date: ");
}
printf("%s %s\n", __DATE__, __TIME__);
}
void ver_gcclong(int bShowPrefix)
{
if (bShowPrefix == 1) {
printf("GCC used (long): ");
//printf("Built with GCC : %d.%d.%d\n", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
}
printf("%s\n", __VERSION__);
}
void ver_gccshort(int bShowPrefix)
{
if (bShowPrefix == 1) {
printf("GCC used (short): ");
}
printf("%d.%d.%d\n", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
}
int ver_gccnum()
{
return (__GNUC__ * 1000) + (__GNUC_MINOR__ * 100) + __GNUC_PATCHLEVEL__;
}
__EXPORT int ver_main(int argc, char *argv[]);
int ver_main(int argc, char *argv[])
{
int ret = 1; //defaults to an error
// first check if there are at least 2 params
if (argc >= 2) {
if (argv[1] != NULL) {
if (!strncmp(argv[1], sz_ver_hw_str, strlen(sz_ver_hw_str))) {
ver_hwarch(0);
ret = 0;
}
else if (!strncmp(argv[1], sz_ver_hwcmp_str, strlen(sz_ver_hwcmp_str))) {
if (argc >= 3 && argv[2] != NULL) {
// compare 3rd parameter with HW_ARCH string, in case of match, return 0
ret = strcmp(HW_ARCH, argv[2]) != 0;
if (ret == 0) {
printf("hw_ver match: %s\n", HW_ARCH);
}
} else {
errx(1, "not enough arguments, try 'version hwcmp PX4FMU_1'");
}
}
else if (!strncmp(argv[1], sz_ver_git_str, strlen(sz_ver_git_str))) {
ver_githash(0);
ret = 0;
}
else if (!strncmp(argv[1], sz_ver_date_str, strlen(sz_ver_date_str))) {
ver_date(0);
ret = 0;
}
else if (!strncmp(argv[1], sz_ver_gcc_str, strlen(sz_ver_gcc_str))) {
ver_gcclong(0);
ret = 0;
}
else if (!strncmp(argv[1], sz_ver_all_str, strlen(sz_ver_all_str))) {
printf("Pixhawk version info\n");
ver_hwarch(1);
ver_date(1);
ver_githash(1);
ver_gcclong(1);
ret = 0;
}
else {
errx(1, "unknown command.\n");
}
}
else {
usage("Error, input parameter NULL.\n");
}
}
else {
usage("Error, not enough parameters.");
}
return ret;
}

64
src/systemcmds/ver/ver.h Normal file
View File

@ -0,0 +1,64 @@
/****************************************************************************
*
* Copyright (c) 2012-2014 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/**
* @file vercmd.h
*
* Version command, unifies way of showing versions of hW, sW, build, gcc
* Mainly used from nsh-console, shall replace also hw_arch command
*
* External use: possible, include "vercmd.h" and use "ver_xx" functions
*
* Extension: possible, just add new else-if to version_main function
*
* @author Vladimir Kulla <ufon@kullaonline.net>
*/
#ifndef VERCMD_H_
#define VERCMD_H_
void ver_githash(int bShowPrefix);
void ver_hwarch(int bShowPrefix);
void ver_date(int bShowPrefix);
void ver_gcclong(int bShowPrefix);
void ver_gccshort(int bShowPrefix);
int ver_gccnum();
#endif /* VERCMD_H_ */

144
src/systemcmds/version/version.c
View File

@ -1,144 +0,0 @@
/****************************************************************************
*
* Copyright (C) 2012 PX4 Development Team. All rights reserved.
* Author: Vladimir Kulla <ufon@kullaonline.net>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/**
* @file version.c
*
* Version nsh command, unified way of showing versions of HW, SW, Build, Toolchain etc
*/
#include <nuttx/config.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <version/version.h>
static char sz_ver_hw_str[] = "hw";
static char sz_ver_git_str[] = "git";
static char sz_ver_date_str[] = "date";
static char sz_ver_gcc_str[] = "gcc";
static char sz_ver_all_str[] = "all";
__EXPORT int version_main(int argc, char *argv[]);
static void usage(const char *reason)
{
if (reason != NULL) {
fprintf(stderr, "%s\n", reason);
}
fprintf(stderr, "usage: version {hw|git|date|gcc|all}\n\n");
}
static void version_githash(int bShowPrefix)
{
if (bShowPrefix == 1) {
printf("FW git-hash: ");
}
printf("%s\n", FW_GIT);
}
static void version_hwarch(int bShowPrefix)
{
if (bShowPrefix == 1) {
printf("HW arch: ");
}
printf("%s\n", HW_ARCH);
}
static void version_date(int bShowPrefix)
{
if (bShowPrefix == 1) {
printf("Build date: ");
}
printf("%s %s\n", __DATE__, __TIME__);
}
static void version_gcc(int bShowPrefix)
{
if (bShowPrefix == 1) {
printf("GCC used: ");
//printf("Built with GCC : %d.%d.%d\n", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
}
printf("%s\n", __VERSION__);
}
int version_main(int argc, char *argv[])
{
if (argc >= 2)
{
if (argv[1] != NULL)
{
if (!strncmp(argv[1], sz_ver_hw_str, strlen(sz_ver_hw_str)))
{
version_hwarch(0);
}
else if (!strncmp(argv[1], sz_ver_git_str, strlen(sz_ver_git_str)))
{
version_githash(0);
}
else if (!strncmp(argv[1], sz_ver_date_str, strlen(sz_ver_date_str)))
{
version_date(0);
}
else if (!strncmp(argv[1], sz_ver_gcc_str, strlen(sz_ver_gcc_str)))
{
version_gcc(0);
}
else if (!strncmp(argv[1], sz_ver_all_str, strlen(sz_ver_all_str)))
{
printf("Pixhawk version info\n");
version_hwarch(1);
version_date(1);
version_githash(1);
version_gcc(1);
}
else
{
printf("unknown command: %s\n", argv[1]);
}
}
else
{
usage("Error, input parameter NULL.\n");
}
}
else
{
usage("Error, not enough parameters.");
}
return OK;
}