change fingerings and brass instrument ranges

StephenBuley · Mar 14, 2024 · 3edb4e2 · 3edb4e2
1 parent dd678d4
commit 3edb4e2
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 28 deletions.
diff --git a/src/helpers/fingerings.ts b/src/helpers/fingerings.ts
@@ -24,12 +24,24 @@ export const fhorn: FrenchHornFingering = {
   T123: [],
 }
 export const euphonium: FourValveFingering = {
-  '': ['F3', 'Bb3', 'As3', 'Bb2', 'As2', 'D4'],
-  1: ['Eb3', 'Ab3', 'C4', 'Ds3', 'Gs3', 'Gs2', 'Ab2', 'Ds4', 'Eb4'],
-  2: ['E3', 'A3', 'A2', 'Cs4', 'Db4', 'E4'],
-  3: ['D3', 'G3', 'G2'],
-  12: ['D3', 'G3', 'B3', 'G2', 'D4'],
-  23: ['Db3', 'Gb3', 'Cs3', 'Fs3', 'Fs2', 'Gb2', 'Db4', 'Cs4'],
+  '': ['F3', 'Bb3', 'As3', 'Bb2', 'As2', 'D4', 'F4', 'As4', 'Bb4'],
+  1: [
+    'Eb3',
+    'Ab3',
+    'C4',
+    'Ds3',
+    'Gs3',
+    'Gs2',
+    'Ab2',
+    'Ds4',
+    'Eb4',
+    'Gs4',
+    'Ab4',
+  ],
+  2: ['E3', 'A3', 'A2', 'Cs4', 'Db4', 'E4', 'A4'],
+  3: ['D3', 'G3', 'G2', 'G4'],
+  12: ['D3', 'G3', 'B3', 'G2', 'D4', 'G4'],
+  23: ['Db3', 'Gb3', 'Cs3', 'Fs3', 'Fs2', 'Gb2', 'Db4', 'Cs4', 'Fs4', 'Gb4'],
   13: ['F2', 'C3', 'C4'],
   123: ['E2', 'B2'],
   4: ['C3', 'F2'],
@@ -54,19 +66,33 @@ export const trumpet: ThreeValveFingering = {
 }
 
 export const tubaBbThreeValve: ThreeValveFingering = {
-  '': ['F2', 'Bb2', 'As2', 'D3', 'F3', 'Bb3', 'As3'],
-  1: ['Ds2', 'Eb2', 'Gs2', 'Ab2', 'C3', 'Ds3', 'Eb3', 'Gs3', 'Ab3'],
-  2: ['E2', 'A2', 'Cs3', 'Db3', 'E3', 'A3'],
-  3: ['D2', 'G2', 'B2', 'G3'],
-  12: ['D2', 'G2', 'B2', 'G3'],
-  23: ['Cs2', 'Db2', 'Fs2', 'Gb2', 'Fs3', 'Gb3'],
-  13: ['C2'],
-  123: [],
+  '': ['As1', 'Bb1', 'F2', 'Bb2', 'As2', 'D3', 'F3', 'Bb3', 'As3'],
+  1: [
+    'Gs1',
+    'Ab1',
+    'Ds2',
+    'Eb2',
+    'Gs2',
+    'Ab2',
+    'C3',
+    'Ds3',
+    'Eb3',
+    'Gs3',
+    'Ab3',
+  ],
+  2: ['A1', 'E2', 'A2', 'Cs3', 'Db3', 'E3', 'A3'],
+  3: ['G1', 'D2', 'G2', 'B2', 'G3'],
+  12: ['G1', 'D2', 'G2', 'B2', 'G3'],
+  23: ['Fs1', 'Gb1', 'Cs2', 'Db2', 'Fs2', 'Gb2', 'Fs3', 'Gb3'],
+  13: ['F1', 'C2'],
+  123: ['E1', 'B1'],
 }
 
 export const tubaBbFourValve: FourValveFingering = {
-  '': ['F2', 'As2', 'Bb2', 'D3', 'F3', 'As3', 'Bb3', 'C4', 'D4'],
+  '': ['As1', 'Bb1', 'F2', 'As2', 'Bb2', 'D3', 'F3', 'As3', 'Bb3', 'C4', 'D4'],
   1: [
+    'Gs1',
+    'Ab1',
     'Ds2',
     'Eb2',
     'Gs2',
@@ -80,19 +106,32 @@ export const tubaBbFourValve: FourValveFingering = {
     'Ds4',
     'Eb4',
   ],
-  2: ['E2', 'A2', 'Cs3', 'Db3', 'E3', 'A3', 'B3', 'Cs4', 'Db4', 'E4'],
-  3: ['D2', 'G2', 'G3'],
-  12: ['D2', 'G2', 'B2', 'D3', 'G3', 'B3', 'D4'],
-  23: ['Cs2', 'Db2', 'Fs2', 'Gb2', 'Cs3', 'Db3', 'Fs3', 'Gb3', 'Cs4', 'Db4'],
-  13: ['C2', 'C3', 'D2'],
-  123: [],
-  4: ['C2', 'D2'],
+  2: ['A1', 'E2', 'A2', 'Cs3', 'Db3', 'E3', 'A3', 'B3', 'Cs4', 'Db4', 'E4'],
+  3: ['G1', 'D2', 'G2', 'G3'],
+  12: ['G1', 'D2', 'G2', 'B2', 'D3', 'G3', 'B3', 'D4'],
+  23: [
+    'Fs1',
+    'Gb1',
+    'Cs2',
+    'Db2',
+    'Fs2',
+    'Gb2',
+    'Cs3',
+    'Db3',
+    'Fs3',
+    'Gb3',
+    'Cs4',
+    'Db4',
+  ],
+  13: ['F1', 'C2', 'C3'],
+  123: ['E1', 'B1'],
+  4: ['F1', 'C2'],
   14: [],
-  24: [],
+  24: ['E1', 'B1'],
   34: [],
-  124: [],
+  124: ['Ds1', 'Eb1'],
   134: [],
-  234: [],
+  234: ['D1'],
   1234: [],
 }
 

diff --git a/src/main.tsx b/src/main.tsx
@@ -59,7 +59,7 @@ const router = createBrowserRouter(
           valveSet={['1', '2', '3', '4'].map((valve) => (
             <BrassValve key={valve} valve={valve} />
           ))}
-          availableNotes={getAvailableNotes('C2', 'E4')}
+          availableNotes={getAvailableNotes('C2', 'Bb4')}
         />
       }
     />,
@@ -94,7 +94,7 @@ const router = createBrowserRouter(
       }
     />,
     <Route
-      key="/tubBbFourValve"
+      key="/tubaBbFourValve"
       path="/tubaBbFourValve"
       element={
         <InstrumentPage<FourValveFingering>
@@ -104,7 +104,7 @@ const router = createBrowserRouter(
           valveSet={['1', '2', '3', '4'].map((valve) => (
             <BrassValve key={valve} valve={valve} />
           ))}
-          availableNotes={getAvailableNotes('C2', 'E4')}
+          availableNotes={getAvailableNotes('D1', 'E4')}
         />
       }
     />,