brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update nonlinearcircuits; needs better fix for max macro (#586)

Browse source 
* update nonlinearcircuits; needs better fix for max macro

* use undef
This commit is contained in:
dreamer 2023-10-21 15:18:06 +02:00 • committed by GitHub
parent acd9035b9c
commit b941d7d8bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/nonlinearcircuits

@ -1 +1 @@
Subproject commit 57eb090f233c21b2edee541ea17d800f22045d91
Subproject commit dc154fd9c179db75f88ea6cfd3000f7a936a7e35

6
plugins/plugins.cpp
View file

@ -595,6 +595,7 @@ extern Model* modelArpeggiator;
#undef modelComparator
#include "MockbaModular/src/MockbaModular.hpp"
#undef min
#undef max
#define saveBack ignoreMockbaModular1
#define loadBack ignoreMockbaModular2
#include "MockbaModular/src/MockbaModular.cpp"
@ -2606,9 +2607,14 @@ static void initStatic__nonlinearcircuits()
p->addModel(modelLetsSplosh);
p->addModel(modelNeuron);
p->addModel(modelNumberwang);
p->addModel(modelRouter);
p->addModel(modelSegue);
p->addModel(modelSlothApathy);
p->addModel(modelSlothInertia);
p->addModel(modelSlothTorpor);
p->addModel(modelSquidAxon);
p->addModel(modelStatues);
p->addModel(modelTripleSloth);
}
}

5
src/custom/dep.cpp
View file

@ -377,9 +377,14 @@ static const struct {
{ kModeNonlinearcircuits, "/nonlinearcircuits/res/NLC - GENiE.svg", {}, -1 },
{ kModeNonlinearcircuits, "/nonlinearcircuits/res/NLC - NEURON.svg", {}, -1 },
{ kModeNonlinearcircuits, "/nonlinearcircuits/res/NLC - NUMBERWANG.svg", {}, -1 },
{ kModeNonlinearcircuits, "/nonlinearcircuits/res/NLC - ROUTER.svg", {}, -1 },
{ kModeNonlinearcircuits, "/nonlinearcircuits/res/NLC - SEGUE.svg", {}, -1 },
{ kModeNonlinearcircuits, "/nonlinearcircuits/res/NLC - STATUES.svg", {}, -1 },
{ kModeNonlinearcircuits, "/nonlinearcircuits/res/squid-axon-papernoise-panel2.svg", {}, -1 },
{ kModeNonlinearcircuits, "/nonlinearcircuits/res/SlothApathy.svg", {}, -1 },
{ kModeNonlinearcircuits, "/nonlinearcircuits/res/SlothInertia.svg", {}, -1 },
{ kModeNonlinearcircuits, "/nonlinearcircuits/res/SlothTorpor.svg", {}, -1 },
{ kModeNonlinearcircuits, "/nonlinearcircuits/res/TripleSloth.svg", {}, -1 },
// GPL-3.0-or-later
{ kModePathSet, "/PathSet/res/AstroVibe.svg", {}, -1 },
{ kModePathSet, "/PathSet/res/GlassPane.svg", {}, -1 },