update to rmmi

This commit is contained in:
Green Sky 2024-10-06 12:57:36 +02:00
parent 99930c1b3d
commit 3372860038
No known key found for this signature in database
4 changed files with 9 additions and 8 deletions

1
.gitignore vendored
View File

@ -24,3 +24,4 @@ CMakeCache.txt
*.tox *.tox
imgui.ini imgui.ini
config.json

View File

@ -33,7 +33,7 @@ SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_start(struct SolanaAPI* solana_api)
try { try {
auto* cr = PLUG_RESOLVE_INSTANCE_VERSIONED(Contact3Registry, "1"); auto* cr = PLUG_RESOLVE_INSTANCE_VERSIONED(Contact3Registry, "1");
auto* rmm = PLUG_RESOLVE_INSTANCE(RegistryMessageModel); auto* rmm = PLUG_RESOLVE_INSTANCE(RegistryMessageModelI);
auto* conf = PLUG_RESOLVE_INSTANCE(ConfigModelI); auto* conf = PLUG_RESOLVE_INSTANCE(ConfigModelI);
// static store, could be anywhere tho // static store, could be anywhere tho

View File

@ -15,7 +15,7 @@
#include <iostream> #include <iostream>
struct Automatic1111_v1_Endpoint : public SDBot::EndpointI { struct Automatic1111_v1_Endpoint : public SDBot::EndpointI {
Automatic1111_v1_Endpoint(RegistryMessageModel& rmm, std::default_random_engine& rng) : SDBot::EndpointI(rmm, rng) {} Automatic1111_v1_Endpoint(RegistryMessageModelI& rmm, std::default_random_engine& rng) : SDBot::EndpointI(rmm, rng) {}
bool handleResponse(Contact3 contact, ByteSpan data) override { bool handleResponse(Contact3 contact, ByteSpan data) override {
//std::cout << std::string_view{reinterpret_cast<const char*>(data.ptr), data.size} << "\n"; //std::cout << std::string_view{reinterpret_cast<const char*>(data.ptr), data.size} << "\n";
@ -61,7 +61,7 @@ struct Automatic1111_v1_Endpoint : public SDBot::EndpointI {
}; };
struct SDcpp_wip1_Endpoint : public SDBot::EndpointI { struct SDcpp_wip1_Endpoint : public SDBot::EndpointI {
SDcpp_wip1_Endpoint(RegistryMessageModel& rmm, std::default_random_engine& rng) : SDBot::EndpointI(rmm, rng) {} SDcpp_wip1_Endpoint(RegistryMessageModelI& rmm, std::default_random_engine& rng) : SDBot::EndpointI(rmm, rng) {}
bool handleResponse(Contact3 contact, ByteSpan data) override { bool handleResponse(Contact3 contact, ByteSpan data) override {
//std::cout << std::string_view{reinterpret_cast<const char*>(data.ptr), data.size} << "\n"; //std::cout << std::string_view{reinterpret_cast<const char*>(data.ptr), data.size} << "\n";
@ -131,7 +131,7 @@ struct SDcpp_wip1_Endpoint : public SDBot::EndpointI {
SDBot::SDBot( SDBot::SDBot(
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModel& rmm, RegistryMessageModelI& rmm,
ConfigModelI& conf ConfigModelI& conf
) : _cr(cr), _rmm(rmm), _conf(conf) { ) : _cr(cr), _rmm(rmm), _conf(conf) {
_rng.seed(std::random_device{}()); _rng.seed(std::random_device{}());

View File

@ -20,7 +20,7 @@ struct ConfigModelI;
class SDBot : public RegistryMessageModelEventI { class SDBot : public RegistryMessageModelEventI {
Contact3Registry& _cr; Contact3Registry& _cr;
RegistryMessageModel& _rmm; RegistryMessageModelI& _rmm;
ConfigModelI& _conf; ConfigModelI& _conf;
//TransferManager& _tm; //TransferManager& _tm;
@ -38,9 +38,9 @@ class SDBot : public RegistryMessageModelEventI {
public: public:
struct EndpointI { struct EndpointI {
RegistryMessageModel& _rmm; RegistryMessageModelI& _rmm;
std::default_random_engine& _rng; std::default_random_engine& _rng;
EndpointI(RegistryMessageModel& rmm, std::default_random_engine& rng) : _rmm(rmm), _rng(rng) {} EndpointI(RegistryMessageModelI& rmm, std::default_random_engine& rng) : _rmm(rmm), _rng(rng) {}
virtual ~EndpointI(void) {} virtual ~EndpointI(void) {}
virtual bool handleResponse(Contact3 contact, ByteSpan data) = 0; virtual bool handleResponse(Contact3 contact, ByteSpan data) = 0;
@ -52,7 +52,7 @@ class SDBot : public RegistryMessageModelEventI {
public: public:
SDBot( SDBot(
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModel& rmm, RegistryMessageModelI& rmm,
ConfigModelI& conf ConfigModelI& conf
); );
~SDBot(void); ~SDBot(void);