1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
diff -ruN ccd/src/devices/cam_gphoto.cpp ccd.new/src/devices/cam_gphoto.cpp
--- ccd/src/devices/cam_gphoto.cpp 2015-01-29 00:01:59.743670552 +0100
+++ ccd.new/src/devices/cam_gphoto.cpp 2015-01-29 00:03:52.200487268 +0100
@@ -678,7 +678,7 @@
else
if( pid == 0 )
{
- execl( "./shutter", "shutter", cmd == open_shutter ? "1" : "0", m_high_params.use_mirror_lock ? "1" : "0", NULL );
+ execl( "/usr/libexec/ccd/shutter", "shutter", cmd == open_shutter ? "1" : "0", m_high_params.use_mirror_lock ? "1" : "0", NULL );
_exit( 127 );
}
else
diff -ruN ccd/src/devices/cam_qhy6.cpp ccd.new/src/devices/cam_qhy6.cpp
--- ccd/src/devices/cam_qhy6.cpp 2013-07-31 14:24:53.000000000 +0200
+++ ccd.new/src/devices/cam_qhy6.cpp 2015-01-29 00:03:26.818528628 +0100
@@ -321,7 +321,7 @@
//hardware BREAK
for( int i = 0;i < ccamera_base::try_reset_cnt;i++ )
{
- int res = system( "utils/qhy6reset.sh" );
+ int res = system( "/usr/libexec/ccd/qhy6reset.sh" );
if( res < 0 )
{
log_e( "Failed to reset camera by script... '%s'", strerror(errno) );
diff -ruN ccd/src/devices/cam_qhy8.cpp ccd.new/src/devices/cam_qhy8.cpp
--- ccd/src/devices/cam_qhy8.cpp 2013-07-31 14:40:11.000000000 +0200
+++ ccd.new/src/devices/cam_qhy8.cpp 2015-01-29 00:03:13.501550331 +0100
@@ -380,7 +380,7 @@
//hardware BREAK
for( int i = 0;i < ccamera_base::try_reset_cnt;i++ )
{
- int res = system( "utils/qhy8reset.sh" );
+ int res = system( "/usr/libexec/ccd/qhy8reset.sh" );
if( res < 0 )
{
log_e( "Failed to reset camera by script... '%s'", strerror(errno) );
diff -ruN ccd/src/devices/cam_qhy8l.cpp ccd.new/src/devices/cam_qhy8l.cpp
--- ccd/src/devices/cam_qhy8l.cpp 2013-08-01 18:54:12.000000000 +0200
+++ ccd.new/src/devices/cam_qhy8l.cpp 2015-01-29 00:03:16.166545988 +0100
@@ -424,7 +424,7 @@
//hardware BREAK
for( int i = 0;i < ccamera_base::try_reset_cnt;i++ )
{
- int res = system( "utils/qhy8lreset.sh" );
+ int res = system( "/usr/libexec/ccd/qhy8lreset.sh" );
if( res < 0 )
{
log_e( "Failed to reset camera by script... '%s'", strerror(errno) );
diff -ruN ccd/src/devices/cam_qhy9.cpp ccd.new/src/devices/cam_qhy9.cpp
--- ccd/src/devices/cam_qhy9.cpp 2013-07-31 10:28:44.000000000 +0200
+++ ccd.new/src/devices/cam_qhy9.cpp 2015-01-29 00:03:17.622543615 +0100
@@ -424,7 +424,7 @@
//hardware BREAK
for( int i = 0;i < ccamera_base::try_reset_cnt;i++ )
{
- int res = system( "utils/qhy9reset.sh" );
+ int res = system( "/usr/libexec/ccd/qhy9reset.sh" );
if( res < 0 )
{
log_e( "Failed to reset camera by script... '%s'", strerror(errno) );
diff -ruN ccd/utils/qhy6reset.sh ccd.new/utils/qhy6reset.sh
--- ccd/utils/qhy6reset.sh 2012-03-07 19:17:55.000000000 +0100
+++ ccd.new/utils/qhy6reset.sh 2015-01-28 23:11:38.000000000 +0100
@@ -8,7 +8,7 @@
# exit 0
#fi
-fw="/lib/firmware/ccd/qhy6.hex"
+fw="/lib/firmware/QHY6.HEX"
bdir="/dev/bus/usb"
diff -ruN ccd/utils/qhy8lreset.sh ccd.new/utils/qhy8lreset.sh
--- ccd/utils/qhy8lreset.sh 2012-01-25 20:17:20.000000000 +0100
+++ ccd.new/utils/qhy8lreset.sh 2015-01-28 23:11:54.000000000 +0100
@@ -8,7 +8,7 @@
# exit 0
#fi
-fw="/lib/firmware/ccd/qhy8l.hex"
+fw="/lib/firmware/CCD/QHY8L.HEX"
bdir="/dev/bus/usb"
diff -ruN ccd/utils/qhy8reset.sh ccd.new/utils/qhy8reset.sh
--- ccd/utils/qhy8reset.sh 2013-07-30 21:54:56.000000000 +0200
+++ ccd.new/utils/qhy8reset.sh 2015-01-28 23:12:04.000000000 +0100
@@ -8,7 +8,7 @@
# exit 0
#fi
-fw="/lib/firmware/ccd/qhy8.hex"
+fw="/lib/firmware/QHY8.HEX"
bdir="/dev/bus/usb"
diff -ruN ccd/utils/qhy9reset.sh ccd.new/utils/qhy9reset.sh
--- ccd/utils/qhy9reset.sh 2015-01-28 23:17:15.801043730 +0100
+++ ccd.new/utils/qhy9reset.sh 2015-01-28 23:47:27.385068594 +0100
@@ -8,7 +8,7 @@
# exit 0
#fi
-fw="/lib/firmware/ccd/qhy9.hex"
+fw="/lib/firmware/QHY9.HEX"
bdir="/dev/bus/usb"
|