@@ -26,8 +26,12 | |||
|
26 | 26 | #define STATUS_8 8 |
|
27 | 27 | #define STATUS_9 9 |
|
28 | 28 | |
|
29 | #define CAL_F0 625 | |
|
30 | #define CAL_F1 10000 | |
|
29 | #define CAL_F0 625. | |
|
30 | #define CAL_F1 10000. | |
|
31 | #define CAL_W0 (2. * pi * CAL_F0) | |
|
32 | #define CAL_W1 (2. * pi * CAL_F1) | |
|
33 | #define CAL_A0 1. | |
|
34 | #define CAL_A1 2. | |
|
31 | 35 | #define CAL_FS 160256.410 |
|
32 | 36 | #define CAL_SCALE_FACTOR (0.250 / 0.000654) // 191, 500 mVpp, 2 sinus waves => 500 mVpp each, amplitude = 250 mV |
|
33 | 37 | #define CAL_NB_PTS 256 |
@@ -64,7 +64,7 option(FSW_debug_tch "?" OFF) | |||
|
64 | 64 | set(SW_VERSION_N1 "3" CACHE STRING "Choose N1 FSW Version." FORCE) |
|
65 | 65 | set(SW_VERSION_N2 "1" CACHE STRING "Choose N2 FSW Version." FORCE) |
|
66 | 66 | set(SW_VERSION_N3 "0" CACHE STRING "Choose N3 FSW Version." FORCE) |
|
67 |
set(SW_VERSION_N4 " |
|
|
67 | set(SW_VERSION_N4 "6" CACHE STRING "Choose N4 FSW Version." FORCE) | |
|
68 | 68 | |
|
69 | 69 | if(FSW_verbose) |
|
70 | 70 | add_definitions(-DPRINT_MESSAGES_ON_CONSOLE) |
@@ -174,7 +174,6 int action_enter_mode(ccsdsTelecommandPa | |||
|
174 | 174 | |
|
175 | 175 | rtems_status_code status; |
|
176 | 176 | unsigned char requestedMode; |
|
177 | unsigned int *transitionCoarseTime_ptr; | |
|
178 | 177 | unsigned int transitionCoarseTime; |
|
179 | 178 | unsigned char * bytePosPtr; |
|
180 | 179 | |
@@ -183,7 +182,7 int action_enter_mode(ccsdsTelecommandPa | |||
|
183 | 182 | printf("(1)\n"); |
|
184 | 183 | requestedMode = bytePosPtr[ BYTE_POS_CP_MODE_LFR_SET ]; |
|
185 | 184 | printf("(2)\n"); |
|
186 | copyInt32ByChar( &transitionCoarseTime, &bytePosPtr[ BYTE_POS_CP_LFR_ENTER_MODE_TIME ] ); | |
|
185 | copyInt32ByChar( (char*) &transitionCoarseTime, &bytePosPtr[ BYTE_POS_CP_LFR_ENTER_MODE_TIME ] ); | |
|
187 | 186 | printf("(3)\n"); |
|
188 | 187 | transitionCoarseTime = transitionCoarseTime & COARSE_TIME_MASK; |
|
189 | 188 | printf("(4)\n"); |
@@ -1393,8 +1392,8 void setCalibrationData( void ) | |||
|
1393 | 1392 | // build the signal for the SCM calibration |
|
1394 | 1393 | for (k = 0; k < CAL_NB_PTS; k++) |
|
1395 | 1394 | { |
|
1396 |
val = sin( |
|
|
1397 |
+ sin( |
|
|
1395 | val = CAL_A0 * sin( CAL_W0 * k * Ts ) | |
|
1396 | + CAL_A1 * sin( CAL_W1 * k * Ts ); | |
|
1398 | 1397 | data = (unsigned short) ((val * CAL_SCALE_FACTOR) + CONST_2048); |
|
1399 | 1398 | time_management_regs->calData = data & CAL_DATA_MASK; |
|
1400 | 1399 | } |
General Comments 0
You need to be logged in to leave comments.
Login now