Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
DetectorSoftware
libagipdrecv
Commits
73ee6963
Commit
73ee6963
authored
Sep 06, 2018
by
Yuelong Yu
Browse files
fixed compilation bug
parent
17d745d6
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/FileSavingTask.cpp
View file @
73ee6963
...
...
@@ -185,7 +185,19 @@ namespace FSDataRecvNS
m_file_name
=
m_file_name
+
"_"
+
chNum
;
}
if
(
!
(
nx_writer
->
FileConfig
(
m_file_name
,
m_y
,
m_x
)))
if
(
!
(
nx_writer
->
FileConfig
(
m_file_name
,
true
,
1
,
m_y
,
m_x
,
16
,
1
,
false
,
false
,
false
,
2
,
false
,
0
)))
return
false
;
if
(
!
(
nx_writer
->
CreateFile
()))
...
...
src/ReceiverTask.cpp
View file @
73ee6963
...
...
@@ -117,14 +117,17 @@ namespace FSDataRecvNS
{
LOG_TRACE
(
__FUNCTION__
);
memcpy
(
&
m_img_data
[
m_packets_collected
]
*
4096
,
packet_data
.
data
,
4096
*
sizeof
(
uint16_t
));
memcpy
(
&
m_img_data
[
m_packets_collected
*
4096
],
packet_data
.
data
,
4096
*
sizeof
(
uint16_t
));
++
m_packets_collected
;
if
(
m_packets_collected
==
16
)
// one image is finished
{
++
m_received_imgs
;
m_current_frame_number
=
m_received_imgs
;
m_mempool16bit
->
WriteOneImage
(
m_img_data
,
m_received_imgs
,
0
);
int16
*
data
=
reinterpret_cast
<
int16
*>
(
&
m_img_data
[
0
]);
m_mempool16bit
->
SetImage
(
data
,
m_received_imgs
,
0
);
}
}
...
...
src/ReceiverTask.h
View file @
73ee6963
...
...
@@ -43,7 +43,7 @@ namespace FSDataRecvNS
// uint16_t roundRobin;
// uint8_t detectortype;
// uint8_t headerVersion;
uint16_t
data
[
BUFFER
_LENGTH
];
uint16_t
data
[
CHAR_
BUFFER
];
};
#pragma pack(pop)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment