From eec850dfbab52c00fd94714ddf7c4d1718aea78d Mon Sep 17 00:00:00 2001 From: rl2939 <60378449+rl2939@users.noreply.github.com> Date: Wed, 20 Nov 2024 04:56:39 -0500 Subject: [PATCH] Update NonlinearCircuits. (#744) * Add NonlinearCircuits. * Adapt dep.cpp for NonlinearCircuits file renames * Update Squid Axon Panel. * Rename BOOLs. --- plugins/nonlinearcircuits | 2 +- plugins/plugins.cpp | 1 + src/custom/dep.cpp | 27 ++++++++++++++------------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/plugins/nonlinearcircuits b/plugins/nonlinearcircuits index dc154fd..2e6bffd 160000 --- a/plugins/nonlinearcircuits +++ b/plugins/nonlinearcircuits @@ -1 +1 @@ -Subproject commit dc154fd9c179db75f88ea6cfd3000f7a936a7e35 +Subproject commit 2e6bffda1df17188061b0065054b98713102556c diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index afdd809..628d177 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -2944,6 +2944,7 @@ static void initStatic__nonlinearcircuits() p->addModel(modelSlothApathy); p->addModel(modelSlothInertia); p->addModel(modelSlothTorpor); + p->addModel(modelSplish); p->addModel(modelSquidAxon); p->addModel(modelStatues); p->addModel(modelTripleSloth); diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp index cad31aa..a0acaca 100644 --- a/src/custom/dep.cpp +++ b/src/custom/dep.cpp @@ -304,20 +304,21 @@ static const struct { { kModeMyth, "/myth-modules/res/Mavka.svg", {}, -1 }, { kModeMyth, "/myth-modules/res/Molphar.svg", {}, -1 }, // CC0-1.0 - { kModeNonlinearcircuits, "/nonlinearcircuits/res/BOOLs2.svg", {}, -1 }, - { kModeNonlinearcircuits, "/nonlinearcircuits/res/DoubleNeuronRef.svg", {}, -1 }, + { kModeNonlinearcircuits, "/nonlinearcircuits/res/BOOLs.svg", {}, -1 }, + { kModeNonlinearcircuits, "/nonlinearcircuits/res/DoubleNeuron.svg", {}, -1 }, { kModeNonlinearcircuits, "/nonlinearcircuits/res/LetsSplosh.svg", {}, -1 }, - { kModeNonlinearcircuits, "/nonlinearcircuits/res/NLC - 4seq.svg", {}, -1 }, - { kModeNonlinearcircuits, "/nonlinearcircuits/res/NLC - 8 BIT CIPHER.svg", {}, -1 }, - { kModeNonlinearcircuits, "/nonlinearcircuits/res/NLC - DIVIDE & CONQUER.svg", {}, -1 }, - { kModeNonlinearcircuits, "/nonlinearcircuits/res/NLC - DIVINE CMOS.svg", {}, -1 }, - { 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/4seq.svg", {}, -1 }, + { kModeNonlinearcircuits, "/nonlinearcircuits/res/8BitCipher.svg", {}, -1 }, + { kModeNonlinearcircuits, "/nonlinearcircuits/res/DivideConquer.svg", {}, -1 }, + { kModeNonlinearcircuits, "/nonlinearcircuits/res/DivineCMOS.svg", {}, -1 }, + { kModeNonlinearcircuits, "/nonlinearcircuits/res/GENiE.svg", {}, -1 }, + { kModeNonlinearcircuits, "/nonlinearcircuits/res/Neuron.svg", {}, -1 }, + { kModeNonlinearcircuits, "/nonlinearcircuits/res/Numberwang.svg", {}, -1 }, + { kModeNonlinearcircuits, "/nonlinearcircuits/res/Router.svg", {}, -1 }, + { kModeNonlinearcircuits, "/nonlinearcircuits/res/Segue.svg", {}, -1 }, + { kModeNonlinearcircuits, "/nonlinearcircuits/res/Splish.svg", {}, -1 }, + { kModeNonlinearcircuits, "/nonlinearcircuits/res/Statues.svg", {}, -1 }, + { kModeNonlinearcircuits, "/nonlinearcircuits/res/SquidAxon.svg", {}, -1 }, { kModeNonlinearcircuits, "/nonlinearcircuits/res/SlothApathy.svg", {}, -1 }, { kModeNonlinearcircuits, "/nonlinearcircuits/res/SlothInertia.svg", {}, -1 }, { kModeNonlinearcircuits, "/nonlinearcircuits/res/SlothTorpor.svg", {}, -1 },