salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-24 11:11:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move the Kryoflux and Catweasel stuff into external.

Browse Source
This commit is contained in:
David Given
2024-10-15 00:52:02 +02:00
parent 7983a4b883
commit 7da4e15b73
12 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.py
View File

@@ -34,7 +34,6 @@ cxxlibrary(
"./lib/fluxsink/scpfluxsink.cc", "./lib/fluxsink/scpfluxsink.cc",
"./lib/fluxsink/vcdfluxsink.cc", "./lib/fluxsink/vcdfluxsink.cc",
"./lib/fluxsource/a2rfluxsource.cc", "./lib/fluxsource/a2rfluxsource.cc",
"./lib/fluxsource/catweasel.cc",
"./lib/fluxsource/cwffluxsource.cc", "./lib/fluxsource/cwffluxsource.cc",
"./lib/fluxsource/dmkfluxsource.cc", "./lib/fluxsource/dmkfluxsource.cc",
"./lib/fluxsource/erasefluxsource.cc", "./lib/fluxsource/erasefluxsource.cc",
@@ -43,7 +42,6 @@ cxxlibrary(
"./lib/fluxsource/flx.cc", "./lib/fluxsource/flx.cc",
"./lib/fluxsource/flxfluxsource.cc", "./lib/fluxsource/flxfluxsource.cc",
"./lib/fluxsource/hardwarefluxsource.cc", "./lib/fluxsource/hardwarefluxsource.cc",
"./lib/fluxsource/kryoflux.cc",
"./lib/fluxsource/kryofluxfluxsource.cc", "./lib/fluxsource/kryofluxfluxsource.cc",
"./lib/fluxsource/memoryfluxsource.cc", "./lib/fluxsource/memoryfluxsource.cc",
"./lib/fluxsource/scpfluxsource.cc", "./lib/fluxsource/scpfluxsource.cc",
@@ -144,10 +142,8 @@ cxxlibrary(
"lib/decoders/rawbits.h": "./lib/decoders/rawbits.h", "lib/decoders/rawbits.h": "./lib/decoders/rawbits.h",
"lib/encoders/encoders.h": "./lib/encoders/encoders.h", "lib/encoders/encoders.h": "./lib/encoders/encoders.h",
"lib/fluxsink/fluxsink.h": "./lib/fluxsink/fluxsink.h", "lib/fluxsink/fluxsink.h": "./lib/fluxsink/fluxsink.h",
"lib/fluxsource/catweasel.h": "lib/fluxsource/catweasel.h",
"lib/fluxsource/fluxsource.h": "lib/fluxsource/fluxsource.h", "lib/fluxsource/fluxsource.h": "lib/fluxsource/fluxsource.h",
"lib/fluxsource/flx.h": "lib/fluxsource/flx.h", "lib/fluxsource/flx.h": "lib/fluxsource/flx.h",
"lib/fluxsource/kryoflux.h": "lib/fluxsource/kryoflux.h",
"lib/imagereader/imagereader.h": "./lib/imagereader/imagereader.h", "lib/imagereader/imagereader.h": "./lib/imagereader/imagereader.h",
"lib/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h", "lib/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h",
"lib/readerwriter.h": "./lib/readerwriter.h", "lib/readerwriter.h": "./lib/readerwriter.h",

4
lib/external/build.py vendored
View File

@@ -9,12 +9,16 @@ cxxlibrary(
srcs=[ srcs=[
"./ldbs.cc", "./ldbs.cc",
"./fl2.cc", "./fl2.cc",
"./kryoflux.cc",
"./catweasel.cc",
], ],
hdrs={ hdrs={
"lib/external/ldbs.h": "./ldbs.h", "lib/external/ldbs.h": "./ldbs.h",
"lib/external/a2r.h": "./a2r.h", "lib/external/a2r.h": "./a2r.h",
"lib/external/scp.h": "./scp.h", "lib/external/scp.h": "./scp.h",
"lib/external/fl2.h": "./fl2.h", "lib/external/fl2.h": "./fl2.h",
"lib/external/kryoflux.h": "./kryoflux.h",
"lib/external/catweasel.h": "./catweasel.h",
}, },
deps=["lib/core", ".+fl2_proto_lib", "lib/data"], deps=["lib/core", ".+fl2_proto_lib", "lib/data"],
) )

2
lib/fluxsource/catweasel.cc → lib/external/catweasel.cc vendored
View File

@@ -1,7 +1,7 @@
#include "lib/core/globals.h" #include "lib/core/globals.h"
#include "lib/data/fluxmap.h" #include "lib/data/fluxmap.h"
#include "lib/core/bytes.h" #include "lib/core/bytes.h"
#include "lib/fluxsource/catweasel.h" #include "lib/external/catweasel.h"
std::unique_ptr<Fluxmap> decodeCatweaselData( std::unique_ptr<Fluxmap> decodeCatweaselData(
const Bytes& bytes, nanoseconds_t clock) const Bytes& bytes, nanoseconds_t clock)

0
lib/fluxsource/catweasel.h → lib/external/catweasel.h vendored
View File

2
lib/fluxsource/kryoflux.cc → lib/external/kryoflux.cc vendored
View File

@@ -1,6 +1,6 @@
#include "lib/core/globals.h" #include "lib/core/globals.h"
#include "lib/data/fluxmap.h" #include "lib/data/fluxmap.h"
#include "kryoflux.h" #include "lib/external/kryoflux.h"
#include "protocol.h" #include "protocol.h"
#include <fstream> #include <fstream>
#include <sys/types.h> #include <sys/types.h>

0
lib/fluxsource/kryoflux.h → lib/external/kryoflux.h vendored
View File

2
lib/fluxsource/cwffluxsource.cc
View File

@@ -2,7 +2,7 @@
#include "lib/data/fluxmap.h" #include "lib/data/fluxmap.h"
#include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.pb.h"
#include "lib/fluxsource/fluxsource.h" #include "lib/fluxsource/fluxsource.h"
#include "lib/fluxsource/catweasel.h" #include "lib/external/catweasel.h"
#include "lib/config/proto.h" #include "lib/config/proto.h"
#include <fstream> #include <fstream>

2
lib/fluxsource/dmkfluxsource.cc
View File

@@ -2,7 +2,7 @@
#include "lib/data/fluxmap.h" #include "lib/data/fluxmap.h"
#include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.pb.h"
#include "lib/fluxsource/fluxsource.h" #include "lib/fluxsource/fluxsource.h"
#include "lib/fluxsource/catweasel.h" #include "lib/external/catweasel.h"
#include "lib/config/proto.h" #include "lib/config/proto.h"
#include "lib/core/logger.h" #include "lib/core/logger.h"
#include <fstream> #include <fstream>

2
lib/fluxsource/flx.cc
View File

@@ -1,6 +1,6 @@
#include "lib/core/globals.h" #include "lib/core/globals.h"
#include "lib/data/fluxmap.h" #include "lib/data/fluxmap.h"
#include "kryoflux.h" #include "lib/external/kryoflux.h"
#include "protocol.h" #include "protocol.h"
#include "lib/fluxsource/flx.h" #include "lib/fluxsource/flx.h"

2
lib/fluxsource/kryofluxfluxsource.cc
View File

@@ -1,6 +1,6 @@
#include "lib/core/globals.h" #include "lib/core/globals.h"
#include "lib/data/fluxmap.h" #include "lib/data/fluxmap.h"
#include "kryoflux.h" #include "lib/external/kryoflux.h"
#include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.pb.h"
#include "lib/fluxsource/fluxsource.h" #include "lib/fluxsource/fluxsource.h"

2
lib/fluxsource/scpfluxsource.cc
View File

@@ -1,6 +1,6 @@
#include "lib/core/globals.h" #include "lib/core/globals.h"
#include "lib/data/fluxmap.h" #include "lib/data/fluxmap.h"
#include "kryoflux.h" #include "lib/external/kryoflux.h"
#include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.pb.h"
#include "lib/core/utils.h" #include "lib/core/utils.h"
#include "lib/fluxsource/fluxsource.h" #include "lib/fluxsource/fluxsource.h"

2
tests/kryoflux.cc
View File

@@ -3,7 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "lib/core/globals.h" #include "lib/core/globals.h"
#include "lib/data/fluxmap.h" #include "lib/data/fluxmap.h"
#include "lib/fluxsource/kryoflux.h" #include "lib/external/kryoflux.h"
static void test_convert(const Bytes& kryofluxbytes, const Bytes& fluxmapbytes) static void test_convert(const Bytes& kryofluxbytes, const Bytes& fluxmapbytes)
{ {