Skip to content

Commit 4b1fe80

Browse files
committed
Merge branch 'master' into devel
2 parents e79d3bd + 342c706 commit 4b1fe80

6 files changed

+6
-6
lines changed

iCubErzelli02/camera/dragonfly2_config_left.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
device grabber
1+
device grabberDual
22
subdevice dragonfly2
33
width 320
44
height 240

iCubErzelli02/camera/dragonfly2_config_left_bayer_320_240.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
device grabber
1+
device grabberDual
22
subdevice dragonfly2raw
33
width 320
44
height 240

iCubErzelli02/camera/dragonfly2_config_left_bayer_640_480.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
device grabber
1+
device grabberDual
22
subdevice dragonfly2
33
width 640
44
height 480

iCubErzelli02/camera/dragonfly2_config_right.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
device grabber
1+
device grabberDual
22
subdevice dragonfly2
33
width 320
44
height 240

iCubErzelli02/camera/dragonfly2_config_right_bayer_320_240.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
device grabber
1+
device grabberDual
22
subdevice dragonfly2raw
33
width 320
44
height 240

iCubErzelli02/camera/dragonfly2_config_right_bayer_640_480.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
device grabber
1+
device grabberDual
22
subdevice dragonfly2raw
33
width 640
44
height 480

0 commit comments

Comments
 (0)