Skip to content

Commit 9c21e1b

Browse files
author
Luca Toniolo
committed
the scope gets double the samples, and starts with full Pos not half
1 parent 781023e commit 9c21e1b

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/hal/utils/scope_rt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ MODULE_AUTHOR("John Kasunich");
4444
MODULE_DESCRIPTION("Oscilloscope for EMC HAL");
4545
MODULE_LICENSE("GPL");
4646

47-
long num_samples = 16000;
47+
long num_samples = 32000;
4848
long shm_size;
4949
RTAPI_MP_LONG(num_samples, "Number of samples in the shared memory block");
5050

src/hal/utils/scope_shm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
************************************************************************/
4343

4444
#define SCOPE_SHM_KEY 0x130CF406
45-
#define SCOPE_NUM_SAMPLES_DEFAULT 16000
45+
#define SCOPE_NUM_SAMPLES_DEFAULT 32000
4646

4747
typedef enum {
4848
IDLE = 0, /* waiting for run command */

src/hal/utils/scope_trig.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ static void init_trigger_info_window(void)
256256
vbox = gtk_vbox_new_in_box(FALSE, 0, 0, hbox, TRUE, TRUE, 0);
257257
gtk_label_new_in_box(_("Pos"), vbox, FALSE, FALSE, 0);
258258
trig->pos_adj =
259-
gtk_adjustment_new(TRIG_POS_RESOLUTION / 2, 0, TRIG_POS_RESOLUTION, 1,
259+
gtk_adjustment_new(TRIG_POS_RESOLUTION, 0, TRIG_POS_RESOLUTION, 1,
260260
1, 0);
261261
trig->pos_slider = gtk_scale_new(
262262
GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT(trig->pos_adj));

0 commit comments

Comments
 (0)