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

Flux sources now add the locations of their data to _extraConfig ---

Browse Source 
which is now honoured. Fix a bunch of bugs in some of the flux sources
and sinks. The converter now actually works, maybe.
This commit is contained in:
David Given
2025-08-17 00:38:25 +02:00
parent 4ebda29171
commit f24e4029b4
25 changed files with 225 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/fluxsource/fl2fluxsource.cc
View File

@@ -1,11 +1,13 @@
#include "lib/core/globals.h"
#include "lib/data/fluxmap.h"
#include "lib/data/locations.h"
#include "lib/fluxsource/fluxsource.pb.h"
#include "lib/external/fl2.pb.h"
#include "lib/fluxsource/fluxsource.h"
#include "lib/config/proto.h"
#include "lib/external/fl2.h"
#include "lib/data/fluxmap.h"
#include "lib/core/logger.h"
#include <fstream>
class Fl2FluxSourceIterator : public FluxSourceIterator
@@ -35,12 +37,20 @@ class Fl2FluxSource : public FluxSource
public:
Fl2FluxSource(const Fl2FluxSourceProto& config): _config(config)
{
log("FL2: reading {}", _config.filename());
_proto = loadFl2File(_config.filename());
_extraConfig.mutable_drive()->set_rotational_period_ms(
_proto.rotational_period_ms());
if (_proto.has_drive_type())
_extraConfig.mutable_drive()->set_drive_type(_proto.drive_type());
std::vector<CylinderHead> chs;
for (const auto& trackFlux : _proto.track())
chs.push_back(CylinderHead{
(unsigned)trackFlux.track(), (unsigned)trackFlux.head()});
_extraConfig.mutable_drive()->set_tracks(
convertCylinderHeadsToString(chs));
}
public: