Commit 1fc17707 authored by legoc's avatar legoc

Added GGDMS and GGFMCPICKUP boards

parent 1734eeab
Version 1.3.2, 2019-05-28
-------------------------
- Added GGDMS and GGFMCPICKUP boards.
Version 1.3.1, 2019-05-06
-------------------------
- Cameo C++11.
......
......@@ -2,8 +2,8 @@
# This configure.ac script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
AC_INIT([lstdataprocess128], [1.3.1])
LIBRARY_VERSION=1:3:1
AC_INIT([lstdataprocess128], [1.3.2])
LIBRARY_VERSION=1:3:2
AM_INIT_AUTOMAKE([subdir-objects])
......
......@@ -62,6 +62,8 @@ enum BoardType {
GGPICKUP = 20,
MCC = 21,
CAMERA = 22,
GGDMS = 23,
GGFMCPICKUP = 24
};
/**
......@@ -83,7 +85,9 @@ static const char* BoardTypeName[] = {
"GGPICKUP", // 20
"MCC", // 21
"CAMERA" // 22
"CAMERA", // 22
"GGDMS", // 23
"GGFMCPICKUP" // 24
};
/**
......@@ -106,7 +110,9 @@ static int BoardRelativeTime[] = {
0, // 20
0, // 21
0 // 22
0, // 22
0, // 23
0 // 24
};
/**
......@@ -128,7 +134,9 @@ static uint32_t BoardTimeResolution[] = {
10, // 20
10, // 21
0 // 22
0, // 22
10, // 23
10 // 24
};
/**
......
......@@ -344,7 +344,9 @@ float eventZeroCrossing(Event const & event) {
// Special unspecified data
bool boardHasUnspecifiedData(BoardType type) {
if (type == GGPICKUP) {
if (type == GGPICKUP
|| type == GGDMS
|| type == GGFMCPICKUP) {
return true;
}
if (type == C1751_PSD
......@@ -364,7 +366,9 @@ bool eventHasUnspecifiedData(Event const & event) {
}
uint16_t boardUnspecifiedDataResolution(BoardType type) {
if (type == GGPICKUP) {
if (type == GGPICKUP
|| type == GGDMS
|| type == GGFMCPICKUP) {
return 32;
}
if (type == C1751_PSD
......
......@@ -27,7 +27,7 @@ using namespace lstdpp128;
int main(int argc, char * argv[]) {
int N = 12;
int N = 14;
BoardType boardTypes[] = {
CFD,
......@@ -41,7 +41,9 @@ int main(int argc, char * argv[]) {
C1725_PSD,
GGPICKUP,
MCC,
CAMERA
CAMERA,
GGDMS,
GGFMCPICKUP
};
cout << setw(20) << "name"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment