From 3f0adb3a52ddbfc32e10932545d0393d8bd7df03 Mon Sep 17 00:00:00 2001
From: Christian Colglazier <christian@cacolglazier.com>
Date: Mon, 27 Jul 2020 13:01:35 -0400
Subject: [PATCH] Spinner based menu

---
 lib/libDaisy |  2 +-
 src/main.cpp | 61 +++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/lib/libDaisy b/lib/libDaisy
index 504f102..2cfc8f7 160000
--- a/lib/libDaisy
+++ b/lib/libDaisy
@@ -1 +1 @@
-Subproject commit 504f10264c39b04e5ef4d85d4c10d052d44919f2
+Subproject commit 2cfc8f7f395b9c159b4e64c34fad1100dd0f5834
diff --git a/src/main.cpp b/src/main.cpp
index 9894971..5db264b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,7 @@
 #include "daisysp.h"
 #include "daisy_patch.h"
 
+#include <algorithm>
 #include <string>
 
 #include "main.h"
@@ -10,18 +11,33 @@ using namespace daisysp;
 
 DaisyPatch patch;
 
-const int MENU_SIZE = 7;
+const int MENU_SIZE = 8;
+const int MAX_CHAR_LENGTH = 15;
 std::string menuItems[MENU_SIZE];
+const int MENU_X[] = {0,  5,  10,  5,  0};
+const int MENU_Y[] = {0, 11, 22, 41, 52};
 int selectedMenuItem = 0;
 
+
+void DrawSolidRect(uint8_t x1,
+		   uint8_t y1,
+		   uint8_t x2,
+		   uint8_t y2,
+		   bool on) {
+  for (int i = std::min(y1, y2); i <= std::max(y1, y2); i++) {
+    patch.display.DrawLine(x1, i, x2, i, on);
+  }
+}
+
 void SetupMenu() {
   menuItems[0] = "VCO";
   menuItems[1] = "VCA";
   menuItems[2] = "Envelope";
   menuItems[3] = "LFO";
   menuItems[4] = "Logic";
-  menuItems[5] = "Delay";
-  menuItems[6] = "Reverb";
+  menuItems[5] = "Noise";
+  menuItems[6] = "Delay";
+  menuItems[7] = "Reverb";
 }
 
 int main(void) {
@@ -35,39 +51,50 @@ int main(void) {
   }
 }
 
-void FilterMenu() {
+void FilterMenuSelection() {
   if (selectedMenuItem >= MENU_SIZE) {
-    selectedMenuItem = 0;
-  } else if (selectedMenuItem < 0) {
     selectedMenuItem = MENU_SIZE - 1;
+  } else if (selectedMenuItem < 0) {
+    selectedMenuItem = 0;
   }
 }
 
+std::string FilterMenuText(int position) {
+  if (position >= MENU_SIZE || position < 0) {
+    return "";
+  } else {
+    return menuItems[position];
+  }
+}
 void ProcessControls() {
   patch.UpdateAnalogControls();
   patch.DebounceControls();
-  selectedMenuItem += patch.encoder.Increment();
-  FilterMenu();
+  selectedMenuItem -= patch.encoder.Increment();
+  FilterMenuSelection();
 }
 
 void ProcessOutputs() {}
 
 void CreateMenuItem(std::string text, int position, bool highlighted) {
   char* cstr = &text[0];
-  patch.display.SetCursor(0, (position-1)*10);
-  patch.display.WriteString(cstr, Font_7x10, !highlighted);
+  text.insert(text.end(), MAX_CHAR_LENGTH-text.size(), ' ');
+  patch.display.SetCursor(MENU_X[position-1], MENU_Y[position-1]);
+  if (highlighted) {
+    patch.display.WriteString(cstr, Font_11x18, !highlighted);
+  } else {
+    patch.display.WriteString(cstr, Font_7x10, !highlighted);
+  }
+  //DrawSolidRect(text.size()*7, (position-1)*10, text.size()*7+21, position*10, false);
 }
 
 void ProcessOled() {
   patch.display.Fill(false);
 
-  CreateMenuItem(std::to_string(selectedMenuItem) + " " +
-		 menuItems[selectedMenuItem], 1, false);
-  CreateMenuItem("Item 2", 2, false);
-  CreateMenuItem("Item 3", 3, false);
-  CreateMenuItem("Item 4", 4, false);
-  CreateMenuItem("Item 5", 5, false);
-  CreateMenuItem("Item 6", 6, false);
+  CreateMenuItem(FilterMenuText(selectedMenuItem-2), 1, false);
+  CreateMenuItem(FilterMenuText(selectedMenuItem-1), 2, false);
+  CreateMenuItem(FilterMenuText(selectedMenuItem), 3, true);
+  CreateMenuItem(FilterMenuText(selectedMenuItem+1), 4, false);
+  CreateMenuItem(FilterMenuText(selectedMenuItem+2), 5, false);
   
   patch.display.Update();
 }