merge

electro-smith · Jul 26, 2021 · e1fc58b · e1fc58b
2 parents ecdcf4f + f61cd21
commit e1fc58b
Show file tree

Hide file tree

Showing 42 changed files with 21,206 additions and 9,936 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,9 +3,13 @@ gen_dsp/
 build/
 source/build*
 notes/
+graham/
 examples/*.cpp
 examples/*.h
+examples/*.json
 help/*.cpp
 help/*.h
+help/*.json
 templates/*.cpp
-templates/*.h
+templates/*.h
+templates/*.json
diff --git a/README.md b/README.md
@@ -33,9 +33,7 @@ Hardware voltages are mapped to gen~ -1..1
 
 ### MIDI
 
-- `in <n> midi` will give you a signal packed with any incoming MIDI bytes (see examples on parsing the signal). `<n>` just needs to be an output channel number that isn't being used for anything else.
-
-For MIDI output features, see the [wiki page](https://github.com/electro-smith/oopsy/wiki/MIDI-output) documentation.
+For [MIDI input](https://github.com/electro-smith/oopsy/wiki/MIDI-Input) and [MIDI output](https://github.com/electro-smith/oopsy/wiki/MIDI-output) features, see the wiki pages documentation.
 
 ## Using from within Max
 

diff --git a/code/oopsy.ctrl.smooth2.gendsp b/code/oopsy.ctrl.smooth2.gendsp
@@ -45,7 +45,7 @@
 					"maxclass" : "comment",
 					"numinlets" : 1,
 					"numoutlets" : 0,
-					"patching_rect" : [ 254.0, 61.0, 150.0, 114.0 ],
+					"patching_rect" : [ 304.0, 62.0, 150.0, 114.0 ],
 					"text" : "A 2-pole lowpass filter at 10Hz seems to effectively silence noise from hardware input ADCs.\n\nBut a 10Hz filter might be too slow to respond, if so, try the smooth3 option."
 				}
 
@@ -104,20 +104,6 @@
 					"text" : "mix"
 				}
 
-			}
-, 			{
-				"box" : 				{
-					"fontname" : "Lato",
-					"fontsize" : 12.0,
-					"id" : "obj-10",
-					"maxclass" : "newobj",
-					"numinlets" : 1,
-					"numoutlets" : 1,
-					"outlettype" : [ "" ],
-					"patching_rect" : [ 127.5, 53.0, 109.0, 23.0 ],
-					"text" : "* twopi/samplerate"
-				}
-
 			}
 , 			{
 				"box" : 				{
@@ -139,11 +125,11 @@
 					"fontsize" : 12.0,
 					"id" : "obj-5",
 					"maxclass" : "newobj",
-					"numinlets" : 1,
+					"numinlets" : 0,
 					"numoutlets" : 1,
 					"outlettype" : [ "" ],
-					"patching_rect" : [ 127.5, 84.0, 26.0, 23.0 ],
-					"text" : "sin"
+					"patching_rect" : [ 127.5, 84.0, 158.0, 23.0 ],
+					"text" : "fastsin 10*twopi/samplerate"
 				}
 
 			}
@@ -160,20 +146,6 @@
 					"text" : "in 1"
 				}
 
-			}
-, 			{
-				"box" : 				{
-					"fontname" : "Lato",
-					"fontsize" : 12.0,
-					"id" : "obj-2",
-					"maxclass" : "newobj",
-					"numinlets" : 0,
-					"numoutlets" : 1,
-					"outlettype" : [ "" ],
-					"patching_rect" : [ 127.5, 23.0, 22.0, 23.0 ],
-					"text" : "10"
-				}
-
 			}
  ],
 		"lines" : [ 			{
@@ -182,27 +154,13 @@
 					"source" : [ "obj-1", 0 ]
 				}
 
-			}
-, 			{
-				"patchline" : 				{
-					"destination" : [ "obj-5", 0 ],
-					"source" : [ "obj-10", 0 ]
-				}
-
 			}
 , 			{
 				"patchline" : 				{
 					"destination" : [ "obj-6", 0 ],
 					"source" : [ "obj-14", 0 ]
 				}
 
-			}
-, 			{
-				"patchline" : 				{
-					"destination" : [ "obj-10", 0 ],
-					"source" : [ "obj-2", 0 ]
-				}
-
 			}
 , 			{
 				"patchline" : 				{

diff --git a/code/oopsy.ctrl.smooth3.gendsp b/code/oopsy.ctrl.smooth3.gendsp
@@ -45,7 +45,7 @@
 					"maxclass" : "comment",
 					"numinlets" : 1,
 					"numoutlets" : 0,
-					"patching_rect" : [ 276.0, 35.0, 150.0, 181.0 ],
+					"patching_rect" : [ 304.0, 35.0, 150.0, 181.0 ],
 					"text" : "A 3-pole lowpass filter at 30Hz seems to effectively silence any noise from hardware input ADCs.\n\nMost of the time this level of aggressive smoothing is probably unnecessary, but for some applications that are very sensitive (e.g. setting long delay line lengths) it might be needed."
 				}
 
@@ -132,20 +132,6 @@
 					"text" : "mix"
 				}
 
-			}
-, 			{
-				"box" : 				{
-					"fontname" : "Lato",
-					"fontsize" : 12.0,
-					"id" : "obj-10",
-					"maxclass" : "newobj",
-					"numinlets" : 1,
-					"numoutlets" : 1,
-					"outlettype" : [ "" ],
-					"patching_rect" : [ 127.5, 53.0, 109.0, 23.0 ],
-					"text" : "* twopi/samplerate"
-				}
-
 			}
 , 			{
 				"box" : 				{
@@ -167,11 +153,11 @@
 					"fontsize" : 12.0,
 					"id" : "obj-5",
 					"maxclass" : "newobj",
-					"numinlets" : 1,
+					"numinlets" : 0,
 					"numoutlets" : 1,
 					"outlettype" : [ "" ],
-					"patching_rect" : [ 127.5, 84.0, 26.0, 23.0 ],
-					"text" : "sin"
+					"patching_rect" : [ 127.5, 84.0, 158.0, 23.0 ],
+					"text" : "fastsin 30*twopi/samplerate"
 				}
 
 			}
@@ -188,20 +174,6 @@
 					"text" : "in 1"
 				}
 
-			}
-, 			{
-				"box" : 				{
-					"fontname" : "Lato",
-					"fontsize" : 12.0,
-					"id" : "obj-2",
-					"maxclass" : "newobj",
-					"numinlets" : 0,
-					"numoutlets" : 1,
-					"outlettype" : [ "" ],
-					"patching_rect" : [ 127.5, 23.0, 22.0, 23.0 ],
-					"text" : "30"
-				}
-
 			}
  ],
 		"lines" : [ 			{
@@ -210,13 +182,6 @@
 					"source" : [ "obj-1", 0 ]
 				}
 
-			}
-, 			{
-				"patchline" : 				{
-					"destination" : [ "obj-5", 0 ],
-					"source" : [ "obj-10", 0 ]
-				}
-
 			}
 , 			{
 				"patchline" : 				{
@@ -248,13 +213,6 @@
 					"source" : [ "obj-14", 0 ]
 				}
 
-			}
-, 			{
-				"patchline" : 				{
-					"destination" : [ "obj-10", 0 ],
-					"source" : [ "obj-2", 0 ]
-				}
-
 			}
 , 			{
 				"patchline" : 				{
@@ -324,8 +282,7 @@
 				}
 
 			}
- ],
-		"autosave" : 0
+ ]
 	}
 
 }
diff --git a/code/oopsy.cv2hz.gendsp b/code/oopsy.cv2hz.gendsp
@@ -104,8 +104,8 @@
 					"numinlets" : 2,
 					"numoutlets" : 1,
 					"outlettype" : [ "" ],
-					"patching_rect" : [ 421.0, 150.0, 42.0, 22.0 ],
-					"text" : "pow"
+					"patching_rect" : [ 421.0, 150.0, 50.0, 22.0 ],
+					"text" : "fastpow"
 				}
 
 			}
@@ -124,11 +124,11 @@
 , 			{
 				"box" : 				{
 					"id" : "obj-15",
-					"linecount" : 14,
+					"linecount" : 13,
 					"maxclass" : "comment",
 					"numinlets" : 1,
 					"numoutlets" : 0,
-					"patching_rect" : [ 23.0, 20.0, 354.0, 194.0 ],
+					"patching_rect" : [ 23.0, 20.0, 356.0, 181.0 ],
 					"text" : "CV to Hz is somewhat arbitrary, with a variety of conventions in wide use. \n\nOne widespread convention is that adding one volt will increase pitch by one octave (every 2^1/12 volt is a semitone), which is implemented here. The base tuning of an integer voltage is mostly a \"C\", which is also implemented here, but see https://learningmodular.com/matching-octaves-in-your-modular to see how much the register can vary in hardware;  0v, 1v, 2v and 3v are all widespread tunings for MIDI note 60 (C4) for example.\n\nYou can shift the register simply by adding an integer to the input CV.  Here we chose 3v == C4/MIDI 60 as a default."
 				}