Skip to content

Commit a5e8b4b

Browse files
dzbakerdzbaker
authored
Merge pull request nasa#124 from nasa/integration-candidate
ci_lab Integration candidate: Caelum-rc4+dev25
2 parents 0ea953f + dbfd67e commit a5e8b4b

File tree

4 files changed

+128
-144
lines changed

4 files changed

+128
-144
lines changed

‎CHANGELOG.md

+111
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
# Changelog
2+
3+
## Development Build: v2.5.0-rc4+dev39
4+
- Remove redundant comments
5+
- Create CHANGELOG.md
6+
- See <https://github.com/nasa/ci_lab/pull/123> and <https://github.com/nasa/ci_lab/pull/120>
7+
8+
## Development Build: v2.5.0-rc4+dev30
9+
- Remove unnecessary parentheses around return values.
10+
- Remove 'return;' from last line of void functions.
11+
- See <https://github.com/nasa/ci_lab/pull/116> and <https://github.com/nasa/ci_lab/pull/118>
12+
13+
## Development Build: v2.5.0-rc4+dev24
14+
- Update cmake mimimum required to something more recent
15+
- See <https://github.com/nasa/ci_lab/pull/113>
16+
17+
## Development Build: v2.5.0-rc4+dev22
18+
- Remove registration of empty EVS filters
19+
- Update codeql workflow for reusable updates
20+
- See <https://github.com/nasa/cFS/pull/505>
21+
22+
## Development Build: v2.5.0-rc4+dev17
23+
- Update Copyright Headers
24+
- Standardize version.h
25+
- See <https://github.com/nasa/ci_lab/pull/107> and <https://github.com/nasa/cFS/445>
26+
27+
## Development Build: v2.5.0-rc4+dev10
28+
- Apply header guard standard
29+
- See <https://github.com/nasa/cFS/pull/432>
30+
31+
## Development Build: v2.5.0-rc4+dev4
32+
- Use CFE_MSG_PTR conversion macro
33+
- Update baseline for cFS-Caelum-rc4 to v2.5.0-rc4
34+
- See <https://github.com/nasa/ci_lab/pull/101> and <https://github.com/nasa/cFS/pull/390>
35+
36+
## Development Build: v2.4.0-rc1+dev46
37+
- Apply CFE_SB_ValueToMsgId where required
38+
- See <https://github.com/nasa/ci_lab/pull/93> and <https://github.com/nasa/cFS/pull/359>
39+
40+
## Development Build: v2.4.0-rc1+dev42
41+
- Implement Coding Standard in CodeQL workflow
42+
- See <https://github.com/nasa/ci_lab/pull/88> and <https://github.com/nasa/cFS/pull/270>
43+
44+
## Development Build: v2.4.0-rc1+dev39
45+
- Removes unnecessary call to `CFE_ES_RegisterApp()` since app registration is done automatically.
46+
- Demonstrates the use of the Zero Copy API. Adds a step that obtains a buffer prior to calling `OS_SocketRecvFrom` then transmits that same buffer directly rather than copying it.
47+
- See <https://github.com/nasa/ci_lab/pull/85>
48+
49+
## Development Build: v2.4.0-rc1+dev30
50+
- Use `cfe.h` instead of individual headers
51+
- See <https://github.com/nasa/ci_lab/pull/78>
52+
53+
## Development Build: v2.4.0-rc1+dev25
54+
- Add Testing Tools to the Security Policy
55+
- See <https://github.com/nasa/ci_lab/pull/76>
56+
57+
## Development Build: v2.4.0-rc1+dev14
58+
- Aligns messages according to changes in cFE <https://github.com/nasa/cFE/issues/1009>. Uses the "raw" message cmd/tlm types in definition
59+
- See <https://github.com/nasa/ci_lab/pull/65>
60+
61+
## Development Build: v2.4.0-rc1+dev8
62+
- Replaces deprecated SB API's with MSG
63+
- No behavior impact, removes undesirable pattern use of `OS_PACK`
64+
- See <https://github.com/nasa/ci_lab/pull/60>
65+
66+
## Development Build: v2.4.0-rc1+dev2
67+
- Update the SocketID field to be `osal_id_t` instead of uint32
68+
- Set Revision number to 99 for development version identifier in telemetry
69+
- See <https://github.com/nasa/ci_lab/pull/56>
70+
71+
## Development Build: v2.3.0+dev36
72+
- Add build name and build number to version reporting
73+
- See <https://github.com/nasa/ci_lab/pull/53>
74+
75+
## Development Build: v2.3.5
76+
- Replace references to `ccsds.h` types with the `cfe_sb.h`-provided type.
77+
- See <https://github.com/nasa/ci_lab/pull/50>
78+
79+
## Development Build: v2.3.4
80+
- Apply the CFE_SB_MsgIdToValue() and CFE_SB_ValueToMsgId() routines where compatibility with an integer MsgId is necessary - syslog prints, events, compile-time MID #define values.
81+
- Minor changes, see <https://github.com/nasa/ci_lab/pull/47>
82+
83+
## Development Build: v2.3.3
84+
- Offset UDP base port in multi-cpu configurations
85+
- Minor changes, see <https://github.com/nasa/ci_lab/pull/44>
86+
87+
## Development Build: v2.3.2
88+
- Use OSAL socket API instead of BSD sockets
89+
- Remove PDU introspection code
90+
- Update command and telemetry logic
91+
- Collect globals as a single top-level global structure
92+
- Minor changes, see <https://github.com/nasa/ci_lab/pull/38>
93+
94+
## Development Build: v2.3.1
95+
- Code style and enforcement (see <https://github.com/nasa/ci_lab/pull/31>)
96+
97+
## _**OFFICIAL RELEASE: v2.3.0 - Aquila**_
98+
- Minor updates (see <https://github.com/nasa/ci_lab/pull/12>)
99+
- Not backwards compatible with OSAL 4.2.1
100+
- Released as part of cFE 6.7.0, Apache 2.0
101+
102+
## _**OFFICIAL RELEASE: v2.2.0a**_
103+
- Released as part of cFE 6.6.0a, Apache 2.0
104+
105+
## Known issues
106+
Dependence on cfe platform config header is undesirable, and the check is not endian safe. As a lab application, extensive testing is not performed prior to release and only minimal functionality is included.
107+
108+
## Getting Help
109+
For best results, submit issues:questions or issues:help wanted requests at <https://github.com/nasa/cFS>.
110+
111+
Official cFS page: <http://cfs.gsfc.nasa.gov>

‎README.md

-120
Original file line numberDiff line numberDiff line change
@@ -9,126 +9,6 @@ This lab application is a non-flight utility to send commands to the cFS Bundle.
99

1010
ci_lab is a simple command uplink application that accepts CCSDS telecommand packets over a UDP/IP port. It does not provide a full CCSDS Telecommand stack implementation.
1111

12-
## Changelog
13-
14-
### Development Build: v2.5.0-rc4+dev30
15-
- Remove unnecessary parentheses around return values.
16-
- Remove 'return;' from last line of void functions.
17-
- See <https://github.com/nasa/ci_lab/pull/116> and <https://github.com/nasa/ci_lab/pull/118>
18-
19-
### Development Build: v2.5.0-rc4+dev24
20-
- Update cmake mimimum required to something more recent
21-
- See <https://github.com/nasa/ci_lab/pull/113>
22-
23-
### Development Build: v2.5.0-rc4+dev22
24-
25-
- Remove registration of empty EVS filters
26-
- Update codeql workflow for reusable updates
27-
- See <https://github.com/nasa/cFS/pull/505>
28-
29-
### Development Build: v2.5.0-rc4+dev17
30-
31-
- Update Copyright Headers
32-
- Standardize version.h
33-
- See <https://github.com/nasa/ci_lab/pull/107> and <https://github.com/nasa/cFS/445>
34-
35-
### Development Build: v2.5.0-rc4+dev10
36-
37-
- Apply header guard standard
38-
- See <https://github.com/nasa/cFS/pull/432>
39-
40-
### Development Build: v2.5.0-rc4+dev4
41-
42-
- Use CFE_MSG_PTR conversion macro
43-
- Update baseline for cFS-Caelum-rc4 to v2.5.0-rc4
44-
- See <https://github.com/nasa/ci_lab/pull/101> and <https://github.com/nasa/cFS/pull/390>
45-
46-
### Development Build: v2.4.0-rc1+dev46
47-
48-
- Apply CFE_SB_ValueToMsgId where required
49-
- See <https://github.com/nasa/ci_lab/pull/93> and <https://github.com/nasa/cFS/pull/359>
50-
51-
### Development Build: v2.4.0-rc1+dev42
52-
53-
- Implement Coding Standard in CodeQL workflow
54-
- See <https://github.com/nasa/ci_lab/pull/88> and <https://github.com/nasa/cFS/pull/270>
55-
56-
### Development Build: v2.4.0-rc1+dev39
57-
58-
- Removes unnecessary call to `CFE_ES_RegisterApp()` since app registration is done automatically.
59-
- Demonstrates the use of the Zero Copy API. Adds a step that obtains a buffer prior to calling `OS_SocketRecvFrom` then transmits that same buffer directly rather than copying it.
60-
- See <https://github.com/nasa/ci_lab/pull/85>
61-
62-
### Development Build: v2.4.0-rc1+dev30
63-
64-
- Use `cfe.h` instead of individual headers
65-
- See <https://github.com/nasa/ci_lab/pull/78>
66-
67-
### Development Build: v2.4.0-rc1+dev25
68-
69-
- Add Testing Tools to the Security Policy
70-
- See <https://github.com/nasa/ci_lab/pull/76>
71-
72-
### Development Build: v2.4.0-rc1+dev14
73-
74-
- Aligns messages according to changes in cFE <https://github.com/nasa/cFE/issues/1009>. Uses the "raw" message cmd/tlm types in definition
75-
- See <https://github.com/nasa/ci_lab/pull/65>
76-
77-
### Development Build: v2.4.0-rc1+dev8
78-
79-
- Replaces deprecated SB API's with MSG
80-
- No behavior impact, removes undesirable pattern use of `OS_PACK`
81-
- See <https://github.com/nasa/ci_lab/pull/60>
82-
83-
### Development Build: v2.4.0-rc1+dev2
84-
85-
- Update the SocketID field to be `osal_id_t` instead of uint32
86-
- Set Revision number to 99 for development version identifier in telemetry
87-
- See <https://github.com/nasa/ci_lab/pull/56>
88-
89-
90-
### Development Build: v2.3.0+dev36
91-
92-
- Add build name and build number to version reporting
93-
- See <https://github.com/nasa/ci_lab/pull/53>
94-
95-
### Development Build: v2.3.5
96-
97-
- Replace references to `ccsds.h` types with the `cfe_sb.h`-provided type.
98-
- See <https://github.com/nasa/ci_lab/pull/50>
99-
100-
### Development Build: v2.3.4
101-
102-
- Apply the CFE_SB_MsgIdToValue() and CFE_SB_ValueToMsgId() routines where compatibility with an integer MsgId is necessary - syslog prints, events, compile-time MID #define values.
103-
- Minor changes, see <https://github.com/nasa/ci_lab/pull/47>
104-
105-
### Development Build: v2.3.3
106-
107-
- Offset UDP base port in multi-cpu configurations
108-
- Minor changes, see <https://github.com/nasa/ci_lab/pull/44>
109-
110-
### Development Build: v2.3.2
111-
112-
- Use OSAL socket API instead of BSD sockets
113-
- Remove PDU introspection code
114-
- Update command and telemetry logic
115-
- Collect globals as a single top-level global structure
116-
- Minor changes, see <https://github.com/nasa/ci_lab/pull/38>
117-
118-
### Development Build: v2.3.1
119-
120-
- Code style and enforcement (see <https://github.com/nasa/ci_lab/pull/31>)
121-
122-
### _**OFFICIAL RELEASE: v2.3.0 - Aquila**_
123-
124-
- Minor updates (see <https://github.com/nasa/ci_lab/pull/12>)
125-
- Not backwards compatible with OSAL 4.2.1
126-
- Released as part of cFE 6.7.0, Apache 2.0
127-
128-
### _**OFFICIAL RELEASE: v2.2.0a**_
129-
130-
- Released as part of cFE 6.6.0a, Apache 2.0
131-
13212
## Known issues
13313

13414
Dependence on cfe platform config header is undesirable, and the check is not endian safe. As a lab application, extensive testing is not performed prior to release and only minimal functionality is included.

‎fsw/src/ci_lab_app.c

+16-23
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,12 @@ int32 CI_LAB_ResetCounters(const CI_LAB_ResetCountersCmd_t *data);
6565
int32 CI_LAB_ReportHousekeeping(const CFE_MSG_CommandHeader_t *data);
6666

6767
/** * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
68-
/* CI_Lab_AppMain() -- Application entry point and main process loop */
68+
/* */
69+
/* Application entry point and main process loop */
6970
/* Purpose: This is the Main task event loop for the Command Ingest Task */
7071
/* The task handles all interfaces to the data system through */
7172
/* the software bus. There is one pipeline into this task */
72-
/* The task is scheduled by input into this pipeline. */
73+
/* The task is scheduled by input into this pipeline. */
7374
/* It can receive Commands over this pipeline */
7475
/* and acts accordingly to process them. */
7576
/* */
@@ -109,8 +110,7 @@ void CI_Lab_AppMain(void)
109110
}
110111

111112
CFE_ES_ExitApp(RunStatus);
112-
113-
} /* End of CI_Lab_AppMain() */
113+
}
114114

115115
/*
116116
** CI delete callback function.
@@ -125,7 +125,7 @@ void CI_LAB_delete_callback(void)
125125

126126
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
127127
/* */
128-
/* CI_LAB_TaskInit() -- CI initialization */
128+
/* CI initialization */
129129
/* */
130130
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
131131
void CI_LAB_TaskInit(void)
@@ -179,11 +179,9 @@ void CI_LAB_TaskInit(void)
179179

180180
CFE_EVS_SendEvent(CI_LAB_STARTUP_INF_EID, CFE_EVS_EventType_INFORMATION, "CI Lab Initialized.%s",
181181
CI_LAB_VERSION_STRING);
182-
183-
} /* End of CI_LAB_TaskInit() */
182+
}
184183

185184
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
186-
/* Name: CI_LAB_ProcessCommandPacket */
187185
/* */
188186
/* Purpose: */
189187
/* This routine will process any packet that is received on the CI command*/
@@ -216,11 +214,11 @@ void CI_LAB_ProcessCommandPacket(CFE_SB_Buffer_t *SBBufPtr)
216214
(unsigned int)CFE_SB_MsgIdToValue(MsgId));
217215
break;
218216
}
219-
} /* End CI_LAB_ProcessCommandPacket */
217+
}
220218

221219
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
222220
/* */
223-
/* CI_LAB_ProcessGroundCommand() -- CI ground commands */
221+
/* CI ground commands */
224222
/* */
225223
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
226224

@@ -251,10 +249,9 @@ void CI_LAB_ProcessGroundCommand(CFE_SB_Buffer_t *SBBufPtr)
251249
default:
252250
break;
253251
}
254-
} /* End of CI_LAB_ProcessGroundCommand() */
252+
}
255253

256254
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
257-
/* Name: CI_LAB_Noop */
258255
/* */
259256
/* Purpose: */
260257
/* Handle NOOP command packets */
@@ -271,7 +268,6 @@ int32 CI_LAB_Noop(const CI_LAB_NoopCmd_t *data)
271268
}
272269

273270
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
274-
/* Name: CI_LAB_ResetCounters */
275271
/* */
276272
/* Purpose: */
277273
/* Handle ResetCounters command packets */
@@ -285,25 +281,23 @@ int32 CI_LAB_ResetCounters(const CI_LAB_ResetCountersCmd_t *data)
285281
}
286282

287283
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
288-
/* Name: CI_LAB_ReportHousekeeping */
289284
/* */
290285
/* Purpose: */
291286
/* This function is triggered in response to a task telemetry request */
292287
/* from the housekeeping task. This function will gather the CI task */
293288
/* telemetry, packetize it and send it to the housekeeping task via */
294289
/* the software bus */
290+
/* */
295291
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
296292
int32 CI_LAB_ReportHousekeeping(const CFE_MSG_CommandHeader_t *data)
297293
{
298294
CI_LAB_Global.HkTlm.Payload.SocketConnected = CI_LAB_Global.SocketConnected;
299295
CFE_SB_TimeStampMsg(CFE_MSG_PTR(CI_LAB_Global.HkTlm.TelemetryHeader));
300296
CFE_SB_TransmitMsg(CFE_MSG_PTR(CI_LAB_Global.HkTlm.TelemetryHeader), true);
301297
return CFE_SUCCESS;
302-
303-
} /* End of CI_LAB_ReportHousekeeping() */
298+
}
304299

305300
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
306-
/* Name: CI_LAB_ResetCounters_Internal */
307301
/* */
308302
/* Purpose: */
309303
/* This function resets all the global counter variables that are */
@@ -319,11 +313,11 @@ void CI_LAB_ResetCounters_Internal(void)
319313
/* Status of packets ingested by CI task */
320314
CI_LAB_Global.HkTlm.Payload.IngestPackets = 0;
321315
CI_LAB_Global.HkTlm.Payload.IngestErrors = 0;
322-
} /* End of CI_LAB_ResetCounters() */
316+
}
323317

324318
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
325319
/* */
326-
/* CI_LAB_ReadUpLink() -- */
320+
/* -- */
327321
/* */
328322
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
329323
void CI_LAB_ReadUpLink(void)
@@ -380,11 +374,11 @@ void CI_LAB_ReadUpLink(void)
380374
break; /* no (more) messages */
381375
}
382376
}
383-
} /* End of CI_LAB_ReadUpLink() */
377+
}
384378

385379
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
386380
/* */
387-
/* CI_LAB_VerifyCmdLength() -- Verify command packet length */
381+
/* Verify command packet length */
388382
/* */
389383
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
390384
bool CI_LAB_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength)
@@ -413,5 +407,4 @@ bool CI_LAB_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength)
413407
}
414408

415409
return result;
416-
417-
} /* End of CI_LAB_VerifyCmdLength() */
410+
}

‎fsw/src/ci_lab_version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
/* Development Build Macro Definitions */
2727

28-
#define CI_LAB_BUILD_NUMBER 30 /*!< Development Build: Number of commits since baseline */
28+
#define CI_LAB_BUILD_NUMBER 39 /*!< Development Build: Number of commits since baseline */
2929
#define CI_LAB_BUILD_BASELINE \
3030
"v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */
3131

0 commit comments

Comments
 (0)