##// END OF EJS Templates
Minor updates
paul@pc-solar1.lab-lpp.local -
r7:8567eb30bf83 default
parent child
Show More
@@ -35,25 +35,30
35 <Compiler>
35 <Compiler>
36 <Add option="-Wall" />
36 <Add option="-Wall" />
37 </Compiler>
37 </Compiler>
38 <Unit filename="../header/FSW-config.h" />
39 <Unit filename="../header/FSW-rtems-processing.h" />
40 <Unit filename="../header/TC_handler.h" />
41 <Unit filename="../header/WF_handler.h" />
42 <Unit filename="../header/ccsds_types.h" />
38 <Unit filename="../header/ccsds_types.h" />
43 <Unit filename="../header/grlibregs.h" />
39 <Unit filename="../header/fsw_init.h" />
44 <Unit filename="../src/FSW-config.c">
40 <Unit filename="../header/fsw_misc.h" />
41 <Unit filename="../header/fsw_params.h" />
42 <Unit filename="../header/fsw_processing.h" />
43 <Unit filename="../header/grlib_regs.h" />
44 <Unit filename="../header/tc_handler.h" />
45 <Unit filename="../header/wf_handler.h" />
46 <Unit filename="../src/fsw_globals.c">
45 <Option compilerVar="CC" />
47 <Option compilerVar="CC" />
46 </Unit>
48 </Unit>
47 <Unit filename="../src/FSW-rtems-processing.c">
49 <Unit filename="../src/fsw_init.c">
50 <Option compilerVar="CC" />
51 </Unit>
52 <Unit filename="../src/fsw_misc.c">
48 <Option compilerVar="CC" />
53 <Option compilerVar="CC" />
49 </Unit>
54 </Unit>
50 <Unit filename="../src/FSW-rtems.c">
55 <Unit filename="../src/fsw_processing.c">
51 <Option compilerVar="CC" />
56 <Option compilerVar="CC" />
52 </Unit>
57 </Unit>
53 <Unit filename="../src/TC_handler.c">
58 <Unit filename="../src/tc_handler.c">
54 <Option compilerVar="CC" />
59 <Option compilerVar="CC" />
55 </Unit>
60 </Unit>
56 <Unit filename="../src/WF_handler.c">
61 <Unit filename="../src/wf_handler.c">
57 <Option compilerVar="CC" />
62 <Option compilerVar="CC" />
58 </Unit>
63 </Unit>
59 <Extensions>
64 <Extensions>
@@ -1,31 +1,43
1 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
1 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
2 <CodeBlocks_layout_file>
2 <CodeBlocks_layout_file>
3 <ActiveTarget name="Debug" />
3 <ActiveTarget name="Debug" />
4 <File name="../header/FSW-config.h" open="0" top="0" tabpos="0">
4 <File name="../header/ccsds_types.h" open="1" top="0" tabpos="5">
5 <Cursor position="581" topLine="0" />
5 <Cursor position="1172" topLine="24" />
6 </File>
6 </File>
7 <File name="../header/FSW-rtems-processing.h" open="0" top="0" tabpos="4">
7 <File name="../header/fsw_init.h" open="0" top="0" tabpos="0">
8 <Cursor position="995" topLine="6" />
8 <Cursor position="307" topLine="0" />
9 </File>
10 <File name="../header/fsw_misc.h" open="0" top="0" tabpos="0">
11 <Cursor position="114" topLine="0" />
9 </File>
12 </File>
10 <File name="../header/TC_handler.h" open="0" top="0" tabpos="5">
13 <File name="../header/fsw_params.h" open="0" top="0" tabpos="0">
11 <Cursor position="963" topLine="0" />
14 <Cursor position="1320" topLine="8" />
12 </File>
15 </File>
13 <File name="../header/ccsds_types.h" open="0" top="0" tabpos="4">
16 <File name="../header/fsw_processing.h" open="0" top="0" tabpos="0">
14 <Cursor position="1753" topLine="39" />
17 <Cursor position="175" topLine="1" />
18 </File>
19 <File name="../header/tc_handler.h" open="1" top="0" tabpos="4">
20 <Cursor position="634" topLine="0" />
15 </File>
21 </File>
16 <File name="../header/grlibregs.h" open="0" top="0" tabpos="6">
22 <File name="../header/wf_handler.h" open="0" top="0" tabpos="0">
17 <Cursor position="915" topLine="1" />
23 <Cursor position="212" topLine="0" />
18 </File>
24 </File>
19 <File name="../src/FSW-config.c" open="0" top="0" tabpos="3">
25 <File name="../src/fsw_globals.c" open="0" top="0" tabpos="0">
20 <Cursor position="259" topLine="0" />
26 <Cursor position="908" topLine="0" />
27 </File>
28 <File name="../src/fsw_init.c" open="1" top="0" tabpos="1">
29 <Cursor position="1703" topLine="42" />
21 </File>
30 </File>
22 <File name="../src/FSW-rtems-processing.c" open="0" top="0" tabpos="2">
31 <File name="../src/fsw_misc.c" open="0" top="0" tabpos="0">
23 <Cursor position="416" topLine="17" />
32 <Cursor position="20" topLine="0" />
33 </File>
34 <File name="../src/fsw_processing.c" open="1" top="0" tabpos="2">
35 <Cursor position="1175" topLine="46" />
24 </File>
36 </File>
25 <File name="../src/FSW-rtems.c" open="1" top="1" tabpos="1">
37 <File name="../src/tc_handler.c" open="1" top="1" tabpos="3">
26 <Cursor position="14643" topLine="95" />
38 <Cursor position="2672" topLine="26" />
27 </File>
39 </File>
28 <File name="../src/TC_handler.c" open="0" top="0" tabpos="2">
40 <File name="../src/wf_handler.c" open="0" top="0" tabpos="0">
29 <Cursor position="2441" topLine="9" />
41 <Cursor position="3936" topLine="62" />
30 </File>
42 </File>
31 </CodeBlocks_layout_file>
43 </CodeBlocks_layout_file>
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
@@ -17,10 +17,13 unsigned int currentTC_LEN_RCV_AsUnsigne
17 unsigned int currentTM_length;
17 unsigned int currentTM_length;
18 unsigned char currentTC_processedFlag;
18 unsigned char currentTC_processedFlag;
19
19
20 //**********************
21 // GENERAL USE FUNCTIONS
20 unsigned int lookUpTableForCRC[256];
22 unsigned int lookUpTableForCRC[256];
21 void InitLookUpTableForCRC();
23 void InitLookUpTableForCRC();
22 void GetCRCAsTwoBytes(unsigned char* data, unsigned char* crcAsTwoBytes, unsigned int sizeOfData);
24 void GetCRCAsTwoBytes(unsigned char* data, unsigned char* crcAsTwoBytes, unsigned int sizeOfData);
23
25
26 //*********************
24 // ACCEPTANCE FUNCTIONS
27 // ACCEPTANCE FUNCTIONS
25 unsigned char acceptTM(ccsdsTelecommandPacket_t * TMPacket, unsigned int TC_LEN_RCV);
28 unsigned char acceptTM(ccsdsTelecommandPacket_t * TMPacket, unsigned int TC_LEN_RCV);
26
29
@@ -30,6 +33,7 unsigned char TM_build_data(ccsdsTelecom
30 unsigned int TC_checker(ccsdsTelecommandPacket_t *TC, unsigned int TC_LEN_RCV,
33 unsigned int TC_checker(ccsdsTelecommandPacket_t *TC, unsigned int TC_LEN_RCV,
31 TMHeader_t *TM_Header, unsigned int *hlen, char *data);
34 TMHeader_t *TM_Header, unsigned int *hlen, char *data);
32
35
36 //***********
33 // RTEMS TASK
37 // RTEMS TASK
34 rtems_task spw_recv_task( rtems_task_argument unused );
38 rtems_task spw_recv_task( rtems_task_argument unused );
35
39
@@ -11,6 +11,8 char *errorCCSDSMsg[8] = { "ILLEGAL_APID
11 "CCSDS_TM_VALID 7"
11 "CCSDS_TM_VALID 7"
12 };
12 };
13
13
14 //**********************
15 // GENERAL USE FUNCTIONS
14 unsigned int Crc_opt( unsigned char D, unsigned int Chk)
16 unsigned int Crc_opt( unsigned char D, unsigned int Chk)
15 {
17 {
16 return(((Chk << 8) & 0xff00)^lookUpTableForCRC [(((Chk >> 8)^D) & 0x00ff)]);
18 return(((Chk << 8) & 0xff00)^lookUpTableForCRC [(((Chk >> 8)^D) & 0x00ff)]);
@@ -46,6 +48,9 void GetCRCAsTwoBytes(unsigned char* dat
46 crcAsTwoBytes[1] = (unsigned char) (Chk & 0x00ff);
48 crcAsTwoBytes[1] = (unsigned char) (Chk & 0x00ff);
47 }
49 }
48
50
51
52 //*********************
53 // ACCEPTANCE FUNCTIONS
49 unsigned int TC_checker(ccsdsTelecommandPacket_t *TC, unsigned int TC_LEN_RCV,
54 unsigned int TC_checker(ccsdsTelecommandPacket_t *TC, unsigned int TC_LEN_RCV,
50 TMHeader_t *TM_Header, unsigned int *hlen, char *data)
55 TMHeader_t *TM_Header, unsigned int *hlen, char *data)
51 {
56 {
@@ -271,6 +276,13 unsigned char TM_build_data(ccsdsTelecom
271 return 1;
276 return 1;
272 }
277 }
273
278
279 unsigned char actionLauncher(unsigned int sid)
280 {
281
282 }
283
284 //***********
285 // RTEMS TASK
274 rtems_task spw_recv_task( rtems_task_argument unused )
286 rtems_task spw_recv_task( rtems_task_argument unused )
275 {
287 {
276 rtems_status_code status;
288 rtems_status_code status;
General Comments 0
You need to be logged in to leave comments. Login now