From: Chris <redacted>
Date: Mon, 5 Sep 2016 19:42:42 +0000 (-0700)
Subject: midi: chromatic_notes in list.py was off by 1 octave
X-Git-Tag: libsigrokdecode-0.5.0~145
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=294bcfd4e07fbc6ac23d23d5d6c775e01e33b00a;p=libsigrokdecode.git

midi: chromatic_notes in list.py was off by 1 octave

(ex: note 60 is middle C which is C4, not C3)
---

diff --git a/decoders/midi/lists.py b/decoders/midi/lists.py
index 091b862..afe7158 100644
--- a/decoders/midi/lists.py
+++ b/decoders/midi/lists.py
@@ -659,134 +659,134 @@ smpte_type = {
 }
 
 chromatic_notes = {
-    0: 'C-2',
-    1: 'C#-2',
-    2: 'D-2',
-    3: 'D#-2',
-    4: 'E-2',
-    5: 'F-2',
-    6: 'F#-2',
-    7: 'G-2',
-    8: 'G#-2',
-    9: 'A-2',
-    10: 'A#-2',
-    11: 'B-2',
-    12: 'C-1',
-    13: 'C#-1',
-    14: 'D-1',
-    15: 'D#-1',
-    16: 'E-1',
-    17: 'F-1',
-    18: 'F#-1',
-    19: 'G-1',
-    20: 'G#-1',
-    21: 'A-1',
-    22: 'A#-1',
-    23: 'B-1',
-    24: 'C0',
-    25: 'C#0',
-    26: 'D0',
-    27: 'D#0',
-    28: 'E0',
-    29: 'F0',
-    30: 'F#0',
-    31: 'G0',
-    32: 'G#0',
-    33: 'A0',
-    34: 'A#0',
-    35: 'B0',
-    36: 'C1',
-    37: 'C#1',
-    38: 'D1',
-    39: 'D#1',
-    40: 'E1',
-    41: 'F1',
-    42: 'F#1',
-    43: 'G1',
-    44: 'G#1',
-    45: 'A1',
-    46: 'A#1',
-    47: 'B1',
-    48: 'C2',
-    49: 'C#2',
-    50: 'D2',
-    51: 'D#2',
-    52: 'E2',
-    53: 'F2',
-    54: 'F#2',
-    55: 'G2',
-    56: 'G#2',
-    57: 'A2',
-    58: 'A#2',
-    59: 'B2',
-    60: 'C3',
-    61: 'C#3',
-    62: 'D3',
-    63: 'D#3',
-    64: 'E3',
-    65: 'F3',
-    66: 'F#3',
-    67: 'G3',
-    68: 'G#3',
-    69: 'A3',
-    70: 'A#3',
-    71: 'B3',
-    72: 'C4',
-    73: 'C#4',
-    74: 'D4',
-    75: 'D#4',
-    76: 'E4',
-    77: 'F4',
-    78: 'F#4',
-    79: 'G4',
-    80: 'G#4',
-    81: 'A4',
-    82: 'A#4',
-    83: 'B4',
-    84: 'C5',
-    85: 'C#5',
-    86: 'D5',
-    87: 'D#5',
-    88: 'E5',
-    89: 'F5',
-    90: 'F#5',
-    91: 'G5',
-    92: 'G#5',
-    93: 'A5',
-    94: 'A#5',
-    95: 'B5',
-    96: 'C6',
-    97: 'C#6',
-    98: 'D6',
-    99: 'D#6',
-    100: 'E6',
-    101: 'F6',
-    102: 'F#6',
-    103: 'G6',
-    104: 'G#6',
-    105: 'A6',
-    106: 'A#6',
-    107: 'B6',
-    108: 'C7',
-    109: 'C#7',
-    110: 'D7',
-    111: 'D#7',
-    112: 'E7',
-    113: 'F7',
-    114: 'F#7',
-    115: 'G7',
-    116: 'G#7',
-    117: 'A7',
-    118: 'A#7',
-    119: 'B7',
-    120: 'C8',
-    121: 'C#8',
-    122: 'D8',
-    123: 'D#8',
-    124: 'E8',
-    125: 'F8',
-    126: 'F#8',
-    127: 'G8',
+    0: 'C-1',
+    1: 'C#-1',
+    2: 'D-1',
+    3: 'D#-1',
+    4: 'E-1',
+    5: 'F-1',
+    6: 'F#-1',
+    7: 'G-1',
+    8: 'G#-1',
+    9: 'A-1',
+    10: 'A#-1',
+    11: 'B-1',
+    12: 'C0',
+    13: 'C#0',
+    14: 'D0',
+    15: 'D#0',
+    16: 'E0',
+    17: 'F0',
+    18: 'F#0',
+    19: 'G0',
+    20: 'G#0',
+    21: 'A0',
+    22: 'A#0',
+    23: 'B0',
+    24: 'C1',
+    25: 'C#1',
+    26: 'D1',
+    27: 'D#1',
+    28: 'E1',
+    29: 'F1',
+    30: 'F#1',
+    31: 'G1',
+    32: 'G#1',
+    33: 'A1',
+    34: 'A#1',
+    35: 'B1',
+    36: 'C2',
+    37: 'C#2',
+    38: 'D2',
+    39: 'D#2',
+    40: 'E2',
+    41: 'F2',
+    42: 'F#2',
+    43: 'G2',
+    44: 'G#2',
+    45: 'A2',
+    46: 'A#2',
+    47: 'B2',
+    48: 'C3',
+    49: 'C#3',
+    50: 'D3',
+    51: 'D#3',
+    52: 'E3',
+    53: 'F3',
+    54: 'F#3',
+    55: 'G3',
+    56: 'G#3',
+    57: 'A3',
+    58: 'A#3',
+    59: 'B3',
+    60: 'C4',
+    61: 'C#4',
+    62: 'D4',
+    63: 'D#4',
+    64: 'E4',
+    65: 'F4',
+    66: 'F#4',
+    67: 'G4',
+    68: 'G#4',
+    69: 'A4',
+    70: 'A#4',
+    71: 'B4',
+    72: 'C5',
+    73: 'C#5',
+    74: 'D5',
+    75: 'D#5',
+    76: 'E5',
+    77: 'F5',
+    78: 'F#5',
+    79: 'G5',
+    80: 'G#5',
+    81: 'A5',
+    82: 'A#5',
+    83: 'B5',
+    84: 'C6',
+    85: 'C#6',
+    86: 'D6',
+    87: 'D#6',
+    88: 'E6',
+    89: 'F6',
+    90: 'F#6',
+    91: 'G6',
+    92: 'G#6',
+    93: 'A6',
+    94: 'A#6',
+    95: 'B6',
+    96: 'C7',
+    97: 'C#7',
+    98: 'D7',
+    99: 'D#7',
+    100: 'E7',
+    101: 'F7',
+    102: 'F#7',
+    103: 'G7',
+    104: 'G#7',
+    105: 'A7',
+    106: 'A#7',
+    107: 'B7',
+    108: 'C8',
+    109: 'C#8',
+    110: 'D8',
+    111: 'D#8',
+    112: 'E8',
+    113: 'F8',
+    114: 'F#8',
+    115: 'G8',
+    116: 'G#8',
+    117: 'A8',
+    118: 'A#8',
+    119: 'B8',
+    120: 'C9',
+    121: 'C#9',
+    122: 'D9',
+    123: 'D#9',
+    124: 'E9',
+    125: 'F9',
+    126: 'F#9',
+    127: 'G9',
 }
 
 percussion_notes = {