can optionally save custom midi config with project

Author: stephen

example.project.json

@@ -34,12 +34,7 @@
             "ControlValue": 165
           },
           "colour": {
-            "ColourValue": [
-              0,
-              0,
-              0,
-              0
-            ]
+            "ColourValue": [0, 0, 0, 0]
           },
           "zoom": {
             "ControlValue": 0
@@ -53,12 +48,7 @@
             "ControlValue": 0
           },
           "colour": {
-            "ColourValue": [
-              0,
-              0,
-              0,
-              0
-            ]
+            "ColourValue": [0, 0, 0, 0]
           },
           "tilt": {
             "ControlValue": 120
@@ -75,12 +65,7 @@
             "ControlValue": 0
           },
           "colour": {
-            "ColourValue": [
-              0,
-              0,
-              0,
-              0
-            ]
+            "ColourValue": [0, 0, 0, 0]
           },
           "pan": {
             "ControlValue": 205
@@ -91,12 +76,7 @@
             "ControlValue": 193
           },
           "colour": {
-            "ColourValue": [
-              0,
-              0,
-              0,
-              0
-            ]
+            "ColourValue": [0, 0, 0, 0]
           },
           "tilt": {
             "ControlValue": 150
@@ -115,12 +95,7 @@
             "ControlValue": 255
           },
           "colour": {
-            "ColourValue": [
-              237,
-              255,
-              0,
-              255
-            ]
+            "ColourValue": [237, 255, 0, 255]
           },
           "pan": {
             "ControlValue": 0
@@ -137,25 +112,15 @@
             "ControlValue": 150
           },
           "colour": {
-            "ColourValue": [
-              255,
-              0,
-              0,
-              255
-            ]
+            "ColourValue": [255, 0, 0, 255]
           },
           "zoom": {
             "ControlValue": 255
           }
         },
         "Hex West": {
           "colour": {
-            "ColourValue": [
-              0,
-              255,
-              87,
-              255
-            ]
+            "ColourValue": [0, 255, 87, 255]
           },
           "pan": {
             "ControlValue": 0
@@ -169,12 +134,7 @@
         },
         "Hero North": {
           "colour": {
-            "ColourValue": [
-              37,
-              0,
-              243,
-              255
-            ]
+            "ColourValue": [37, 0, 243, 255]
           },
           "tilt": {
             "ControlValue": 127
@@ -189,4 +149,4 @@
       }
     }
   ]
-}
+}

src/model.rs

@@ -178,7 +178,7 @@ impl Model {
                     channel: _,
                     velocity: _,
                 } = note;
-                let start_note = 48;
+                let start_note = self.project.midi_config.note_start;
                 let index = note - start_note;
                 debug!("Note {} => macro group index {}", note, index);
                 self.selected_macro_group_index = index as usize;
@@ -191,21 +191,11 @@ impl Model {
                     value,
                 } = cc;
 
-                // let active_macros = self
-                //     .project
-                //     .fixtures
-                //     .iter()
-                //     .map(|fc| {
-                //         if let Some(fixture) = &fc.fixture {
-                //             let macros = fixture.modes[0].macros.clone();
-                //             return Some((fc.clone(), macros));
-                //         } else {
-                //             return None;
-                //         }
-                //     })
-                //     .filter_map(|x| x);
-
-                let controller_start = 48;
+                let controller_start = self.project.midi_config.controller_start;
+
+                if controller < controller_start {
+                    return;
+                }
 
                 for (i, fixture) in self.project.fixtures.iter_mut().enumerate() {
                     if self.selected_macro_group_index as usize == i {

src/project.rs

@@ -7,9 +7,30 @@ use serde::{Deserialize, Serialize};
 use crate::animation::Animation;
 
 #[derive(Serialize, Deserialize, Clone)]
+#[serde(rename_all = "camelCase")]
 pub struct Project {
     pub fixtures: Vec<FixtureInstance>,
     pub scenes: Vec<Scene>,
+    #[serde(default)]
+    pub midi_config: MidiConfig,
+}
+
+#[derive(Serialize, Deserialize, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct MidiConfig {
+    /// Which controller number counts as the first, i.e. macro index 0
+    pub controller_start: u8,
+    /// Which note count as the first, i.e. fixture index 0
+    pub note_start: u8,
+}
+
+impl Default for MidiConfig {
+    fn default() -> Self {
+        MidiConfig {
+            controller_start: 48,
+            note_start: 49,
+        }
+    }
 }
 
 #[derive(Serialize, Deserialize, Clone)]
@@ -159,6 +180,7 @@ impl Project {
         Project {
             fixtures: Vec::new(),
             scenes: Vec::new(),
+            midi_config: MidiConfig::default(),
         }
     }