Skip to content

Commit 77af545

Browse files
Alexander Bessmanbessman
authored andcommitted
Accept 3 as number of channels to capture (Fix #198)
1 parent 0b0c8b8 commit 77af545

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

pslab/instrument/oscilloscope.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ def _lookup_mininum_timegap(self, channels: int) -> float:
177177
channels_idx = {
178178
1: 0,
179179
2: 1,
180+
3: 2,
180181
4: 2,
181182
}
182183
min_timegaps = [[0.5, 0.75], [0.875, 0.875], [1.75, 1.75]]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[[[2], [8], [1], [0], [2], [8], [2], [0], [2], [8], [1], [0], [2], [8], [2], [0], [2], [4], [3], [244, 1], [16, 0], [2], [6], [11], [8], [0, 0], [244, 1], [11], [8], [244, 1], [244, 1], [11], [8], [232, 3], [244, 1], [11], [8], [220, 5], [244, 1]], [[], [], [], [1], [], [], [], [1], [], [], [], [1], [], [], [], [1], [], [], [], [], [1], [], [1, 244, 1, 1], [], [], [], [173, 1, 174, 1, 174, 1, 176, 1, 176, 1, 176, 1, 177, 1, 179, 1, 179, 1, 180, 1, 180, 1, 182, 1, 183, 1, 183, 1, 184, 1, 185, 1, 186, 1, 187, 1, 187, 1, 192, 1, 192, 1, 192, 1, 192, 1, 192, 1, 194, 1, 194, 1, 195, 1, 196, 1, 198, 1, 198, 1, 198, 1, 199, 1, 202, 1, 203, 1, 203, 1, 204, 1, 206, 1, 207, 1, 207, 1, 207, 1, 211, 1, 211, 1, 211, 1, 213, 1, 215, 1, 216, 1, 216, 1, 217, 1, 220, 1, 220, 1, 220, 1, 224, 1, 224, 1, 225, 1, 225, 1, 226, 1, 229, 1, 230, 1, 230, 1, 231, 1, 233, 1, 235, 1, 234, 1, 236, 1, 238, 1, 240, 1, 240, 1, 241, 1, 243, 1, 244, 1, 244, 1, 246, 1, 248, 1, 250, 1, 249, 1, 251, 1, 253, 1, 254, 1, 254, 1, 0, 2, 2, 2, 3, 2, 3, 2, 4, 2, 6, 2, 8, 2, 8, 2, 9, 2, 11, 2, 12, 2, 13, 2, 14, 2, 16, 2, 17, 2, 18, 2, 18, 2, 20, 2, 22, 2, 23, 2, 23, 2, 25, 2, 27, 2, 28, 2, 28, 2, 30, 2, 31, 2, 31, 2, 33, 2, 35, 2, 37, 2, 37, 2, 38, 2, 39, 2, 41, 2, 41, 2, 42, 2, 44, 2, 45, 2, 46, 2, 46, 2, 48, 2, 49, 2, 50, 2, 50, 2, 52, 2, 54, 2, 54, 2, 55, 2, 56, 2, 57, 2, 58, 2, 58, 2, 60, 2, 64, 2, 64, 2, 64, 2, 64, 2, 65, 2, 66, 2, 66, 2, 67, 2, 68, 2, 70, 2, 70, 2, 71, 2, 71, 2, 71, 2, 73, 2, 74, 2, 76, 2, 76, 2, 76, 2, 78, 2, 78, 2, 79, 2, 79, 2, 79, 2, 79, 2, 82, 2, 82, 2, 83, 2, 83, 2, 84, 2, 84, 2, 85, 2, 86, 2, 87, 2, 87, 2, 88, 2, 88, 2, 88, 2, 89, 2, 89, 2, 90, 2, 91, 2, 91, 2, 92, 2, 92, 2, 92, 2, 92, 2, 93, 2, 94, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 97, 2, 97, 2, 97, 2, 97, 2, 97, 2, 97, 2, 98, 2, 98, 2, 98, 2, 98, 2, 98, 2, 98, 2, 98, 2, 98, 2, 98, 2, 98, 2, 98, 2, 98, 2, 98, 2, 98, 2, 97, 2, 97, 2, 97, 2, 97, 2, 97, 2, 97, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 94, 2, 93, 2, 93, 2, 92, 2, 92, 2, 92, 2, 91, 2, 90, 2, 90, 2, 90, 2, 89, 2, 88, 2, 88, 2, 88, 2, 87, 2, 86, 2, 86, 2, 86, 2, 85, 2, 84, 2, 83, 2, 83, 2, 82, 2, 79, 2, 79, 2, 79, 2, 79, 2, 78, 2, 78, 2, 77, 2, 76, 2, 75, 2, 74, 2, 74, 2, 73, 2, 71, 2, 71, 2, 71, 2, 70, 2, 68, 2, 67, 2, 67, 2, 66, 2, 64, 2, 64, 2, 64, 2, 64, 2, 64, 2, 60, 2, 60, 2, 58, 2, 56, 2, 56, 2, 55, 2, 54, 2, 52, 2, 51, 2, 51, 2, 50, 2, 48, 2, 48, 2, 48, 2, 45, 2, 43, 2, 43, 2, 42, 2, 40, 2, 38, 2, 38, 2, 38, 2, 35, 2, 33, 2, 33, 2, 31, 2, 31, 2, 28, 2, 28, 2, 28, 2, 26, 2, 24, 2, 23, 2, 23, 2, 21, 2, 19, 2, 18, 2, 18, 2, 15, 2, 14, 2, 13, 2, 13, 2, 11, 2, 9, 2, 8, 2, 8, 2, 6, 2, 4, 2, 3, 2, 3, 2, 0, 2, 254, 1, 254, 1, 253, 1, 251, 1, 249, 1, 249, 1, 248, 1, 246, 1, 244, 1, 244, 1, 243, 1, 241, 1, 239, 1, 239, 1, 238, 1, 236, 1, 234, 1, 234, 1, 232, 1, 230, 1, 229, 1, 229, 1, 227, 1, 225, 1, 224, 1, 224, 1, 224, 1, 221, 1, 220, 1, 220, 1, 218, 1, 216, 1, 215, 1, 215, 1, 213, 1, 211, 1, 210, 1, 210, 1, 207, 1, 207, 1, 206, 1, 206, 1, 204, 1, 202, 1, 201, 1, 201, 1, 199, 1, 198, 1, 197, 1, 196, 1, 195, 1, 194, 1, 193, 1, 192, 1, 192, 1, 192, 1, 192, 1, 188, 1, 188, 1, 186, 1, 185, 1, 185, 1, 184, 1, 183, 1, 182, 1, 181, 1, 180, 1, 179, 1, 178, 1, 178, 1, 177, 1, 176, 1, 176, 1, 176, 1, 174, 1, 173, 1, 172, 1, 172, 1, 171, 1, 170, 1, 169, 1, 169, 1, 168, 1, 167, 1, 167, 1, 167, 1, 166, 1, 165, 1, 164, 1, 164, 1, 163, 1, 163, 1, 162, 1, 162, 1, 162, 1, 161, 1, 159, 1, 159, 1, 159, 1, 159, 1, 159, 1, 159, 1, 158, 1, 158, 1, 158, 1, 158, 1, 157, 1, 157, 1, 157, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 155, 1, 155, 1, 155, 1, 155, 1, 155, 1, 155, 1, 155, 1, 155, 1, 155, 1, 155, 1, 155, 1, 155, 1, 155, 1, 154, 1, 155, 1, 155, 1, 155, 1, 155, 1, 155, 1, 155, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 157, 1, 157, 1, 157, 1, 158, 1, 158, 1, 158, 1, 158, 1, 159, 1, 159, 1, 159, 1, 159, 1, 161, 1, 161, 1, 162, 1, 162, 1, 162, 1, 163, 1, 163, 1, 164, 1, 164, 1, 165, 1, 166, 1, 166, 1, 167, 1, 167, 1, 167, 1, 168, 1, 169, 1, 169, 1, 171, 1, 171, 1, 172, 1, 172, 1, 1], [], [], [], [174, 1, 174, 1, 176, 1, 176, 1, 176, 1, 177, 1, 178, 1, 179, 1, 179, 1, 180, 1, 182, 1, 182, 1, 183, 1, 184, 1, 185, 1, 185, 1, 187, 1, 188, 1, 192, 1, 192, 1, 192, 1, 192, 1, 192, 1, 192, 1, 194, 1, 195, 1, 196, 1, 197, 1, 198, 1, 199, 1, 199, 1, 199, 1, 202, 1, 204, 1, 204, 1, 205, 1, 206, 1, 207, 1, 207, 1, 207, 1, 210, 1, 212, 1, 212, 1, 213, 1, 215, 1, 216, 1, 217, 1, 217, 1, 219, 1, 221, 1, 224, 1, 224, 1, 224, 1, 225, 1, 226, 1, 227, 1, 228, 1, 230, 1, 231, 1, 231, 1, 233, 1, 235, 1, 236, 1, 237, 1, 238, 1, 240, 1, 241, 1, 241, 1, 243, 1, 245, 1, 246, 1, 246, 1, 248, 1, 250, 1, 251, 1, 251, 1, 252, 1, 255, 1, 0, 2, 0, 2, 1, 2, 3, 2, 4, 2, 5, 2, 6, 2, 8, 2, 9, 2, 10, 2, 11, 2, 13, 2, 14, 2, 15, 2, 16, 2, 18, 2, 19, 2, 20, 2, 21, 2, 23, 2, 24, 2, 25, 2, 25, 2, 28, 2, 29, 2, 29, 2, 30, 2, 33, 2, 33, 2, 34, 2, 34, 2, 37, 2, 38, 2, 39, 2, 39, 2, 41, 2, 42, 2, 43, 2, 44, 2, 45, 2, 48, 2, 48, 2, 48, 2, 49, 2, 51, 2, 51, 2, 52, 2, 54, 2, 55, 2, 56, 2, 56, 2, 57, 2, 59, 2, 60, 2, 64, 2, 64, 2, 64, 2, 64, 2, 65, 2, 66, 2, 67, 2, 67, 2, 68, 2, 69, 2, 70, 2, 71, 2, 71, 2, 71, 2, 73, 2, 75, 2, 76, 2, 76, 2, 76, 2, 78, 2, 79, 2, 79, 2, 79, 2, 79, 2, 81, 2, 82, 2, 83, 2, 83, 2, 84, 2, 84, 2, 85, 2, 86, 2, 86, 2, 86, 2, 88, 2, 88, 2, 88, 2, 89, 2, 90, 2, 90, 2, 91, 2, 92, 2, 92, 2, 92, 2, 93, 2, 93, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 97, 2, 97, 2, 97, 2, 97, 2, 98, 2, 98, 2, 98, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 99, 2, 98, 2, 98, 2, 98, 2, 98, 2, 98, 2, 97, 2, 97, 2, 97, 2, 97, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 96, 2, 92, 2, 93, 2, 93, 2, 92, 2, 92, 2, 92, 2, 91, 2, 90, 2, 89, 2, 89, 2, 88, 2, 88, 2, 88, 2, 86, 2, 86, 2, 86, 2, 85, 2, 84, 2, 83, 2, 83, 2, 82, 2, 81, 2, 79, 2, 79, 2, 79, 2, 78, 2, 77, 2, 76, 2, 76, 2, 75, 2, 74, 2, 73, 2, 71, 2, 71, 2, 71, 2, 70, 2, 69, 2, 68, 2, 67, 2, 66, 2, 65, 2, 64, 2, 64, 2, 64, 2, 64, 2, 64, 2, 60, 2, 58, 2, 57, 2, 56, 2, 55, 2, 54, 2, 52, 2, 52, 2, 51, 2, 49, 2, 48, 2, 48, 2, 46, 2, 44, 2, 44, 2, 43, 2, 41, 2, 39, 2, 39, 2, 38, 2, 37, 2, 35, 2, 34, 2, 33, 2, 31, 2, 30, 2, 29, 2, 28, 2, 27, 2, 25, 2, 24, 2, 24, 2, 22, 2, 20, 2, 19, 2, 19, 2, 17, 2, 15, 2, 15, 2, 14, 2, 12, 2, 10, 2, 9, 2, 8, 2, 6, 2, 5, 2, 4, 2, 3, 2, 1, 2, 0, 2, 255, 1, 254, 1, 252, 1, 250, 1, 250, 1, 249, 1, 246, 1, 245, 1, 245, 1, 243, 1, 242, 1, 240, 1, 240, 1, 238, 1, 237, 1, 235, 1, 235, 1, 233, 1, 231, 1, 231, 1, 230, 1, 228, 1, 227, 1, 226, 1, 225, 1, 224, 1, 224, 1, 221, 1, 220, 1, 219, 1, 217, 1, 216, 1, 215, 1, 214, 1, 212, 1, 211, 1, 211, 1, 209, 1, 207, 1, 207, 1, 206, 1, 205, 1, 204, 1, 202, 1, 201, 1, 199, 1, 199, 1, 198, 1, 198, 1, 196, 1, 195, 1, 194, 1, 193, 1, 192, 1, 192, 1, 192, 1, 192, 1, 188, 1, 188, 1, 186, 1, 185, 1, 184, 1, 184, 1, 183, 1, 182, 1, 181, 1, 180, 1, 179, 1, 179, 1, 178, 1, 177, 1, 176, 1, 176, 1, 175, 1, 174, 1, 173, 1, 172, 1, 172, 1, 171, 1, 170, 1, 169, 1, 169, 1, 168, 1, 167, 1, 167, 1, 167, 1, 166, 1, 166, 1, 165, 1, 164, 1, 164, 1, 163, 1, 163, 1, 163, 1, 162, 1, 162, 1, 161, 1, 161, 1, 159, 1, 159, 1, 159, 1, 159, 1, 159, 1, 159, 1, 158, 1, 158, 1, 158, 1, 157, 1, 157, 1, 157, 1, 157, 1, 157, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 155, 1, 156, 1, 156, 1, 156, 1, 155, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 157, 1, 157, 1, 157, 1, 157, 1, 158, 1, 158, 1, 158, 1, 159, 1, 159, 1, 159, 1, 159, 1, 159, 1, 159, 1, 161, 1, 159, 1, 162, 1, 162, 1, 163, 1, 163, 1, 163, 1, 164, 1, 165, 1, 165, 1, 166, 1, 166, 1, 167, 1, 167, 1, 167, 1, 168, 1, 169, 1, 169, 1, 170, 1, 171, 1, 172, 1, 172, 1, 173, 1, 1], [], [], [], [165, 3, 162, 3, 156, 3, 152, 3, 150, 3, 147, 3, 142, 3, 137, 3, 134, 3, 131, 3, 127, 3, 120, 3, 118, 3, 114, 3, 110, 3, 103, 3, 100, 3, 96, 3, 91, 3, 86, 3, 82, 3, 78, 3, 75, 3, 67, 3, 64, 3, 57, 3, 56, 3, 48, 3, 43, 3, 38, 3, 33, 3, 26, 3, 22, 3, 17, 3, 14, 3, 6, 3, 0, 3, 252, 2, 249, 2, 241, 2, 236, 2, 231, 2, 227, 2, 219, 2, 214, 2, 207, 2, 206, 2, 196, 2, 192, 2, 187, 2, 184, 2, 176, 2, 168, 2, 164, 2, 161, 2, 151, 2, 145, 2, 140, 2, 137, 2, 127, 2, 121, 2, 116, 2, 112, 2, 106, 2, 96, 2, 92, 2, 88, 2, 78, 2, 71, 2, 67, 2, 64, 2, 54, 2, 48, 2, 44, 2, 39, 2, 31, 2, 23, 2, 20, 2, 15, 2, 7, 2, 254, 1, 252, 1, 247, 1, 239, 1, 230, 1, 229, 1, 224, 1, 216, 1, 207, 1, 206, 1, 199, 1, 192, 1, 184, 1, 182, 1, 176, 1, 168, 1, 158, 1, 158, 1, 151, 1, 144, 1, 137, 1, 132, 1, 127, 1, 121, 1, 114, 1, 107, 1, 103, 1, 98, 1, 86, 1, 83, 1, 79, 1, 74, 1, 67, 1, 64, 1, 58, 1, 53, 1, 46, 1, 39, 1, 36, 1, 31, 1, 24, 1, 18, 1, 15, 1, 10, 1, 4, 1, 253, 0, 250, 0, 246, 0, 240, 0, 234, 0, 231, 0, 227, 0, 220, 0, 215, 0, 211, 0, 207, 0, 201, 0, 196, 0, 192, 0, 188, 0, 182, 0, 176, 0, 174, 0, 170, 0, 165, 0, 158, 0, 157, 0, 153, 0, 148, 0, 144, 0, 140, 0, 137, 0, 133, 0, 130, 0, 125, 0, 122, 0, 118, 0, 116, 0, 112, 0, 109, 0, 104, 0, 101, 0, 98, 0, 96, 0, 93, 0, 86, 0, 87, 0, 84, 0, 82, 0, 79, 0, 76, 0, 74, 0, 71, 0, 68, 0, 66, 0, 64, 0, 64, 0, 60, 0, 57, 0, 56, 0, 53, 0, 52, 0, 50, 0, 48, 0, 46, 0, 45, 0, 44, 0, 42, 0, 40, 0, 39, 0, 38, 0, 37, 0, 36, 0, 34, 0, 33, 0, 33, 0, 31, 0, 31, 0, 31, 0, 30, 0, 30, 0, 29, 0, 29, 0, 29, 0, 29, 0, 28, 0, 29, 0, 28, 0, 29, 0, 29, 0, 30, 0, 30, 0, 31, 0, 31, 0, 31, 0, 33, 0, 34, 0, 35, 0, 36, 0, 37, 0, 38, 0, 39, 0, 41, 0, 41, 0, 43, 0, 44, 0, 48, 0, 48, 0, 50, 0, 51, 0, 54, 0, 56, 0, 58, 0, 57, 0, 64, 0, 65, 0, 67, 0, 66, 0, 71, 0, 75, 0, 78, 0, 79, 0, 83, 0, 86, 0, 88, 0, 92, 0, 96, 0, 98, 0, 101, 0, 103, 0, 108, 0, 112, 0, 115, 0, 115, 0, 122, 0, 126, 0, 130, 0, 130, 0, 138, 0, 142, 0, 146, 0, 148, 0, 154, 0, 158, 0, 162, 0, 166, 0, 172, 0, 176, 0, 180, 0, 184, 0, 192, 0, 195, 0, 199, 0, 201, 0, 209, 0, 214, 0, 217, 0, 221, 0, 229, 0, 234, 0, 238, 0, 241, 0, 249, 0, 254, 0, 2, 1, 6, 1, 15, 1, 20, 1, 24, 1, 28, 1, 38, 1, 43, 1, 43, 1, 51, 1, 64, 1, 67, 1, 71, 1, 74, 1, 84, 1, 90, 1, 96, 1, 99, 1, 109, 1, 114, 1, 116, 1, 124, 1, 133, 1, 139, 1, 142, 1, 148, 1, 158, 1, 163, 1, 167, 1, 173, 1, 184, 1, 188, 1, 192, 1, 198, 1, 207, 1, 213, 1, 216, 1, 224, 1, 233, 1, 238, 1, 242, 1, 249, 1, 3, 2, 8, 2, 12, 2, 19, 2, 29, 2, 34, 2, 38, 2, 46, 2, 56, 2, 57, 2, 64, 2, 71, 2, 79, 2, 88, 2, 90, 2, 97, 2, 106, 2, 111, 2, 115, 2, 122, 2, 131, 2, 134, 2, 140, 2, 147, 2, 156, 2, 159, 2, 164, 2, 172, 2, 179, 2, 184, 2, 188, 2, 195, 2, 202, 2, 206, 2, 212, 2, 219, 2, 226, 2, 229, 2, 235, 2, 242, 2, 249, 2, 253, 2, 1, 3, 8, 3, 14, 3, 19, 3, 23, 3, 30, 3, 36, 3, 39, 3, 45, 3, 51, 3, 57, 3, 64, 3, 65, 3, 71, 3, 76, 3, 79, 3, 85, 3, 90, 3, 92, 3, 99, 3, 103, 3, 109, 3, 113, 3, 117, 3, 121, 3, 126, 3, 132, 3, 134, 3, 138, 3, 141, 3, 147, 3, 150, 3, 154, 3, 158, 3, 162, 3, 165, 3, 168, 3, 173, 3, 176, 3, 179, 3, 182, 3, 186, 3, 188, 3, 192, 3, 195, 3, 199, 3, 199, 3, 204, 3, 207, 3, 210, 3, 211, 3, 215, 3, 217, 3, 220, 3, 221, 3, 224, 3, 226, 3, 228, 3, 230, 3, 231, 3, 234, 3, 236, 3, 237, 3, 239, 3, 240, 3, 242, 3, 243, 3, 245, 3, 246, 3, 246, 3, 248, 3, 249, 3, 250, 3, 251, 3, 252, 3, 252, 3, 253, 3, 254, 3, 254, 3, 255, 3, 255, 3, 255, 3, 254, 3, 255, 3, 255, 3, 255, 3, 254, 3, 254, 3, 254, 3, 254, 3, 254, 3, 252, 3, 252, 3, 251, 3, 252, 3, 249, 3, 248, 3, 247, 3, 248, 3, 244, 3, 243, 3, 242, 3, 244, 3, 240, 3, 237, 3, 236, 3, 237, 3, 231, 3, 230, 3, 229, 3, 224, 3, 224, 3, 221, 3, 220, 3, 219, 3, 214, 3, 211, 3, 210, 3, 207, 3, 204, 3, 201, 3, 198, 3, 198, 3, 193, 3, 192, 3, 187, 3, 185, 3, 180, 3, 177, 3, 174, 3, 172, 3, 167, 3, 1], [], [], [], [0, 2, 1, 2, 1, 2, 255, 1, 254, 1, 255, 1, 0, 2, 1, 2, 3, 2, 1, 2, 1, 2, 0, 2, 253, 1, 255, 1, 3, 2, 2, 2, 255, 1, 253, 1, 1, 2, 4, 2, 2, 2, 253, 1, 255, 1, 5, 2, 8, 2, 1, 2, 250, 1, 252, 1, 2, 2, 4, 2, 2, 2, 2, 2, 0, 2, 254, 1, 255, 1, 1, 2, 2, 2, 1, 2, 255, 1, 0, 2, 1, 2, 0, 2, 1, 2, 2, 2, 0, 2, 254, 1, 1, 2, 3, 2, 3, 2, 255, 1, 254, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 2, 2, 2, 1, 2, 255, 1, 0, 2, 3, 2, 3, 2, 1, 2, 255, 1, 0, 2, 3, 2, 3, 2, 3, 2, 3, 2, 254, 1, 253, 1, 1, 2, 4, 2, 4, 2, 1, 2, 255, 1, 0, 2, 2, 2, 1, 2, 1, 2, 1, 2, 2, 2, 1, 2, 0, 2, 254, 1, 0, 2, 3, 2, 3, 2, 2, 2, 2, 2, 0, 2, 1, 2, 2, 2, 3, 2, 0, 2, 255, 1, 2, 2, 3, 2, 1, 2, 1, 2, 1, 2, 3, 2, 3, 2, 2, 2, 1, 2, 1, 2, 0, 2, 0, 2, 1, 2, 1, 2, 0, 2, 1, 2, 2, 2, 4, 2, 4, 2, 0, 2, 255, 1, 2, 2, 4, 2, 2, 2, 0, 2, 0, 2, 2, 2, 2, 2, 2, 2, 5, 2, 4, 2, 255, 1, 0, 2, 0, 2, 2, 2, 4, 2, 1, 2, 255, 1, 1, 2, 2, 2, 3, 2, 3, 2, 255, 1, 254, 1, 0, 2, 3, 2, 4, 2, 1, 2, 255, 1, 1, 2, 4, 2, 4, 2, 255, 1, 254, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 255, 1, 254, 1, 1, 2, 5, 2, 6, 2, 2, 2, 252, 1, 253, 1, 2, 2, 4, 2, 2, 2, 0, 2, 255, 1, 255, 1, 255, 1, 2, 2, 5, 2, 4, 2, 255, 1, 252, 1, 0, 2, 6, 2, 5, 2, 0, 2, 254, 1, 0, 2, 2, 2, 2, 2, 0, 2, 255, 1, 0, 2, 3, 2, 4, 2, 2, 2, 0, 2, 2, 2, 3, 2, 2, 2, 1, 2, 2, 2, 1, 2, 1, 2, 0, 2, 1, 2, 3, 2, 1, 2, 253, 1, 255, 1, 3, 2, 4, 2, 2, 2, 255, 1, 254, 1, 0, 2, 2, 2, 2, 2, 1, 2, 2, 2, 1, 2, 254, 1, 255, 1, 2, 2, 2, 2, 0, 2, 255, 1, 1, 2, 2, 2, 2, 2, 0, 2, 254, 1, 255, 1, 1, 2, 254, 1, 254, 1, 0, 2, 3, 2, 2, 2, 255, 1, 255, 1, 2, 2, 1, 2, 0, 2, 0, 2, 1, 2, 1, 2, 254, 1, 254, 1, 2, 2, 1, 2, 255, 1, 0, 2, 0, 2, 255, 1, 0, 2, 3, 2, 4, 2, 3, 2, 255, 1, 251, 1, 253, 1, 2, 2, 3, 2, 255, 1, 253, 1, 254, 1, 0, 2, 1, 2, 2, 2, 1, 2, 255, 1, 254, 1, 253, 1, 255, 1, 0, 2, 254, 1, 253, 1, 255, 1, 2, 2, 4, 2, 1, 2, 251, 1, 250, 1, 0, 2, 3, 2, 254, 1, 252, 1, 254, 1, 0, 2, 255, 1, 255, 1, 0, 2, 253, 1, 249, 1, 251, 1, 0, 2, 4, 2, 2, 2, 252, 1, 253, 1, 0, 2, 1, 2, 0, 2, 255, 1, 253, 1, 253, 1, 255, 1, 1, 2, 1, 2, 1, 2, 255, 1, 252, 1, 254, 1, 1, 2, 1, 2, 255, 1, 253, 1, 254, 1, 1, 2, 2, 2, 0, 2, 253, 1, 255, 1, 0, 2, 251, 1, 250, 1, 255, 1, 1, 2, 255, 1, 253, 1, 254, 1, 0, 2, 0, 2, 253, 1, 253, 1, 0, 2, 1, 2, 252, 1, 253, 1, 0, 2, 1, 2, 255, 1, 255, 1, 0, 2, 254, 1, 253, 1, 255, 1, 1, 2, 1, 2, 0, 2, 253, 1, 253, 1, 255, 1, 254, 1, 254, 1, 252, 1, 252, 1, 254, 1, 0, 2, 1, 2, 2, 2, 1, 2, 252, 1, 248, 1, 251, 1, 1, 2, 2, 2, 254, 1, 253, 1, 255, 1, 1, 2, 1, 2, 0, 2, 253, 1, 254, 1, 254, 1, 252, 1, 254, 1, 1, 2, 255, 1, 251, 1, 252, 1, 1, 2, 3, 2, 254, 1, 251, 1, 254, 1, 3, 2, 2, 2, 250, 1, 248, 1, 253, 1, 0, 2, 255, 1, 0, 2, 0, 2, 255, 1, 253, 1, 255, 1, 1, 2, 1, 2, 253, 1, 249, 1, 252, 1, 2, 2, 3, 2, 254, 1, 251, 1, 252, 1, 255, 1, 2, 2, 3, 2, 0, 2, 253, 1, 251, 1, 252, 1, 0, 2, 2, 2, 255, 1, 252, 1, 255, 1, 1, 2, 0, 2, 255, 1, 254, 1, 255, 1, 1, 2, 0, 2, 254, 1, 255, 1, 255, 1, 255, 1, 255, 1, 255, 1, 0, 2, 1, 2, 255, 1, 254, 1, 0, 2, 2, 2, 1, 2, 252, 1, 251, 1, 255, 1, 3, 2, 2, 2, 0, 2, 253, 1, 253, 1, 254, 1, 0, 2, 2, 2, 3, 2, 255, 1, 250, 1, 252, 1, 2, 2, 4, 2, 1, 2, 253, 1, 253, 1, 0, 2, 1, 2, 0, 2, 254, 1, 0, 2, 1, 2, 0, 2, 0, 2, 1, 2, 255, 1, 254, 1, 255, 1, 254, 1, 255, 1, 1, 2, 1, 2, 0, 2, 1, 2, 1, 2, 255, 1, 254, 1, 255, 1, 1, 2, 2, 2, 2, 2, 3, 2, 255, 1, 252, 1, 253, 1, 0, 2, 3, 2, 2, 2, 252, 1, 253, 1, 2, 2, 5, 2, 2, 2, 253, 1, 252, 1, 1, 2, 3, 2, 2, 2, 1]]]

tests/test_oscilloscope.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@ def test_capture_two(scope):
7878
verify_periods(x, y2, scope._channels["CH2"])
7979

8080

81+
def test_capture_three(scope):
82+
x, y1, y2, y3 = scope.capture(channels=3, samples=500, timegap=2)
83+
verify_periods(x, y1, scope._channels["CH1"])
84+
verify_periods(x, y2, scope._channels["CH2"])
85+
verify_periods(x, y3, scope._channels["CH3"])
86+
87+
8188
def test_capture_four(scope):
8289
x, y1, y2, y3, _ = scope.capture(channels=4, samples=500, timegap=2)
8390
verify_periods(x, y1, scope._channels["CH1"])

0 commit comments

Comments
 (0)