Skip to content

Commit

Permalink
removed some printf statements and added tooltips to temperature moni…
Browse files Browse the repository at this point in the history 
…tors
  • Loading branch information
@ehsteve
ehsteve committed Feb 15, 2012
1 parent cfa62af commit 47c5663
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
24 changes: 12 additions & 12 deletions data.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -838,10 +838,10 @@ void data_update_display(unsigned short int *frame)
//printf("f628: %x\n", buffer[index++]);
if (buffer[index++] == 0xf628) {
read_status = 1;
printf("-----Frame Start------\n");
printf("frame number = %u\n", frame_num);
printf("eb90: %x\n", buffer[index+254]);
for(int blah = 0; blah < 16; blah++){printf("%i-%04hX: %i\n", blah, buffer[index+blah-1], buffer[index+blah-1]);}
//printf("-----Frame Start------\n");
//printf("frame number = %u\n", frame_num);
//printf("eb90: %x\n", buffer[index+254]);
//for(int blah = 0; blah < 16; blah++){printf("%i-%04hX: %i\n", blah, buffer[index+blah-1], buffer[index+blah-1]);}

// check the checksum
for( int word_number = 0; word_number < 256; word_number++ ){read_status ^= buffer[word_number];}
Expand All @@ -859,16 +859,16 @@ void data_update_display(unsigned short int *frame)
index++;
frameNumber = ((uint32_t)(buffer[index] << 16) & 0xFFFF0000) | buffer[index+1];
frame_value = buffer[index] & 0x3;
cout << "frame number 2 = " << buffer[index] << endl;
printf("frame number 2: %04hX\n", buffer[index]);
//cout << "frame number 2 = " << buffer[index] << endl;
//printf("frame number 2: %04hX\n", buffer[index]);

index++;
//cout << "frameNumber = " << frameNumber << endl;
cout << "frame value = " << frame_value << endl;
//cout << "frame value = " << frame_value << endl;
//cout << "index = " << index << endl;
// Housekeeping 0

printf("%i, housekeeping 0: %x\n", index, buffer[index]);
//printf("%i, housekeeping 0: %x\n", index, buffer[index]);
switch (frame_value) {
case 0:
// temperature reference
Expand All @@ -894,7 +894,7 @@ void data_update_display(unsigned short int *frame)
printf("command 2: %x\n", buffer[index++]);

// Housekeeping 1
printf("%i, housekeeping 1: %x\n", index, buffer[index]);
//printf("%i, housekeeping 1: %x\n", index, buffer[index]);
switch (frame_value) {
case 0:
// 5 V monitor
Expand Down Expand Up @@ -924,7 +924,7 @@ void data_update_display(unsigned short int *frame)
high_voltage = ((buffer[index] >> 4) & 0xFFF)/8.0;
index++;
// Housekeeping 2
printf("%i, housekeeping 2: %x\n", index, buffer[index]);
//printf("%i, housekeeping 2: %x\n", index, buffer[index]);
switch (frame_value) {
case 0:
// -5 V monitor
Expand All @@ -949,7 +949,7 @@ void data_update_display(unsigned short int *frame)
printf("Status 2: %u\n", buffer[index++]);

// Housekeeping 3
printf("%i, housekeeping 3: %x\n", index, buffer[index]);
//printf("%i, housekeeping 3: %x\n", index, buffer[index]);
switch (frame_value) {
case 0:
// 3.3 V monitor
Expand Down Expand Up @@ -982,7 +982,7 @@ void data_update_display(unsigned short int *frame)
// ystrips are defined as n strips
unsigned short int ystrips[128] = {0};
index++;
printf("Detector %u time, index %i: %u\n", detector_num, buffer[index], index);
//printf("Detector %u time, index %i: %u\n", detector_num, buffer[index], index);

for(int asic_number = 0; asic_number < 4; asic_number++)
{
Expand Down
22 changes: 11 additions & 11 deletions gui.fl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ exit(1);}
}
}
Fl_Group {} {
label Image open selected
label Image open
xywh {15 282 555 404} box THIN_UP_FRAME
} {
Fl_Box mainImageWindow {
Expand Down Expand Up @@ -140,31 +140,31 @@ exit(1);}
}
Fl_Value_Output tempOutput2 {
label T2
xywh {345 225 40 24} step 0.1
tooltip {ACTEL on formatter board} xywh {345 225 40 24} step 0.1
}
Fl_Value_Output HVOutput {
label HV
xywh {555 140 40 24} step 1
}
Fl_Value_Output tempOutput1 {
label T1
xywh {345 197 40 24} step 0.1
tooltip {power board} xywh {345 197 40 24} step 0.1
}
Fl_Value_Output tempOutput0 {
label T0
xywh {345 169 40 24} step 0.1
}
Fl_Value_Output tempOutput3 {
label T3
xywh {345 251 40 24} step 0.1
tooltip {Clock on formatter board} xywh {345 251 40 24} step 0.1
}
Fl_Value_Output tempOutput {
label {Temp Ref}
xywh {387 139 40 24} step 0.1
}
Fl_Value_Output tempOutput10 {
label T10
xywh {484 229 40 24} step 0.1
label T10 selected
tooltip {Detector Housing} xywh {484 229 40 24} step 0.1
}
Fl_Value_Output tempOutput9 {
label T9
Expand All @@ -180,16 +180,16 @@ exit(1);}
}
Fl_Value_Output tempOutput5 {
label T5
xywh {411 199 40 24} step 0.1
}
Fl_Value_Output tempOutput4 {
label T4
xywh {411 169 40 24} step 0.1
tooltip {ACTEL board} xywh {411 199 40 24} step 0.1
}
Fl_Value_Output tempOutput7 {
label T7
xywh {413 252 40 24} step 0.1
}
Fl_Value_Output tempOutput4 {
label T4
tooltip {ACTEL on ACTEL board} xywh {411 169 40 24} step 0.1
}
Fl_Value_Output tempOutput11 {
label T11
xywh {484 254 40 24} step 0.1
Expand Down

0 comments on commit 47c5663

Please sign in to comment.