Give applets space to draw.

Author: CarlColglazier

src/AppHost.hpp

@@ -11,7 +11,8 @@
 using namespace daisy;
 
 enum App { VCO, VCA, NOISE, NUM_ITEMS };
-const int SCREEN_WIDTH = 128;
+const int SCREEN_WIDTH = 100;//128;
+const int S_WIDTH =  36; //(SCREEN_WIDTH / 2);
 
 static uint32_t DSY_QSPI_BSS buff[BUFF_SIZE];
 //static uint32_t __attribute__((section(".dtcmram_bss"))) outbuff[BUFF_SIZE];
@@ -29,9 +30,13 @@ class AppHost {
 	int position;
 	App app;
 	Applet *gen;
+	int dr[S_WIDTH * S_WIDTH];
 	AppHost() {
 		position = 0;
 		app = App::VCO;
+		for (int i = 0; i < S_WIDTH * S_WIDTH; i++) {
+			dr[i] = 0;
+		}
 	}
 
 	void Init(float sample_rate) {
@@ -53,15 +58,26 @@ class AppHost {
 
 	void draw(DaisyPatch patch, int selected) {
 		int draw_width = SCREEN_WIDTH / NUM_APPLETS;
-
+		int left_offset = position * draw_width;
 		if (selected == position) {
-			for (int x = position * draw_width; x < (position + 1) * draw_width; x++) {
-				patch.display.DrawPixel(x, 30, true);
+			for (int x = left_offset; x < (position + 1) * draw_width; x++) {
+				patch.display.DrawPixel(x, 12, true);
 			}
 		}
 		const char *names[App::NUM_ITEMS] =
 			{ "FM VCO", "VCA", "NOISE" };
-		writeString(patch, position * draw_width, 18, names[app]);
+		writeString(patch, position * draw_width, 2, names[app]);
+		gen->Draw(dr, S_WIDTH, S_WIDTH);
+		for (int x = 0; x < S_WIDTH; x++) {
+			for (int y = 0; y < S_WIDTH; y++) {
+				if (dr[S_WIDTH * y + x] == 1) {
+					patch.display.DrawPixel(x + left_offset, y + 20, true);
+				} else {
+					patch.display.DrawPixel(x + left_offset, y + 20, false);
+				}
+			}
+		}
+		//delete dr;
 	}
 };
 

src/Applet.cpp

@@ -19,6 +19,21 @@ float* Amp::Process(float in_l, float in_r) {
 	return out;
 }
 
+void Amp::Draw(int *out, int width, int height) {
+	for (int x = 0; x < width; x++) {
+		for (int y = 0; y < height; y++) {
+			out [y * width + x] = 0;
+			if (x > 0 && x < width / 2 && y > (height - amp_l * height)) {
+				out[y * width + x] = 1;
+			}
+
+			if (x > width / 2 && y > (height - amp_r * height)) {
+				out[y * width + x] = 1;
+			}
+		}
+	}
+}
+
 // NOISE
 // ----------------------
 Noise::Noise(float sample_rate) {
@@ -37,6 +52,14 @@ float* Noise::Process(float in_l, float in_r) {
 	return out;
 }
 
+void Noise::Draw(int *out, int width, int height) {
+	for (int x = 0; x < width; x++) {
+		for (int y = 0; y < height; y++) {
+			out [y * width + x] = 0;
+		}
+	}
+}
+
 // OSC
 // ----------------------
 Osc::Osc(float sample_rate) {
@@ -72,3 +95,11 @@ float* Osc::Process(float in_l, float in_r) {
 	out[1] = osc_two->Process();
 	return out;
 }
+
+void Osc::Draw(int *out, int width, int height) {
+	for (int x = 0; x < width; x++) {
+		for (int y = 0; y < height; y++) {
+			out [y * width + x] = 0;
+		}
+	}
+}

src/Applet.hpp

@@ -1,19 +1,25 @@
+#include "daisy_patch.h"
+
 #include <random>
 #include <math.h>
 #include "Generator.hpp"
 
+using namespace daisy;
+
 class Applet {
 public:
 	virtual ~Applet() {};
 	virtual void Control(float f_l, float f_r) = 0;
 	virtual float* Process(float f_l, float f_r) = 0;
+	virtual void Draw(int *d, int width, int height) = 0;
 };
 
 class Amp: public Applet {
 public:
 	Amp(float sample_rate);
 	void Control(float in_l, float in_r);
 	float* Process(float in, float in_r);
+	void Draw(int *d, int width, int height);
 private:
 	float amp_l, amp_r;
 };
@@ -23,6 +29,7 @@ class Noise: public Applet {
 	Noise(float sample_rate);
 	void Control(float in_l, float in_r);
 	float* Process(float in_l, float in_r);
+	void Draw(int *d, int width, int height);
 private:
 	float amp_;
 };
@@ -37,6 +44,7 @@ class Osc: public Applet {
 	~Osc();
 	void Control(float in_l, float in_r);
 	float* Process(float in_l, float in_r);
+	void Draw(int *d, int width, int height);
 private:
 	float car_freq_, mod_freq_, mod_index_;
 	Oscillator *osc_one;

src/Olearia.cpp

@@ -1,6 +1,4 @@
 #include "daisy_patch.h"
-#include <string>
-#include <cstring>
 #include <math.h>
 
 // local includes
@@ -34,11 +32,6 @@ void UpdateControls() {
 	}
 
 	if (patch.encoder.Pressed()) {
-		// save?
-		if (patch.encoder.TimeHeldMs() > 2000.0f && patch.encoder.TimeHeldMs() < 2010.0f) {
-			//writeModes();
-			// disabled for now
-		}
 		// encoder
 		selected = (selected + patch.encoder.Increment()) % NUM_APPLETS;
 		if (selected < 0) {
@@ -67,21 +60,15 @@ static void AudioThrough(float **in, float **out, size_t size) {
 	for (int a = 0; a < NUM_APPLETS; a++) {
 		apphost[a]->gen->Control(controls[2 * a], controls[2 * a + 1]);
 		for (size_t i = 0; i < size; i++) {
-			float *o;
-			o = apphost[a]->gen->Process(in[2 * a][i], in[2 * a + 1][i]);
+			float *o = apphost[a]->gen->Process(in[2 * a][i], in[2 * a + 1][i]);
 			out[2 * a][i] = o[0];
 			out[2 * a + 1][i] = o[1];
-			//out[2 * a + 1][i] = applets[a].gen->Process();
 		}
 	}
 }
 
 void UpdateOled() {
 	patch.display.Fill(false);
-	//writeString(patch, 0, 0, "olearia");
-	for (int i = 0; i < 128; i++) {
-		patch.display.DrawPixel(i, 10, true);
-	}
 	for (int i = 0; i < NUM_APPLETS; i++) {
 		apphost[i]->draw(patch, selected);
 	}