Skip to content
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.

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

Posix shell: rebased & ready #10173

Merged
merged 29 commits into from
Aug 8, 2018
Merged

Posix shell: rebased & ready #10173

merged 29 commits into from
Aug 8, 2018

Commits on Aug 8, 2018

  1. add posix shell

    squashed & rebased version, not including:
    - listener changes
    - src/firmware renaming
    
    Commits:
    
    tag_to_version.py: fix Python3 error
    
    subprocess.communicate returns bytes instead of a str which is not the
    same for Python3. Therefore, we need to decode the bytes.
    
    cmake: remove folder src/firmware
    
    The folder src/firmware was not intuitive. Why would the binaries for
    SITL be inside a src and why even inside a src/firmware folder. Also,
    the rootfs was put there which made it even more confusing.
    
    The CMakeLists.txt files are moved into cmake/ and get now called from
    the main CMakeLists.txt.
    
    qshell: support for return value
    
    Instead of just sending commands, qshell will now also wait until
    the command has finished on QURT and sent back a return value. This will
    allow all modules on the DSP side to be spawned from the Linux side
    meaning that we only need one config/startup file instead of two.
    
    adb_upload: create folders before pushing
    
    Previously the script failed if the folder on the destination was not
    already existing. This therefore makes pushing easier.
    
    posix: spawn PX4 modules in bash
    
    This adds the possibility to spawn PX4 modules out of bash. Basically,
    the main executable can now be started as a server/daemon or as a
    client.
    The server replaces the existing functionality of the main exe with
    the pxh shell, however, it also opens a pipe that clients can talk to.
    
    Clients can run or spawn PX4 modules or commands by connecting to the
    server over the pipe. They clients will get the stdout and return value
    of their commands via a client specific pipe back.
    
    This work will allow to start all modules using a bash script similar to
    the way it is done in NuttX where the NuttShell scripts the startup
    scripts and starts the modules.
    
    SITL: use new client shell in SITL
    
    This is a first step to use the new shell capabilities for SITL.
    The new startup bash script rcS merges (and therefore replaces) the two
    existing scripts rcS_gazebo_iris and rcS_jmavsim_iris.
    
    More cleanup will be necessary for the rest of the SITL startup scripts.
    
    Snapdragon: use new shell to start all modules
    
    Instead of different mainapp.config and px4.config files, we can now use
    a unified rcS bash script which starts all the modules based on
    parameters, mainly the SYS_AUTOSTART param.
    
    Snapdragon: fix the airframe description
    
    pxh: argv needs to end with a nullptr
    
    The comment was wrong that argv needs an additional 0 termination.
    Instead it needs a nullptr at the end.
    
    px4_posix_tasks: variable cleanup
    
    The px4_task_spawn_cmd function got a cleanup while debugging, however,
    no functional changes.
    
    Snapdragon: move some drivers to 4100 config
    
    These drivers are supported by the community, so they go into the 4100
    config.
    
    Snapdragon: update 210qc platform
    
    px4_daemon: use doxygen comments
    
    apps.h_in: fix string printf: use .c_str()
    
    px4_daemon: \b -> \n in printf
    
    px4_daemon: handle error in generate_uuid (close the file on error)
    
    posix main: some clarifications in comment (it's the symlinks not the script aliases)
    
    cmake: remove new install command again
    
    This one was probably wrong and untested. Installing needs revisiting.
    
    POSIX: remove argument USES_TERMINAL
    
    POSIX: copy init and mixer files for SITL
    
    Instead of using non-working install commands, the mixer and startup
    files are now copied as part of the build in cmake.
    
    adb_upload.sh: remove leftover commented printf
    
    POSIX main: just the pointer instead of memmove
    
    POSIX main: remove chroot
    
    chroot is removed because it hasn't been used anywhere and seems
    untested.
    
    px4_daemon: remove client pipe when cleaning up
    
    px4_daemon: fail if the client pipe already exists
    
    The client pipe is supposed to be specific (by UUID), so the path
    shouldn't exist already.
    
    history: limit the number of history entries
    
    This is a protection to avoid filling the memory if we are entering a
    lot of commands (e.g. auto-generated).
    
    px4_daemon: add a threadsafe map and use it
    
    px4_daemon: whitespace
    
    px4_daemon: fix client parsing
    
    Sometimes the client ends up reading more than one packet in one read.
    The parsing is not made for this and would require a (ring)buffer for
    it.
    
    The solution of this commit just reads as much as needed from the pipe
    which avoids having to do buffering and parsing.
    
    posix: changes sitl_run.sh and main.cpp cleanup
    
    This changes the paths in sitl_run.sh quite a bit to allow the px4
    binary to run in the rootfs directory which should make it convenient
    and very close to the NuttX variant.
    
    Also main.cpp got a big cleanup after the big rebase with some
    conflicts. Quite some functionality was removed but it has yet to be
    seen if it needs to be re-added.
    
    px4_log: cleanup log levels, now they make sense
    
    Before DEBUG and INFO log levels where inverted which didn't make much
    sense in my eyes.
    
    dataman: fix path for bash shell
    
    logger: fix paths for bash shell
    
    mavlink: fix paths for bash shell
    
    param: fix path for bash shell
    
    inav: fix paths for bash shell
    
    sdlog2: fix paths for bash shell
    
    ROMFS: add forgotten mixer to list
    
    SITL init: more models, more options
    
    - Support for different models using the unified startup
    script rcS.
    - Support to choose the estimator by setting the environment variable
      PX4_ESTIMATOR.
    - Support to choose the logger by setting the environment variable
      PX4_LOGGER.
    
    rcS: fix string comparison
    
    listener: use template file
    
    Instead of having all of the C++ code inside the Python file it is
    nicer to have a separate template file with the C++ headers, etc.
    
    px4_log: add PX4_INFO_RAW for raw printfs
    
    This allows to do custom formatting but is still transported over
    sockets to clients.
    
    topic_listener: use PX4_INFO_RAW instead of printf
    
    commander: use PX4_INFO_RAW for status
    
    listener: rewrite to classes and factory
    
    posix: fix some argument warnings
    
    generate_listener.py: by accident changed shebang
    
    listener: big refactor of the generator
    
    Hopefully this makes it easier to read and change in the future.
    
    rcS: manually take over rebase changes
    
    listener: remove leftover try
    
    listener: properly clean up topic instance
    
    rcS: take over some vehicle specific changes
    
    posix-configs: vehicle specifics to separate files
    
    posix-configs: remove leftover lines
    
    uORBDevices: new PX4_INFO_RAW instead of printf
    
    px4_log: just use printf on NuttX
    
    listener: use less binary space, strip on NuttX
    
    generate_listener.py: remove commented code
    
    cmake: fix syntax error from merge
    
    px4_daemon: fixes after rebase of apps.h/cpp fix
    
    px4_daemon: namespace missing
    
    posix: only create stub for fsync on QURT
    
    unitests: reduce dependencies of param test
    
    This makes the unit test compile and link again after the bash changes.
    
    QURT: some compile fixes after a rebase
    
    SITL: arg change for sitl_run.sh to use rcS_test
    
    This allows to use a custom startup file for testing.
    
    SITL: add the folder test_data
    
    SITL: implement shutdown command as systemcmd
    
    The shutdown command needs to be a proper systemcmd, otherwise the alias
    and symlink generation doesn't work and we end up calling shutdown of
    the host computer which is to be avoided.
    
    px4fmu_test: same IO_pass mixer as px4fmu_default
    
    px4fmu_test: use normal quad x mixer
    
    There is no good reason to use a specific test mixer, except more cmake
    code around it. Therefore just use the same mixer as default, and at
    some point px4fmu_test and px4fmu_default can get merged
    
    POSIX: cleanup, dir and symlink fixes
    
    This cleans up the logic behind the symlinking and creating directories.
    
    POSIX: correct arg order in usage info
    
    tests: fix paths for SITL tests
    
    POSIX: printf fix
    
    sitl_run.sh: try to make this run on Mac as well
    
    cmake: try to make jenkins happier
    
    Path cleanup, the bin is no longer in src/firmware
    
    POSIX: fix symlink logic
    
    SITL: prefix all exported env variables
    
    cmake: fix path for ROS tests
    
    integrationtests: fix log path
    
    launch: try to make tets with ROS working again
    
    px4_defines: fix after wrong merge deconflicting
    
    px4_defines: get paths for POSIX correct
    
    cmake: fix cmake arguments
    
    This was fine with cmake 3.6 but did not work with cmake 3.2.2
    
    cmake: use cp instead of cmake -E copy
    
    cmake -E copy does not support copying multiple files with versions <
    3.5. Therefore, just use cp for now.
    
    ROMFS: fix build error after rebase
    
    cmake: fix paths in configs
    
    launch: use `spawn_model` again
    
    cmake: various fixes after big rebase
    
    param: path fixes after rebase
    
    posix platform: fixes after rebase
    
    test_mixer: fix screwed up rebase
    julianoes authored and bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    a70f16b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    249beef View commit details
    Browse the repository at this point in the history
  3. posix main: some cleanup & fixes

    - argv[0] can have the form ./px4-commander
    - create eeprom directory
    - fix fpe signal handler
    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    136c841 View commit details
    Browse the repository at this point in the history
  4. posix shell: lots of cleanup and fixes

    - move posix-configs/SITL/init/{rcS,10016_iris,6011_typhoon_h480} to ROMFS/px4fmu_common/init.d-posix
      allows for easier unification, only one symlink is required.
      - rcS: add AUTOCNF support. Update scripts to match with behavior of PX4
        master (parameter values, some sitl driver got removed)
    - add alias to allow 'set variable value' syntax in scripts to px4-alias.sh
    - use px4_getopt
    - use separate argument for the test_data directory
    - append PATH from within the px4 binary: this simplifies the usage
      w/o the sitl_run.sh script.
    - add 'source px4-alias.sh' to all existing sitl startup scripts
    - move sitl mixers to ROMFS/px4fmu_common/mixers-sitl
      makes it easier to use existing mixers and sitl-specific ones.
    - remove unused rcS_gazebo_delta_wing
    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    1b261b8 View commit details
    Browse the repository at this point in the history
  5. cleanup: remove unused files

    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    270eb18 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8977800 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    52bd54d View commit details
    Browse the repository at this point in the history
  8. Tools/check_submodules.sh: remove unnecessary verbose message

    This was printed for all submodules.
    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    15515ca View commit details
    Browse the repository at this point in the history
  9. posix shell: required updates for RPi, bepob, ocpoc, eagle & exxcelsior

    - RPi works
    - the rest is not tested, and requires a bit more
      (such as uploading the bin/ directory)
    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    ceebb6e View commit details
    Browse the repository at this point in the history
  10. fix px4_log.c: avoid potential buffer overflow

    The buffer length given to snprintf() is unsigned, so we must check for
    an overflow after each call.
    
    This happend for very long printf's (module documentation)
    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    e7e4e85 View commit details
    Browse the repository at this point in the history
  11. px4_daemon: fixes for packet length computation

    The enum change from uint8_t to an int avoids uninitialized bytes,
    which led to valgrind warnings (no error though).
    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    b46c39a View commit details
    Browse the repository at this point in the history
  12. px4_daemon: fix locking

    It was not enough to lock individual accesses to the maps.
    For example it could happen that a thread was started and exited very
    quickly, before the pthread_t item was inserted into the map, such
    that when the cleanup method was called, the thread and pipe fd were not
    found (and fd=0=stdin was closed).
    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    217f254 View commit details
    Browse the repository at this point in the history
  13. px4_daemon server: fix packet reading

    By reading sizeof(packet), it could have happened that 2 packets at once
    were read, and the second one was then ignored.
    This makes sure that only one packet at a time is read.
    
    The other 2 changes are for efficiency.
    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    890ce2b View commit details
    Browse the repository at this point in the history
  14. listener: use PX4_INFO_RAW instead of printf

    Ensures that clients will get the output of the listener.
    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    45a70d2 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    cc87df7 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    7cb813b View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    5431583 View commit details
    Browse the repository at this point in the history
  18. px4_log.c: fix cygwin include

    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    d376a6f View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    002dc58 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    33d1961 View commit details
    Browse the repository at this point in the history
  21. px4_daemon: fixes for clang-tidy

    Also ignore the warning:
    error: calling 'system' uses a command processor [cert-env33-c,-warnings-as-errors]
    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    c9638bd View commit details
    Browse the repository at this point in the history
  22. fix mavros launch scripts & use non-unified startup scripts

    This is to not lose any existing functionality until we have everything
    unified.
    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    47dc7a2 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    744d2e6 View commit details
    Browse the repository at this point in the history
  24. fixes for integration and unit tests

    Move ros logs dir so that .ulg files are not in the same directory
    (mission_test.py:: get_last_log() fails otherwise)
    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    ec202e3 View commit details
    Browse the repository at this point in the history
  25. ROMFS cmake: do not copy init.d-posix and mixers-sitl

    Otherwise these files are added to the NuttX ROMFS build.
    bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    488c58d View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    f8788de View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    77069cb View commit details
    Browse the repository at this point in the history
  28. Jenkins: change log path

    lamping7 authored and bkueng committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    1ec1667 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    b0b4029 View commit details
    Browse the repository at this point in the history