Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #17: Add table header file #18

Merged
merged 1 commit into from
Nov 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions fsw/src/sample_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "sample_app_events.h"
#include "sample_app_version.h"
#include "sample_app.h"
#include "sample_table.h"

#include <string.h>

Expand Down
10 changes: 0 additions & 10 deletions fsw/src/sample_app_msg.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,6 @@ typedef struct

} OS_PACK sample_hk_tlm_t;

/*
** Table structure
*/
typedef struct
{
uint16 Int1;
uint16 Int2;

} SampleTable_t;

#endif /* _sample_app_msg_h_ */

/************************/
Expand Down
12 changes: 1 addition & 11 deletions fsw/src/sample_table.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,7 @@
*/

#include "cfe_tbl_filedef.h" /* Required to obtain the CFE_TBL_FILEDEF macro definition */

/*
** The following is an example of a data structure the application may have declared
** as the format of their table.
*/
typedef struct
{
uint16 Int1;
uint16 Int2;

} SampleTable_t;
#include "sample_table.h"

/*
** The following is an example of the declaration statement that defines the desired
Expand Down
47 changes: 47 additions & 0 deletions fsw/src/sample_table.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*******************************************************************************
**
** GSC-18128-1, "Core Flight Executive Version 6.6"
**
** Copyright (c) 2006-2019 United States Government as represented by
** the Administrator of the National Aeronautics and Space Administration.
** All Rights Reserved.
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
**
** File: sample_table.h
**
** Purpose:
** Define sample table
**
** Notes:
**
**
*******************************************************************************/
#ifndef _sample_table_h_
#define _sample_table_h_

/*
** Table structure
*/
typedef struct
{
uint16 Int1;
uint16 Int2;

} SampleTable_t;

#endif /* _sample_table_h_ */

/************************/
/* End of File Comment */
/************************/