mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-28 09:10:01 +02:00
jungfrau server, changed api, fixed regdefs
This commit is contained in:
parent
5ff2e86060
commit
bdcccb7732
@ -345,7 +345,7 @@
|
|||||||
#define SET_TRIGGER_DELAY_MSB_REG (0x71 << MEM_MAP_SHIFT)
|
#define SET_TRIGGER_DELAY_MSB_REG (0x71 << MEM_MAP_SHIFT)
|
||||||
|
|
||||||
/* Module Coordinates Register 0 */
|
/* Module Coordinates Register 0 */
|
||||||
#define COORD_0 (0x7C << MEM_MAP_SHIFT)
|
#define COORD_0_REG (0x7C << MEM_MAP_SHIFT)
|
||||||
|
|
||||||
#define COORD_0_Y_OFST (0)
|
#define COORD_0_Y_OFST (0)
|
||||||
#define COORD_0_Y_MSK (0x0000FFFF << COORD_0_Y_OFST)
|
#define COORD_0_Y_MSK (0x0000FFFF << COORD_0_Y_OFST)
|
||||||
@ -353,13 +353,13 @@
|
|||||||
#define COORD_0_X_MSK (0x0000FFFF << COORD_0_X_OFST)
|
#define COORD_0_X_MSK (0x0000FFFF << COORD_0_X_OFST)
|
||||||
|
|
||||||
/* Module Coordinates Register 1 */
|
/* Module Coordinates Register 1 */
|
||||||
#define COORD_1 (0x7D << MEM_MAP_SHIFT)
|
#define COORD_1_REG (0x7D << MEM_MAP_SHIFT)
|
||||||
|
|
||||||
#define COORD_0_Z_OFST (0)
|
#define COORD_0_Z_OFST (0)
|
||||||
#define COORD_0_Z_MSK (0x0000FFFF << COORD_0_Z_OFST)
|
#define COORD_0_Z_MSK (0x0000FFFF << COORD_0_Z_OFST)
|
||||||
|
|
||||||
/* ASIC Control Register */
|
/* ASIC Control Register */
|
||||||
#define ASIC_CTRL_REG (0x7F)
|
#define ASIC_CTRL_REG (0x7F << MEM_MAP_SHIFT)
|
||||||
|
|
||||||
#define ASIC_CTRL_PRCHRG_TMR_OFST (0)
|
#define ASIC_CTRL_PRCHRG_TMR_OFST (0)
|
||||||
#define ASIC_CTRL_PRCHRG_TMR_MSK (0x000000FF << ASIC_CTRL_PRCHRG_TMR_OFST)
|
#define ASIC_CTRL_PRCHRG_TMR_MSK (0x000000FF << ASIC_CTRL_PRCHRG_TMR_OFST)
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
|
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
|
||||||
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
|
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
|
||||||
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
|
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
|
||||||
Repsitory UUID: da010a03d725b6f18020d2142d58771534414274
|
Repsitory UUID: 5ff2e8606011ef6e37b5cfe6254acf80eaa50e5b
|
||||||
Revision: 135
|
Revision: 137
|
||||||
Branch: developer
|
Branch: jungfraunew
|
||||||
Last Changed Author: Erik_Frojdh
|
Last Changed Author: Dhanya_Thattil
|
||||||
Last Changed Rev: 3751
|
Last Changed Rev: 3771
|
||||||
Last Changed Date: 2018-04-03 16:29:40.000000002 +0200 ./RegisterDefs.h
|
Last Changed Date: 2018-04-13 11:25:18.000000002 +0200 ./RegisterDefs.h
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
|
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
|
||||||
#define GITREPUUID "da010a03d725b6f18020d2142d58771534414274"
|
#define GITREPUUID "5ff2e8606011ef6e37b5cfe6254acf80eaa50e5b"
|
||||||
#define GITAUTH "Erik_Frojdh"
|
#define GITAUTH "Dhanya_Thattil"
|
||||||
#define GITREV 0x3751
|
#define GITREV 0x3771
|
||||||
#define GITDATE 0x20180403
|
#define GITDATE 0x20180413
|
||||||
#define GITBRANCH "developer"
|
#define GITBRANCH "jungfraunew"
|
||||||
|
@ -502,8 +502,10 @@ int getPhase() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void configureASICTimer() {
|
void configureASICTimer() {
|
||||||
bus_w(ASIC_CTRL_REG, (bus_r(ASIC_CTRL_REG) & ~ASIC_CTRL_PRCHRG_TMR_MSK) | ASIC_CTRL_PRCHRG_TMR_VAL);
|
cprintf(RED," in here\n");
|
||||||
bus_w(ASIC_CTRL_REG, (bus_r(ASIC_CTRL_REG) & ~ASIC_CTRL_DS_TMR_MSK) | ASIC_CTRL_DS_TMR_VAL);
|
//cprintf(RED,"asic reg:0x%x\n", bus_r(ASIC_CTRL_REG));
|
||||||
|
//bus_w(ASIC_CTRL_REG, (bus_r(ASIC_CTRL_REG) & ~ASIC_CTRL_PRCHRG_TMR_MSK) | ASIC_CTRL_PRCHRG_TMR_VAL);
|
||||||
|
//bus_w(ASIC_CTRL_REG, (bus_r(ASIC_CTRL_REG) & ~ASIC_CTRL_DS_TMR_MSK) | ASIC_CTRL_DS_TMR_VAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -1191,16 +1193,16 @@ int configureMAC(uint32_t destip, uint64_t destmac, uint64_t sourcemac, uint32_t
|
|||||||
int setDetectorPosition(int pos[]) {
|
int setDetectorPosition(int pos[]) {
|
||||||
int ret = OK;
|
int ret = OK;
|
||||||
|
|
||||||
bus_w(COORD_0, bus_r(COORD_0) | ((pos[0] << COORD_0_X_OFST) & COORD_0_X_MSK));
|
bus_w(COORD_0_REG, bus_r(COORD_0_REG) | ((pos[0] << COORD_0_X_OFST) & COORD_0_X_MSK));
|
||||||
if ((bus_r(COORD_0) & COORD_0_X_MSK) != ((pos[0] << COORD_0_X_OFST) & COORD_0_X_MSK))
|
if ((bus_r(COORD_0_REG) & COORD_0_X_MSK) != ((pos[0] << COORD_0_X_OFST) & COORD_0_X_MSK))
|
||||||
ret = FAIL;
|
ret = FAIL;
|
||||||
|
|
||||||
bus_w(COORD_0, bus_r(COORD_0) | ((pos[1] << COORD_0_Y_OFST) & COORD_0_Y_MSK));
|
bus_w(COORD_0_REG, bus_r(COORD_0_REG) | ((pos[1] << COORD_0_Y_OFST) & COORD_0_Y_MSK));
|
||||||
if ((bus_r(COORD_0) & COORD_0_Y_MSK) != ((pos[1] << COORD_0_Y_OFST) & COORD_0_Y_MSK))
|
if ((bus_r(COORD_0_REG) & COORD_0_Y_MSK) != ((pos[1] << COORD_0_Y_OFST) & COORD_0_Y_MSK))
|
||||||
ret = FAIL;
|
ret = FAIL;
|
||||||
|
|
||||||
bus_w(COORD_1, bus_r(COORD_1) | ((pos[2] << COORD_0_Z_OFST) & COORD_0_Z_MSK));
|
bus_w(COORD_1_REG, bus_r(COORD_1_REG) | ((pos[2] << COORD_0_Z_OFST) & COORD_0_Z_MSK));
|
||||||
if ((bus_r(COORD_1) & COORD_0_Z_MSK) != ((pos[2] << COORD_0_Z_OFST) & COORD_0_Z_MSK))
|
if ((bus_r(COORD_1_REG) & COORD_0_Z_MSK) != ((pos[2] << COORD_0_Z_OFST) & COORD_0_Z_MSK))
|
||||||
ret = FAIL;
|
ret = FAIL;
|
||||||
|
|
||||||
if (ret == OK)
|
if (ret == OK)
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
#define GOODBYE (-200)
|
#define GOODBYE (-200)
|
||||||
#define MIN_REQRD_VRSN_T_RD_API 0x171220
|
#define MIN_REQRD_VRSN_T_RD_API 0x171220
|
||||||
#define REQRD_FRMWR_VRSN 0x180222
|
#define REQRD_FRMWR_VRSN 0x180226
|
||||||
|
|
||||||
|
|
||||||
/* Struct Definitions */
|
/* Struct Definitions */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user