Merge pull request #96 from iNavFlight/remove_obsolete_dependencies

Remove obsolete dependencies, update Readme and version

Makefile

@@ -88,16 +88,10 @@ CFLAGS		= $(ARCH_FLAGS) \
 #   you need to supply cairo and
 #   freetype2 and dependencies, e.g. via `homebrew`
 #   MacOS blackbox_decode can be cross-compiled on Linux.
-# * Windows via mingw32 hosted on Linux
+# * Windows (via Msys2).
+#   Windows blackbox_decode can be cross-compiled on Linux.
 
-SYSTGT := $(shell $(CC) -dumpmachine)
-ifneq (, $(findstring Msys, $(SYSTGT)))
- RENDER_LDFLAGS = -Llib/win32/ -lcairo-2 -lfontconfig-1 -lfreetype-6 -liconv-2 -llzma-5 -lpixman-1-0 -lpng15-15 -lxml2-2 -lzlib1
-else ifneq (, $(findstring i686-w64-mingw32, $(SYSTGT)))
- RENDER_LDFLAGS = -Llib/win32/ -lcairo-2 -lfontconfig-1 -lfreetype-6 -liconv-2 -llzma-5 -lpixman-1-0 -lpng15-15 -lxml2-2 -lzlib1
-else
- RENDER_LDFLAGS = `pkg-config --libs cairo` `pkg-config --libs freetype2`
-endif
+RENDER_LDFLAGS = `pkg-config --libs cairo` `pkg-config --libs freetype2`
 
 RENDER_CFLAGS = `pkg-config --cflags cairo` `pkg-config --cflags freetype2`
 LDFLAGS += -pthread -lm

Readme.md

@@ -6,7 +6,7 @@
 
 These tools allow you to convert flight data logs recorded by INAV's Blackbox feature into CSV files (comma-separated values) for analysis, or into a series of PNG files which you could turn into a video.
 
-You can download the latest executable versions of these tools for x86_64 on Linux, MacOS or Windows (x86_64 and ia-32) from the "releases" tab above. If you're running Linux on ARM or RISCV or FreeBSD or MacOS aarch64, you can build the tools from source (instructions are further down this page).
+You can download the latest executable versions of `blackbox_decode` x86_64 on Linux, MacOS or Windows, aarch64 on Linux and MacOS, riscv64 on Linux from the "releases" tab. If you're running a different OS/Arch, or you need `blackbox_render`, you can build the tools from source (instructions are further down this page).
 
 ## Using the blackbox_decode tool
 
@@ -96,6 +96,8 @@ WARNING: Missing expected metadata - check for log corruption
 Generated by INAV blackbox_decode 7.0.1 123714c
 ```
 
+Please note that `blackbox_decode` is not intended to insert "derived values" in the output CSV files. If this is desired, it can easily be done, perhaps as part of a pipeline, outside of `blacbox_decode`.
+
 ## Using the blackbox_render tool
 
 This tool converts a flight log binary ".TXT" file into a series of transparent PNG images that you could overlay onto your flight video using a video editor (like [DaVinci Resolve][] ). Typical usage (from the command line) would be like:
@@ -163,7 +165,8 @@ Save your viewers' ears by dragging the midpoint of the audio track downwards to
 Now on the Deliver tab, choose something like the "video sharing export" Easy Setup preset. On the left pane, choose an output folder for the "render to:" setting. Then click the "add job to render queue" button on the left. Now click the "start render" button on the right to begin rendering the output.
 
 ## Building tools
-If you just want to download some prebuilt versions of these tools, head to the "releases" tab on the GitHub page. However, if you want to build your own binaries, or you're an unsupported platform where we haven't provided binaries, please read on.
+
+If you just want to download some prebuilt versions of `blackbox_decode` head to the "releases" tab on the GitHub page. However, if you want to build your own binaries, or you're an unsupported platform where we haven't provided binaries, please read on.
 
 The `blackbox_decode` tool for turning binary flight logs into CSV doesn't depend on any libraries, so can be built by running `make obj/blackbox_decode`. You can add the resulting `obj/blackbox_decode` program to your system path to make it easier to run.
 
@@ -216,15 +219,15 @@ The easiest way to build is to install the [Xcode development tool][], then inst
 
 From MacPorts / Homebrew you need to install `cairo`.
 
-Then you can run `make` to build blackbox_render.
+Then you can run `make` to build.
 
 MacOS `blacbox_decode` can also be cross-compiled on Linux using the supplied `Makefile`.
 
-#### Windows (Win32)
+#### Windows
 
-The tools can be cross-compiled on Linux (Win32 `blackbox_decode.exe` and `blackbox_render.exe`, Win64 `blackbox_decode.exe` using the supplied `Makefile`, or built natively in MSys2 (Win32 and Win64), using the `Makefile`. You will need to install the required tools and libraries (`pacman -S  make gcc cairo`).
+The tools can be cross-compiled on Linux (`blackbox_decode.exe` using the supplied `Makefile`, or built natively in MSys2 (Win32 and Win64), using the `Makefile`. You will need to install the required tools and libraries (`pacman -S  make gcc cairo`).
 
-Historically, the tools could be built with Visual Studio Express 2013; open up the solution in the `visual-studio/` folder. You'll need to include the .DLL files from `lib/win32` in the same directory as your built executable. This is no longer supported and may or (more likely), may not work.
+Historically, the tools could be built with Visual Studio Express 2013; open up the solution in the `visual-studio/` folder. You'll need to include the .DLL files from `lib/win32` in the same directory as your built executable. This is no longer supported and is unlikely to work.
 
 #### Install from build
 
@@ -247,25 +250,4 @@ $HOME/.local/bin/blackbox_render
 
 This project is licensed under GPLv3.
 
-The binary version of `blackbox_render` for MacOSX is statically linked to these libraries:
-
- - libbz2 http://www.bzip.org/ (BSD-like)
- - zlib http://www.zlib.net/ (Zlib)
- - libcairo & libpixman http://cairographics.org/ (LGPL)
- - libfreetype http://www.freetype.org/ (BSD-like/GPLv2)
- - libpng16 http://www.libpng.org/pub/png/libpng.html (PNG)
-
-The windows binary (win32) of `blackbox_render` additionally ships with these DLLs:
-
- - libiconv https://www.gnu.org/software/libiconv/ (LGPL)
- - libfontconfig http://www.freedesktop.org/wiki/Software/fontconfig/
- - libxml2 http://xmlsoft.org/ (MIT)
- - liblzma http://tukaani.org/xz/ (Public Domain)
-
-The source distribution includes the source for these libraries as well object libraries for MacOS and Windows. Linux and FreeBSD will use the currently installed OS versions.
-
-This font is included with source distributions:
-
- - Source Sans Pro - Regular https://github.com/adobe-fonts/source-sans-pro (SIL Open Font license)
-
 Both binary and source builds include IMU code from Baseflight https://github.com/multiwii/baseflight (GPLv3)