Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: aenarete/KiteControllers.jl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.2.6
Choose a base ref
...
head repository: aenarete/KiteControllers.jl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Jul 8, 2024

  1. add sleep

    Uwe Fechner committed Jul 8, 2024
    Copy the full SHA
    a2e48ab View commit details
  2. Cleanup

    Uwe Fechner committed Jul 8, 2024
    Copy the full SHA
    4abccff View commit details

Commits on Jul 9, 2024

  1. Copy the full SHA
    0833a58 View commit details
  2. Add plot_timing2()

    ufechner7 committed Jul 9, 2024
    Copy the full SHA
    3ef8aa5 View commit details
  3. plot_timing2 works now

    Uwe Fechner committed Jul 9, 2024
    Copy the full SHA
    55ef3b5 View commit details

Commits on Jul 12, 2024

  1. add missing using commands

    ufechner7 committed Jul 12, 2024
    Copy the full SHA
    502d8ff View commit details
  2. count the cycle in the FPP

    ufechner7 committed Jul 12, 2024
    Copy the full SHA
    59d30bc View commit details
  3. Copy the full SHA
    df63155 View commit details
  4. fix profile law

    ufechner7 committed Jul 12, 2024
    Copy the full SHA
    0d2c34e View commit details
  5. add comment

    ufechner7 committed Jul 12, 2024
    Copy the full SHA
    e033081 View commit details
  6. increase lower limit

    ufechner7 committed Jul 12, 2024
    Copy the full SHA
    e37c58f View commit details
  7. Update CHANGELOG.md

    Uwe Fechner committed Jul 12, 2024
    Copy the full SHA
    1422a89 View commit details
  8. Bump version

    Uwe Fechner committed Jul 12, 2024
    Copy the full SHA
    8cee0b6 View commit details
  9. fix test

    Uwe Fechner committed Jul 12, 2024
    Copy the full SHA
    edb9b6a View commit details

Commits on Jul 15, 2024

  1. Fix saving of log files

    ufechner7 committed Jul 15, 2024
    Copy the full SHA
    a4d9214 View commit details
  2. Bump KiteViewer to 0.4.14

    Uwe Fechner committed Jul 15, 2024
    Copy the full SHA
    dd0cebd View commit details
  3. update CHANGELOG.md

    Uwe Fechner committed Jul 15, 2024
    Copy the full SHA
    5d38d66 View commit details

Commits on Jul 28, 2024

  1. Update examples

    ufechner7 committed Jul 28, 2024
    Copy the full SHA
    f08ac36 View commit details
  2. fix spelling

    Uwe Fechner committed Jul 28, 2024
    Copy the full SHA
    e8d8235 View commit details
  3. Bump KiteViewers

    Uwe Fechner committed Jul 28, 2024
    Copy the full SHA
    c5094a0 View commit details
  4. not yet working

    Uwe Fechner committed Jul 28, 2024
    Copy the full SHA
    456e631 View commit details
  5. update settings.yaml

    Uwe Fechner committed Jul 28, 2024
    Copy the full SHA
    0e669f2 View commit details
  6. fix tests

    Uwe Fechner committed Jul 28, 2024
    Copy the full SHA
    ccd947d View commit details
  7. Bump version

    Uwe Fechner committed Jul 28, 2024
    Copy the full SHA
    8a1e1de View commit details
  8. Update CHANGELOG.md

    Uwe Fechner committed Jul 28, 2024
    Copy the full SHA
    83cb946 View commit details

Commits on Aug 7, 2024

  1. fix example

    ufechner7 committed Aug 7, 2024
    Copy the full SHA
    a60c92c View commit details
  2. fix examples

    ufechner7 committed Aug 7, 2024
    Copy the full SHA
    208880a View commit details
  3. update CHANGELOG.md

    ufechner7 committed Aug 7, 2024
    Copy the full SHA
    535a9af View commit details
  4. Cleanup

    ufechner7 committed Aug 7, 2024
    Copy the full SHA
    f9b3a05 View commit details
  5. bugfix

    ufechner7 committed Aug 7, 2024
    Copy the full SHA
    b9f873c View commit details
  6. next try

    ufechner7 committed Aug 7, 2024
    Copy the full SHA
    a3479e8 View commit details
  7. next try

    ufechner7 committed Aug 7, 2024
    Copy the full SHA
    90abb26 View commit details
  8. Update README.md

    ufechner7 committed Aug 7, 2024
    Copy the full SHA
    d7ae54f View commit details
  9. Improve README.md

    ufechner7 committed Aug 7, 2024
    Copy the full SHA
    c6c25d2 View commit details
  10. Bump version

    ufechner7 committed Aug 7, 2024
    Copy the full SHA
    0b00d73 View commit details
  11. Add DOI badge

    ufechner7 committed Aug 7, 2024
    Copy the full SHA
    dd2d16b View commit details
  12. Update badge

    ufechner7 committed Aug 7, 2024
    Copy the full SHA
    429f76f View commit details
  13. Update README.md

    ufechner7 committed Aug 7, 2024
    Copy the full SHA
    90a3b8d View commit details

Commits on Aug 12, 2024

  1. More logging and plotting

    ufechner7 committed Aug 12, 2024
    Copy the full SHA
    837c686 View commit details
  2. add settings_3l and system_3l

    Uwe Fechner committed Aug 12, 2024
    Copy the full SHA
    036b7ae View commit details
  3. get rid of se()

    Uwe Fechner committed Aug 12, 2024
    Copy the full SHA
    de07688 View commit details
  4. improve plotting of aerodynamics

    Uwe Fechner committed Aug 12, 2024
    Copy the full SHA
    4fbdd2a View commit details

Commits on Aug 13, 2024

  1. Bump ControlPlots to 0.1.5

    ufechner7 committed Aug 13, 2024
    Copy the full SHA
    ef6a5e6 View commit details
  2. plot lift and drag forces

    ufechner7 committed Aug 13, 2024
    Copy the full SHA
    574cc00 View commit details
  3. Copy the full SHA
    0efc96e View commit details
  4. plot CL and CD_tot vs AoA

    ufechner7 committed Aug 13, 2024
    Copy the full SHA
    aae068e View commit details
  5. improve naming

    ufechner7 committed Aug 13, 2024
    Copy the full SHA
    48c22e1 View commit details

Commits on Aug 14, 2024

  1. Fix caption

    ufechner7 committed Aug 14, 2024
    Copy the full SHA
    2cfeb55 View commit details

Commits on Aug 23, 2024

  1. fixes for new model

    Uwe Fechner committed Aug 23, 2024
    Copy the full SHA
    a50d857 View commit details
  2. fixes

    Uwe Fechner committed Aug 23, 2024
    Copy the full SHA
    f75adcf View commit details
Showing with 2,603 additions and 856 deletions.
  1. +6 −22 .github/workflows/CI.yml
  2. +9 −0 .gitignore
  3. +69 −1 CHANGELOG.md
  4. +977 −339 Manifest-1.10.toml.default
  5. +19 −10 Project.toml
  6. +57 −1 README.md
  7. +55 −23 bin/create_sys_image
  8. +7 −2 bin/run_julia
  9. BIN data/failure_low_right.arrow2
  10. +3 −2 data/fpc_settings.yaml
  11. +3 −3 data/fpp_settings_hydra20_426.yaml
  12. +1 −1 data/hydra20_600.yml
  13. +18 −9 data/settings.yaml
  14. +117 −0 data/settings_3l.yaml
  15. +16 −18 data/settings_hydra20.yaml
  16. +14 −15 data/settings_hydra20_600.yaml
  17. +13 −15 data/settings_hydra20_920.yaml
  18. +1 −0 data/settings_v9b.yaml
  19. +3 −0 data/system_3l.yaml
  20. +1 −0 data/system_v9.yaml
  21. BIN data/transition.arrow2
  22. +165 −0 docs/parking.drawio
  23. +41 −23 examples/autopilot.jl
  24. +18 −10 examples/autopilot_1p.jl
  25. +17 −8 examples/joystick.jl
  26. +9 −7 examples/learning.jl
  27. +0 −20 examples/logging.jl
  28. +28 −1 examples/menu.jl
  29. +25 −16 examples/minipilot.jl
  30. +26 −23 examples/minipilot_12.jl
  31. +28 −30 examples/parking_1p.jl
  32. +87 −59 examples/parking_4p.jl
  33. +185 −0 examples/parking_controller.jl
  34. +194 −0 examples/parking_wind_dir.jl
  35. +50 −23 examples/plots.jl
  36. +14 −9 examples/tune_1p.jl
  37. +14 −9 examples/tune_1p_glb.jl
  38. +39 −30 examples/tune_4p.jl
  39. +5 −3 src/KiteControllers.jl
  40. +2 −2 src/flightpathcalculator2.jl
  41. +7 −4 src/flightpathcontroller.jl
  42. +5 −3 src/flightpathplanner2.jl
  43. +10 −1 src/fpc_settings.jl
  44. +8 −0 src/fpp_settings.jl
  45. +11 −6 src/systemstatecontrol.jl
  46. +16 −14 src/utils.jl
  47. +5 −4 src/wc_components.jl
  48. +10 −1 src/wc_settings.jl
  49. +1 −1 test/create_sys_image.jl
  50. +35 −0 test/menu.jl
  51. +50 −34 test/runtests.jl
  52. +8 −5 test/test_flightpathcalculator.jl
  53. +8 −4 test/test_flightpathcontroller1.jl
  54. +7 −3 test/test_flightpathcontroller2.jl
  55. +8 −6 test/test_flightpathcontroller3.jl
  56. +1 −1 test/test_for_precompile.jl
  57. +4 −2 test/test_forcespeedcontroller1.jl
  58. +4 −2 test/test_forcespeedcontroller2.jl
  59. +10 −8 test/test_fpc_low_right.jl
  60. +9 −0 test/test_glmakie
  61. +9 −0 test/test_installation
  62. +10 −0 test/test_kiteviewers
  63. +6 −6 test/test_lower_force1.jl
  64. +2 −1 test/test_mixer2.jl
  65. +6 −6 test/test_mixer3.jl
  66. +4 −2 test/test_solver.jl
  67. +4 −3 test/test_speedcontroller1.jl
  68. +3 −2 test/test_speedcontroller2.jl
  69. +4 −2 test/test_winchcontroller.jl
  70. +2 −1 test/test_wrap2pi.jl
28 changes: 6 additions & 22 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -20,38 +20,22 @@ jobs:
matrix:
version:
- '1.10'
- '1'
os:
- ubuntu-latest
- windows-latest
- macos-latest
arch:
- x64
include:
- os: windows-latest
arch: x64
version: 1
- os: macOS-latest
arch: x64
version: 1

steps:
- name: Install matplotlib
run: if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get install -y python3-matplotlib; export PYTHON=$PYTHON_PATH; fi
shell: bash
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: julia-actions/cache@v2
- uses: actions/cache@v4
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v4
with:
files: lcov.info
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -11,3 +11,12 @@ data/corr_vec.jld2.bak
output/*.arrow
data/gui.yaml
bin/kps-image-1.10-plot_II.so
docs/.$parking.drawio.bkp
examples_3d/Manifest.toml
bin/kps-image-1.10-fix_yaw.so
Manifest-v1.11.toml
examples_3d/Manifest.toml
bin/kps-image-1.10-parking_controller.so
data/settings_v9c.yaml
data/settings_v9d.yaml
data/settings_v9e.yaml
70 changes: 69 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,78 @@
# Changelog

### KiteControllers v0.2.13 2025-01-22
#### Fixed
- add new version of `FFTW` as dependency to fix Windows issue

### KiteControllers v0.2.12 2025-01-21
- change the point `zenith` to 79° elevation, 0° azimuth
- change the initialization in autopilot.jl to work better for high wind speeds

### KiteControllers v0.2.11 2025-01-16
#### Changed
- use KiteModels v0.6.14, which defines the azimuth angle and the orientation differently and make the controllers and examples work with the new definitions
- bump `KiteUtils` to v0.9.6 The new version has new fields in the `SysState` struct that are used for logging.
- the constructor `SystemStateControl()`now needs the additional parameter `v_wind`
- the constructors `WCSettings()`, `FPCSettings()` and `FPPSettings()` now have the new argument `update`. If true,
then the settings are loaded from the corresponding `yaml` file.
- do not use the function `update_sys_state!()` any longer because it is buggy
- reexport KiteUtils
- when executing `bin/run_julia`, always execute `using KiteControllers` before displaying the REPL
- make use of the environment variable "USE_V9"; if set, use a different (proprietary) settings file
- improve example `parking_wind_dir.jl`
#### Fixed
- fixed logging of the height and X, Y and Z
- plotting of the height is fixed in `autopilot.jl`
#### Added
- the menu with the examples can now started by typing `menu()`
- add the script `parking_wind_dir.jl` that tests the parking controller when the wind direction is changing
- add the script `parking_controller.jl` which implements a dual-loop parking controller. The inner loop controls the turn rate. It has an excellent performance.
- add the script `test/menu.jl` which allows to execute the manual tests, that display plots and fix the tests

### KiteControllers v0.2.10 - 2024-09-07
#### Changed
- the script `create_sys_image` is now installing matplotlib if required
- removed calls to se() to be sure the correct settings from the variable set are used
- fixed the wrong polars in the yaml settings for the 20 m² kite
- use the new, correct methods for calculating the polars in autopilot.jl
- added the new fields needed for the new winch controller release
- bump KiteUtils to 0.7.9
- bump KiteModels to 0.6.6
#### Fixed
- fix all failing test scripts
- fix most of the example, and the script `menu.jl`to run the examples interactively

### KiteControllers v0.2.9 - 2024-08-07
#### Changed
- bump KiteUtils to 0.7.4
- bump KiteModels to 0.6.3
- fix some examples and the script `create_sys_image`
- explain different installation methods in README.md

### KiteControllers v0.2.8 - 2024-07-28
#### Changed
- bump KiteUtils to 0.7.2
- bump WinchModels to 0.3.2
- bump KiteViewers to 0.4.16
- adapt WinchController to new WinchModel interface
- fix tests

### KiteControllers v0.2.7 - 2024-07-12
#### Fixed
- fix control_plot on Windows (added sleep)
- fix cycle counting in FPP
#### Added
- add function plot_timing2()
- add lower limit for C2 of 2.0
#### Changed
- bump KiteViewers.jl to 0.4.14
- upgrade GLFW to latest version (the original issue is fixed now)

### KiteControllers v0.2.6 - 2024-07-02
#### Changed
- downgrade GLFW_jll to fix an issue on Ubuntu 24.04 and on Mac
#### Added
- add section kps4-3l to all settings files to be compatible with latest KiteUtils package
- add section kps4-3l to all settings files to be compatible with the latest KiteUtils package

### KiteControllers v0.2.5 - 2024-06-26
#### Added
Loading