Skip to content

Fix #23, Moves interface definition files to inc #24

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.

Sign up for GitHub

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

Draft
chillfig wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix #23, Moves interface definition files to inc #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
cmake_minimum_required(VERSION 2.6.4)
project(CFS_SCH C)

include_directories(fsw/public_inc)
include_directories(fsw/mission_inc)
include_directories(fsw/platform_inc)
include_directories(fsw/inc)

aux_source_directory(fsw/src APP_SRC_FILES)

Expand Down
3 changes: 1 addition & 2 deletions fsw/for_build/codewalk_doxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ WARN_LOGFILE =
INPUT = $(CFS_APP_SRC)/$(APPTARGET)/docs/dox_src/detailed_design/cfs_$(APPTARGET).dox
#INPUT += $(CFS_APP_SRC)/$(APPTARGET)/fsw/public_inc
INPUT += $(CFS_APP_SRC)/$(APPTARGET)/fsw/src
INPUT += $(CFS_APP_SRC)/$(APPTARGET)/fsw/mission_inc
INPUT += $(CFS_APP_SRC)/$(APPTARGET)/fsw/platform_inc
INPUT += $(CFS_APP_SRC)/$(APPTARGET)/fsw/inc
#INPUT_ENCODING = UTF-8
FILE_PATTERNS = *.c \
*.h
Expand Down
4 changes: 2 additions & 2 deletions fsw/for_build/detail_doxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ WARN_LOGFILE =
#---------------------------------------------------------------------------
INPUT = $(CFS_APP_SRC)/$(APPTARGET)/docs/dox_src/detailed_design/cfs_$(APPTARGET).dox
#INPUT += $(CFS_APP_SRC)/$(APPTARGET)/fsw/public_inc
INPUT += ../../mission_inc/$(APPTARGET)_perfids.h
#INPUT += ../../mission_inc/$(APPTARGET)_mission_cfg.h
INPUT += ../../inc/$(APPTARGET)_perfids.h
#INPUT += ../../inc/$(APPTARGET)_mission_cfg.h
INPUT += ../inc/$(APPTARGET)_msgids.h
INPUT += ../inc/$(APPTARGET)_platform_cfg.h
INPUT += $(CFS_APP_SRC)/$(APPTARGET)/fsw/src
Expand Down
2 changes: 1 addition & 1 deletion fsw/for_build/user_doxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ INPUT += $(CFS_APP_SRC)/$(APPTARGET)/fsw/src/$(APPTARGET)_events
INPUT += $(CFS_APP_SRC)/$(APPTARGET)/fsw/src/$(APPTARGET)_custom.h
INPUT += $(CFS_APP_SRC)/$(APPTARGET)/fsw/src/$(APPTARGET)_custom.c
INPUT += $(CFS_APP_SRC)/inc/$(APPTARGET)_api.h
INPUT += ../../mission_inc/$(APPTARGET)_perfids.h
INPUT += ../../inc/$(APPTARGET)_perfids.h
#INPUT += ../../mission_inc/$(APPTARGET)_mission_cfg.h
INPUT += ../inc/$(APPTARGET)_msgids.h
INPUT += ../inc/$(APPTARGET)_platform_cfg.h
Expand Down
0 fsw/public_inc/sch_api.h → fsw/inc/sch_api.h
View file
Open in desktop
File renamed without changes.
0 fsw/src/sch_events.h → fsw/inc/sch_events.h
View file
Open in desktop
File renamed without changes.
0 fsw/src/sch_msg.h → fsw/inc/sch_msg.h
View file
Open in desktop
File renamed without changes.
0 fsw/src/sch_msgdefs.h → fsw/inc/sch_msgdefs.h
View file
Open in desktop
File renamed without changes.
0 fsw/platform_inc/sch_msgids.h → fsw/inc/sch_msgids.h
View file
Open in desktop
File renamed without changes.
0 fsw/mission_inc/sch_perfids.h → fsw/inc/sch_perfids.h
View file
Open in desktop
File renamed without changes.
0 fsw/platform_inc/sch_platform_cfg.h → fsw/inc/sch_platform_cfg.h
View file
Open in desktop
File renamed without changes.
0 fsw/src/sch_tbldefs.h → fsw/inc/sch_tbldefs.h
View file
Open in desktop
File renamed without changes.
4 changes: 1 addition & 3 deletions fsw/unit_test/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,7 @@ INCLUDES += -I$(PSP_DIR)/fsw/inc
INCLUDES += -I$(PSP_DIR)/fsw/pc-linux/inc
INCLUDES += -I$(PSP_DIR)/fsw/pc-linux/inc
INCLUDES += -I$(SCH_PATH)/fsw/src
INCLUDES += -I$(SCH_PATH)/fsw/mission_inc
INCLUDES += -I$(SCH_PATH)/fsw/platform_inc
INCLUDES += -I$(SCH_PATH)/fsw/public_inc
INCLUDES += -I$(SCH_PATH)/fsw/inc

#
# FLIGHT_OBJS specifies flight software object files.
Expand Down