diff --git a/examples/scenarioMagneticFieldCenteredDipole.py b/examples/scenarioMagneticFieldCenteredDipole.py index 365c16674a..68fa992071 100644 --- a/examples/scenarioMagneticFieldCenteredDipole.py +++ b/examples/scenarioMagneticFieldCenteredDipole.py @@ -57,7 +57,7 @@ magModule.planetRadius = 6371.2 * 1000 # meters The python support file ``simSetPlanetEnvironment.py`` provides helper -functions to setup command magnetic field +functions to use magnetic field environments including the centered dipole models for Mercury, Earth, Jupiter, Saturn, Uranus and Neptune. diff --git a/examples/scenarioMagneticFieldWMM.py b/examples/scenarioMagneticFieldWMM.py index 5499affd21..eb5a7ccfa3 100644 --- a/examples/scenarioMagneticFieldWMM.py +++ b/examples/scenarioMagneticFieldWMM.py @@ -56,7 +56,7 @@ The default planet's position vector is assumed to be the inertial frame origin and an identity orientation matrix. If a different planet state message is required this can be -specified through the optional input message ``planetPosInMsgName``. +specified through the optional input message ``planetPosInMsg``. As with :ref:`scenarioMagneticFieldCenteredDipole`, the magnetic field module can produce the magnetic field for a vector of spacecraft @@ -66,7 +66,7 @@ If this is not set, then the BSK default epoch time is used. To set a general epoch time, the module can read in an epoch message with a -gregorian UTC date. This is set using the the support method +gregorian UTC date. This is set using the support method ``timeStringToGregorianUTCMsg``. The WMM model is driven of a time variable that is a decimal year value. @@ -76,7 +76,7 @@ ``epochDateFractionalYear`` variable. Every time a spacecraft is added to the magnetic field module, an -automated output message name is created. For `magModule` is "WMM_0_data" +extra output message is autmatically created. For `magModule` is "WMM_0_data" as the ModelTag string is ``WMM`` and the spacecraft number is 0. This output name is created in the ``addSpacecraftToModel()`` function. However, if the default output name is used for the second diff --git a/src/fswAlgorithms/attDetermination/CSSEst/_Documentation/Basilisk-cssWlsEst-20180429.bbl b/src/fswAlgorithms/attDetermination/CSSEst/_Documentation/Basilisk-cssWlsEst-20180429.bbl new file mode 100644 index 0000000000..9b431fad0d --- /dev/null +++ b/src/fswAlgorithms/attDetermination/CSSEst/_Documentation/Basilisk-cssWlsEst-20180429.bbl @@ -0,0 +1,3 @@ +\begin{thebibliography}{} + +\end{thebibliography} diff --git a/src/fswAlgorithms/attDetermination/CSSEst/_Documentation/Basilisk-cssWlsEst-20180429.pdf b/src/fswAlgorithms/attDetermination/CSSEst/_Documentation/Basilisk-cssWlsEst-20180429.pdf index e91fab9d1b..c2b837613d 100644 Binary files a/src/fswAlgorithms/attDetermination/CSSEst/_Documentation/Basilisk-cssWlsEst-20180429.pdf and b/src/fswAlgorithms/attDetermination/CSSEst/_Documentation/Basilisk-cssWlsEst-20180429.pdf differ diff --git a/src/fswAlgorithms/attDetermination/CSSEst/_Documentation/secUserGuide.tex b/src/fswAlgorithms/attDetermination/CSSEst/_Documentation/secUserGuide.tex index b1beea49c7..4f9b741f52 100644 --- a/src/fswAlgorithms/attDetermination/CSSEst/_Documentation/secUserGuide.tex +++ b/src/fswAlgorithms/attDetermination/CSSEst/_Documentation/secUserGuide.tex @@ -1,12 +1,6 @@ % !TEX root = ./Basilisk-cssWlsEst-20180429.tex \section{User Guide} -\subsection{Input/Output Messages} -The module has 1 required input messages, and 1 output message: -\begin{itemize} - \item {\tt navStateOutMsgName} -- This output message, of type {\tt NavAttIntMsg}, provides the attitude navigation message containing the estimated sun heading vector {\tt vehSunPntBdy}, as well as the partially observed body rate vector {\tt omega\_BN\_B}. - \item {\tt cssDataInMsgName} -- This input message, of type {\tt CSSArraySensorIntMsg}, receives the CSS sensor message -\end{itemize} \subsection{Module Parameters and States} The module has the following parameter that can be configured: diff --git a/src/fswAlgorithms/attDetermination/InertialUKF/_Documentation/Basilisk-inertialUKF-20190402.pdf b/src/fswAlgorithms/attDetermination/InertialUKF/_Documentation/Basilisk-inertialUKF-20190402.pdf index 4c398337e1..a1781d5083 100644 Binary files a/src/fswAlgorithms/attDetermination/InertialUKF/_Documentation/Basilisk-inertialUKF-20190402.pdf and b/src/fswAlgorithms/attDetermination/InertialUKF/_Documentation/Basilisk-inertialUKF-20190402.pdf differ diff --git a/src/fswAlgorithms/attDetermination/InertialUKF/_Documentation/secTest.tex b/src/fswAlgorithms/attDetermination/InertialUKF/_Documentation/secTest.tex index c18e77f29f..1cdf87c7db 100644 --- a/src/fswAlgorithms/attDetermination/InertialUKF/_Documentation/secTest.tex +++ b/src/fswAlgorithms/attDetermination/InertialUKF/_Documentation/secTest.tex @@ -50,8 +50,8 @@ \section{Test Parameters} \hline \textbf{Output Value Tested} & \textbf{States Tolerated Error} & \textbf{Covariance Tolerated Error} \\ \hline Test 0 & \input{AutoTex/toleranceValue00} & N/A \\ -Test 1 & \input{AutoTex/toleranceValue22} & N/A \\ -Test 2 & \input{AutoTex/toleranceValue44} & Increase \\ +%Test 1 & \input{AutoTex/toleranceValue22} & N/A \\ +%Test 2 & \input{AutoTex/toleranceValue44} & Increase \\ Test 3 & \input{AutoTex/toleranceValue11} & Increase \\ Test 4 & \input{AutoTex/toleranceValue33} & N/A \\\hline \end{tabular} @@ -68,8 +68,8 @@ \section{Test Results} \textbf{Check} &\textbf{Pass/Fail} \\ \hline Test 0 & \input{AutoTex/passFail00} \\ - Test 1 & \input{AutoTex/passFail22} \\ - Test 2 & \input{AutoTex/passFail44} \\ +% Test 1 & \input{AutoTex/passFail22} \\ +% Test 2 & \input{AutoTex/passFail44} \\ Test 3 & \input{AutoTex/passFail11} \\ Test 4 & \input{AutoTex/passFail33} \\ \hline\hline diff --git a/src/fswAlgorithms/attDetermination/InertialUKF/_Documentation/secUserGuide.tex b/src/fswAlgorithms/attDetermination/InertialUKF/_Documentation/secUserGuide.tex index 48fa928add..675356efc0 100644 --- a/src/fswAlgorithms/attDetermination/InertialUKF/_Documentation/secUserGuide.tex +++ b/src/fswAlgorithms/attDetermination/InertialUKF/_Documentation/secUserGuide.tex @@ -40,14 +40,5 @@ \subsection{Filter Set-up, initialization, and I/O} \texttt{ filterObject.gyroFilt = [lpDataUse, lpDataUse, lpDataUse] }\\ \end{itemize} -The messages must also be set as such: -\begin{itemize} -\item \texttt{ filterObject.navStateOutMsgName = "inertial$\_$state$\_$estimate"} -\item \texttt{ filterObject.filtDataOutMsgName = "inertial$\_$filter$\_$data"} -\item \texttt{ filterObject.massPropsInMsgName = "adcs$\_$config$\_$data"} -\item \texttt{filterObject.rwSpeedsInMsgName = "reactionwheel$\_$output$\_$states"} -\item \texttt{ filterObject.rwParamsInMsgName = "rwa$\_$config$\_$data$\_$parsed"} -\item \texttt{ filterObject.gyrBuffInMsgName = "gyro$\_$buffer$\_$data"} -\end{itemize} diff --git a/src/fswAlgorithms/attDetermination/InertialUKF/_UnitTest/test_inertialKF.py b/src/fswAlgorithms/attDetermination/InertialUKF/_UnitTest/test_inertialKF.py index 11afb1b574..2d3891b6d5 100644 --- a/src/fswAlgorithms/attDetermination/InertialUKF/_UnitTest/test_inertialKF.py +++ b/src/fswAlgorithms/attDetermination/InertialUKF/_UnitTest/test_inertialKF.py @@ -184,7 +184,7 @@ def filterMethods(): module.massPropsInMsg.subscribeTo(vcInMsg) module.rwSpeedsInMsg.subscribeTo(rwSpeedInMsg) module.rwParamsInMsg.subscribeTo(rwConfigInMsg) - module.gyrBuffInMsgName.subscribeTo(gyroInMsg) + module.gyrBuffInMsg.subscribeTo(gyroInMsg) # Star Tracker Read Message and Order method unitTestSim.InitializeSimulation() @@ -272,7 +272,7 @@ def stateUpdateInertialAttitude(show_plots): module.massPropsInMsg.subscribeTo(vcInMsg) module.rwSpeedsInMsg.subscribeTo(rwSpeedInMsg) module.rwParamsInMsg.subscribeTo(rwConfigInMsg) - module.gyrBuffInMsgName.subscribeTo(gyroInMsg) + module.gyrBuffInMsg.subscribeTo(gyroInMsg) unitTestSim.InitializeSimulation() @@ -410,7 +410,7 @@ def statePropInertialAttitude(show_plots): module.massPropsInMsg.subscribeTo(vcInMsg) module.rwSpeedsInMsg.subscribeTo(rwSpeedInMsg) module.rwParamsInMsg.subscribeTo(rwConfigInMsg) - module.gyrBuffInMsgName.subscribeTo(gyroInMsg) + module.gyrBuffInMsg.subscribeTo(gyroInMsg) unitTestSim.InitializeSimulation() @@ -519,7 +519,7 @@ def stateUpdateRWInertialAttitude(show_plots): module.massPropsInMsg.subscribeTo(vcInMsg) module.rwSpeedsInMsg.subscribeTo(rwSpeedInMsg) module.rwParamsInMsg.subscribeTo(rwConfigInMsg) - module.gyrBuffInMsgName.subscribeTo(gyroInMsg) + module.gyrBuffInMsg.subscribeTo(gyroInMsg) unitTestSim.InitializeSimulation() @@ -691,7 +691,7 @@ def statePropRateInertialAttitude(show_plots): module.massPropsInMsg.subscribeTo(vcInMsg) module.rwSpeedsInMsg.subscribeTo(rwSpeedInMsg) module.rwParamsInMsg.subscribeTo(rwConfigInMsg) - module.gyrBuffInMsgName.subscribeTo(gyroInMsg) + module.gyrBuffInMsg.subscribeTo(gyroInMsg) unitTestSim.InitializeSimulation() st1InMsg.write(stMessage1, int(1 * 1E9)) @@ -821,25 +821,6 @@ def faultScenarios(show_plots): STList = [ST1Data] - # make input messages but don't write to them - # rwSpeedInMsg = messaging.RWSpeedMsg() - # rwConfigInMsg = messaging.RWArrayConfigMsg() - # gyroInMsg = messaging.AccDataMsg() - - # connect messages - # moduleConfig.STDatasStruct.STMessages[0].stInMsg.subscribeTo(st1InMsg) - # moduleConfig.massPropsInMsg.subscribeTo(vcInMsg) - # moduleConfig.rwSpeedsInMsg.subscribeTo(rwSpeedInMsg) - # moduleConfig.rwParamsInMsg.subscribeTo(rwConfigInMsg) - # moduleConfig.gyrBuffInMsgName.subscribeTo(gyroInMsg) - # - # moduleConfigClean1.navStateOutMsgName = "inertial_state_estimate" - # moduleConfigClean1.filtDataOutMsgName = "inertial_filter_data" - # moduleConfigClean1.massPropsInMsgName = "adcs_config_data" - # moduleConfigClean1.rwSpeedsInMsgName = "reactionwheel_output_states" - # moduleConfigClean1.rwParamsInMsgName = "rwa_config_data_parsed" - # moduleConfigClean1.gyrBuffInMsgName = "gyro_buffer_data" - moduleConfigClean1.alpha = 0.02 moduleConfigClean1.beta = 2.0 moduleConfigClean1.kappa = 0.0 diff --git a/src/fswAlgorithms/attDetermination/InertialUKF/inertialUKF.c b/src/fswAlgorithms/attDetermination/InertialUKF/inertialUKF.c index ec324409da..a938c1a038 100644 --- a/src/fswAlgorithms/attDetermination/InertialUKF/inertialUKF.c +++ b/src/fswAlgorithms/attDetermination/InertialUKF/inertialUKF.c @@ -62,8 +62,8 @@ void Reset_inertialUKF(InertialUKFConfig *configData, uint64_t callTime, if (!RWSpeedMsg_C_isLinked(&configData->rwSpeedsInMsg)) { _bskLog(configData->bskLogger, BSK_ERROR, "Error: inertialUKF.rwSpeedsInMsg wasn't connected."); } - if (!AccDataMsg_C_isLinked(&configData->gyrBuffInMsgName)) { - _bskLog(configData->bskLogger, BSK_ERROR, "Error: inertialUKF.gyrBuffInMsgName wasn't connected."); + if (!AccDataMsg_C_isLinked(&configData->gyrBuffInMsg)) { + _bskLog(configData->bskLogger, BSK_ERROR, "Error: inertialUKF.gyrBuffInMsg wasn't connected."); } /*! - Read static RW config data message and store it in module variables */ @@ -208,7 +208,7 @@ void Update_inertialUKF(InertialUKFConfig *configData, uint64_t callTime, /* read input messages */ configData->localConfigData = VehicleConfigMsg_C_read(&configData->massPropsInMsg); - gyrBuffer = AccDataMsg_C_read(&configData->gyrBuffInMsgName); + gyrBuffer = AccDataMsg_C_read(&configData->gyrBuffInMsg); configData->rwSpeeds = RWSpeedMsg_C_read(&configData->rwSpeedsInMsg); timeOfRWSpeeds = RWSpeedMsg_C_timeWritten(&configData->rwSpeedsInMsg); Read_STMessages(configData); diff --git a/src/fswAlgorithms/attDetermination/InertialUKF/inertialUKF.h b/src/fswAlgorithms/attDetermination/InertialUKF/inertialUKF.h index 36787bfa07..93ab18ec61 100644 --- a/src/fswAlgorithms/attDetermination/InertialUKF/inertialUKF.h +++ b/src/fswAlgorithms/attDetermination/InertialUKF/inertialUKF.h @@ -57,7 +57,7 @@ typedef struct { VehicleConfigMsg_C massPropsInMsg; //!< [-] The name of the mass props message RWArrayConfigMsg_C rwParamsInMsg; //!< The name of the RWConfigParams input message RWSpeedMsg_C rwSpeedsInMsg; //!< [-] The name of the input RW speeds message - AccDataMsg_C gyrBuffInMsgName; //!< [-] Input message buffer from MIRU + AccDataMsg_C gyrBuffInMsg; //!< [-] Input message buffer from MIRU size_t numStates; //!< [-] Number of states for this filter diff --git a/src/fswAlgorithms/attDetermination/InertialUKF/inertialUKF.rst b/src/fswAlgorithms/attDetermination/InertialUKF/inertialUKF.rst index e2803b5e78..ce599cfa72 100644 --- a/src/fswAlgorithms/attDetermination/InertialUKF/inertialUKF.rst +++ b/src/fswAlgorithms/attDetermination/InertialUKF/inertialUKF.rst @@ -34,7 +34,7 @@ provides information on what this message is used for. * - rwSpeedsInMsg - :ref:`RWSpeedMsgPayload` - reaction wheel speed input message. Can be an empty message if no RW are included. - * - gyrBuffInMsgName + * - gyrBuffInMsg - :ref:`AccDataMsgPayload` - rate gyro input message diff --git a/src/fswAlgorithms/attDetermination/headingSuKF/_Documentation/BasiliskReportMemo.cls b/src/fswAlgorithms/attDetermination/headingSuKF/_Documentation/BasiliskReportMemo.cls new file mode 100755 index 0000000000..ff4b4ccf33 --- /dev/null +++ b/src/fswAlgorithms/attDetermination/headingSuKF/_Documentation/BasiliskReportMemo.cls @@ -0,0 +1,121 @@ +\NeedsTeXFormat{LaTeX2e}[1994/06/01] +\ProvidesClass{IAC}[2015/03/30 v1.0 AVS Lab Software document class] +\typeout{TYPESETTING in AVS Lab Software Report...} + +\LoadClass[titlepage,11pt]{article} + +% +% Load in required packages +% +\RequirePackage{graphicx} +\RequirePackage{bm} +\RequirePackage{overcite} +\RequirePackage{amssymb} +\RequirePackage{amsmath} +\RequirePackage{subfigure} +\RequirePackage{longtable} +\RequirePackage{mathabx} +\RequirePackage{mathtools} +\RequirePackage{color} +\RequirePackage[normalem]{ulem} +\RequirePackage{lastpage} +%\RequirePackage[original,runin]{abstract} +\RequirePackage[total={6.5in,9in},top=1in, left=1in]{geometry} +\RequirePackage[colorlinks=false,hyperfootnotes=false]{hyperref} +\RequirePackage{url} +\RequirePackage{titling} +\RequirePackage[compact]{titlesec} +\RequirePackage[margin=0pt,font=small,labelfont=bf,labelsep=colon,indention=1.5em]{caption} +%\RequirePackage{ragged2e} +\RequirePackage[perpage,ragged,hang]{footmisc} +\RequirePackage[absolute]{textpos} + +\renewcommand*{\familydefault}{\sfdefault} +\renewcommand*{\thefootnote}{\fnsymbol{footnote}} + + +% +% setup header and footers +% +\RequirePackage{fancyhdr} +\fancyhead{} +\fancyfoot{} +\fancyhead[L]{\footnotesize Doc. ID: Basilisk-\ModuleName} +\fancyhead[R]{\footnotesize Page \thepage \ of \pageref{LastPage}} +\renewcommand{\headrulewidth}{0pt} +\renewcommand{\footrulewidth}{0pt} + +\setcounter{secnumdepth}{5} +\setcounter{tocdepth}{5} + + +% +% setup makeCover command +% +\newcommand{\makeCover}{ + +\begin{textblock*}{6.625in}(2.25in,0.975in) + \includegraphics[width=3.5in]{Figures/Basilisk-Logo.pdf} +\end{textblock*} + + + +\begin{textblock*}{6.5in}(1in,3.5in) +\centering +\LARGE\bfseries \noindent \submiterInstitute\\ +\vskip 0.1in +\noindent Basilisk Technical Memorandum\\ +\large\noindent Document ID: Basilisk-\ModuleName\\ +\vskip 0.1in +\noindent \MakeUppercase{\subject} +\end{textblock*} + +~\\ +\vskip 4.25in +{\renewcommand{\arraystretch}{2} +\noindent +\begin{tabular}{|p{1.6in}|p{4.7in}|} +\hline +~Prepared by & \preparer\\ +\hline +\end{tabular} +} +\vskip 0.2in + +{\renewcommand{\arraystretch}{2} +\noindent +\begin{tabular}{|p{6.46in}|} +\hline +~{\bfseries Status:}~~ \status \\ +\hline +~{\bfseries Scope/Contents} \\ +\hline +\summary \\ +\hline +\end{tabular} +} +\vskip 0.2in +} + +% +% setup float environment spacing +% +\setlength\textfloatsep{5pt} +\setlength{\abovecaptionskip}{3pt} +\renewcommand{\figurename}{Fig.} + +% +% cancel the date formatting +% +\date{} + + +% +% Rename the Bibliography section label +% +\renewcommand{\refname}{REFERENCES} + +% +% Miscellaneous definitions +% + diff --git a/src/fswAlgorithms/attDetermination/headingSuKF/_Documentation/heading_SuKF.pdf b/src/fswAlgorithms/attDetermination/headingSuKF/_Documentation/heading_SuKF.pdf index 0911392fb3..18a4cf4db6 100644 Binary files a/src/fswAlgorithms/attDetermination/headingSuKF/_Documentation/heading_SuKF.pdf and b/src/fswAlgorithms/attDetermination/headingSuKF/_Documentation/heading_SuKF.pdf differ diff --git a/src/fswAlgorithms/attDetermination/headingSuKF/_Documentation/heading_SuKF.tex b/src/fswAlgorithms/attDetermination/headingSuKF/_Documentation/heading_SuKF.tex index 418f6d0336..b5fccedc8b 100644 --- a/src/fswAlgorithms/attDetermination/headingSuKF/_Documentation/heading_SuKF.tex +++ b/src/fswAlgorithms/attDetermination/headingSuKF/_Documentation/heading_SuKF.tex @@ -164,13 +164,6 @@ \subsection{User initialization} \texttt{Filter.state =[0.0, 0.0, 1.0, 0.0, 0.0]} \end{itemize} -The messages must also be set as such: - -\begin{itemize} -\item \texttt{ filterObject.opnavOutMsgName = "opnav\_state\_estimate"} -\item \texttt{ filterObject.filtDataOutMsgName = "heading$\_$filter$\_$data"} -\item \texttt{ filterObject.opnavDataInMsgName = "opnav\_sensor\_data"} -\end{itemize} \subsection{Inputs and Outputs} diff --git a/src/fswAlgorithms/attDetermination/okeefeEKF/_Documentation/BasiliskReportMemo.cls b/src/fswAlgorithms/attDetermination/okeefeEKF/_Documentation/BasiliskReportMemo.cls new file mode 100755 index 0000000000..ff4b4ccf33 --- /dev/null +++ b/src/fswAlgorithms/attDetermination/okeefeEKF/_Documentation/BasiliskReportMemo.cls @@ -0,0 +1,121 @@ +\NeedsTeXFormat{LaTeX2e}[1994/06/01] +\ProvidesClass{IAC}[2015/03/30 v1.0 AVS Lab Software document class] +\typeout{TYPESETTING in AVS Lab Software Report...} + +\LoadClass[titlepage,11pt]{article} + +% +% Load in required packages +% +\RequirePackage{graphicx} +\RequirePackage{bm} +\RequirePackage{overcite} +\RequirePackage{amssymb} +\RequirePackage{amsmath} +\RequirePackage{subfigure} +\RequirePackage{longtable} +\RequirePackage{mathabx} +\RequirePackage{mathtools} +\RequirePackage{color} +\RequirePackage[normalem]{ulem} +\RequirePackage{lastpage} +%\RequirePackage[original,runin]{abstract} +\RequirePackage[total={6.5in,9in},top=1in, left=1in]{geometry} +\RequirePackage[colorlinks=false,hyperfootnotes=false]{hyperref} +\RequirePackage{url} +\RequirePackage{titling} +\RequirePackage[compact]{titlesec} +\RequirePackage[margin=0pt,font=small,labelfont=bf,labelsep=colon,indention=1.5em]{caption} +%\RequirePackage{ragged2e} +\RequirePackage[perpage,ragged,hang]{footmisc} +\RequirePackage[absolute]{textpos} + +\renewcommand*{\familydefault}{\sfdefault} +\renewcommand*{\thefootnote}{\fnsymbol{footnote}} + + +% +% setup header and footers +% +\RequirePackage{fancyhdr} +\fancyhead{} +\fancyfoot{} +\fancyhead[L]{\footnotesize Doc. ID: Basilisk-\ModuleName} +\fancyhead[R]{\footnotesize Page \thepage \ of \pageref{LastPage}} +\renewcommand{\headrulewidth}{0pt} +\renewcommand{\footrulewidth}{0pt} + +\setcounter{secnumdepth}{5} +\setcounter{tocdepth}{5} + + +% +% setup makeCover command +% +\newcommand{\makeCover}{ + +\begin{textblock*}{6.625in}(2.25in,0.975in) + \includegraphics[width=3.5in]{Figures/Basilisk-Logo.pdf} +\end{textblock*} + + + +\begin{textblock*}{6.5in}(1in,3.5in) +\centering +\LARGE\bfseries \noindent \submiterInstitute\\ +\vskip 0.1in +\noindent Basilisk Technical Memorandum\\ +\large\noindent Document ID: Basilisk-\ModuleName\\ +\vskip 0.1in +\noindent \MakeUppercase{\subject} +\end{textblock*} + +~\\ +\vskip 4.25in +{\renewcommand{\arraystretch}{2} +\noindent +\begin{tabular}{|p{1.6in}|p{4.7in}|} +\hline +~Prepared by & \preparer\\ +\hline +\end{tabular} +} +\vskip 0.2in + +{\renewcommand{\arraystretch}{2} +\noindent +\begin{tabular}{|p{6.46in}|} +\hline +~{\bfseries Status:}~~ \status \\ +\hline +~{\bfseries Scope/Contents} \\ +\hline +\summary \\ +\hline +\end{tabular} +} +\vskip 0.2in +} + +% +% setup float environment spacing +% +\setlength\textfloatsep{5pt} +\setlength{\abovecaptionskip}{3pt} +\renewcommand{\figurename}{Fig.} + +% +% cancel the date formatting +% +\date{} + + +% +% Rename the Bibliography section label +% +\renewcommand{\refname}{REFERENCES} + +% +% Miscellaneous definitions +% + diff --git a/src/fswAlgorithms/attDetermination/okeefeEKF/_Documentation/Okeefe_EKF.pdf b/src/fswAlgorithms/attDetermination/okeefeEKF/_Documentation/Okeefe_EKF.pdf index 3a13e20a12..42fe069c87 100644 Binary files a/src/fswAlgorithms/attDetermination/okeefeEKF/_Documentation/Okeefe_EKF.pdf and b/src/fswAlgorithms/attDetermination/okeefeEKF/_Documentation/Okeefe_EKF.pdf differ diff --git a/src/fswAlgorithms/attDetermination/okeefeEKF/_Documentation/Okeefe_EKF.tex b/src/fswAlgorithms/attDetermination/okeefeEKF/_Documentation/Okeefe_EKF.tex index 9f48958d95..dab596a3a6 100644 --- a/src/fswAlgorithms/attDetermination/okeefeEKF/_Documentation/Okeefe_EKF.tex +++ b/src/fswAlgorithms/attDetermination/okeefeEKF/_Documentation/Okeefe_EKF.tex @@ -121,14 +121,6 @@ \subsection{User initialization} \texttt{Filter.state = [1., 0., 1.]} \end{itemize} -The messages must also be set as such: - -\begin{itemize} -\item \texttt{ filterObject.navStateOutMsgName = "sunline$\_$state$\_$estimate"} -\item \texttt{ filterObject.filtDataOutMsgName = "sunline$\_$filter$\_$data"} -\item \texttt{ filterObject.cssDataInMsgName = "css$\_$sensors$\_$data"} -\item \texttt{ filterObject.cssConfInMsgName = "css$\_$config$\_$data"} -\end{itemize} \subsection{Inputs and Outputs} diff --git a/src/fswAlgorithms/attDetermination/sunlineEKF/_Documentation/BasiliskReportMemo.cls b/src/fswAlgorithms/attDetermination/sunlineEKF/_Documentation/BasiliskReportMemo.cls new file mode 100755 index 0000000000..99f2790fa3 --- /dev/null +++ b/src/fswAlgorithms/attDetermination/sunlineEKF/_Documentation/BasiliskReportMemo.cls @@ -0,0 +1,124 @@ +\NeedsTeXFormat{LaTeX2e}[1994/06/01] +\ProvidesClass{BasiliskReportMemo}[2015/03/30 v1.0 AVS Lab Software document class] +\typeout{TYPESETTING in BSK Technical Report...} + +\LoadClass[titlepage,11pt]{article} + +% +% Load in required packages +% +\RequirePackage{graphicx} +\RequirePackage{bm} +\RequirePackage{overcite} +\RequirePackage{amssymb} +\RequirePackage{amsmath} +\RequirePackage{subfigure} +\RequirePackage{longtable} +\RequirePackage{mathabx} +\RequirePackage{mathtools} +\RequirePackage{color} +\RequirePackage[normalem]{ulem} +\RequirePackage{lastpage} +\usepackage{listings} +%\RequirePackage[original,runin]{abstract} +\RequirePackage[total={6.5in,9in},top=1in, left=1in]{geometry} +\RequirePackage[colorlinks=true,linkcolor=MidnightBlue, + urlcolor=MidnightBlue, + citecolor=MidnightBlue,hyperfootnotes=false]{hyperref} +\RequirePackage{url} +\RequirePackage{titling} +\RequirePackage[compact]{titlesec} +\RequirePackage[margin=0pt,font=small,labelfont=bf,labelsep=colon,indention=1.5em]{caption} +%\RequirePackage{ragged2e} +\RequirePackage[perpage,ragged,hang]{footmisc} +\RequirePackage[absolute]{textpos} + +\renewcommand*{\familydefault}{\sfdefault} +\renewcommand*{\thefootnote}{\fnsymbol{footnote}} + + +% +% setup header and footers +% +\RequirePackage{fancyhdr} +\fancyhead{} +\fancyfoot{} +\fancyhead[L]{\footnotesize Doc. ID: Basilisk-\ModuleName} +\fancyhead[R]{\footnotesize Page \thepage \ of \pageref{LastPage}} +\renewcommand{\headrulewidth}{0pt} +\renewcommand{\footrulewidth}{0pt} + +\setcounter{secnumdepth}{5} +\setcounter{tocdepth}{5} + + +% +% setup makeCover command +% +\newcommand{\makeCover}{ + +\begin{textblock*}{6.625in}(2.25in,0.975in) + \includegraphics[width=3.5in]{Figures/Basilisk-Logo.pdf} +\end{textblock*} + + + +\begin{textblock*}{6.5in}(1in,3.5in) +\centering +\LARGE\bfseries \noindent \submiterInstitute\\ +\vskip 0.1in +\noindent Basilisk Technical Memorandum\\ +\large\noindent Document ID: Basilisk-\ModuleName\\ +\vskip 0.1in +\noindent \MakeUppercase{\subject} +\end{textblock*} + +~\\ +\vskip 4.25in +{\renewcommand{\arraystretch}{2} +\noindent +\begin{tabular}{|p{1.6in}|p{4.7in}|} +\hline +~Prepared by & \preparer\\ +\hline +\end{tabular} +} +\vskip 0.2in + +{\renewcommand{\arraystretch}{2} +\noindent +\begin{tabular}{|p{6.46in}|} +\hline +~{\bfseries Status:}~~ \status \\ +\hline +~{\bfseries Scope/Contents} \\ +\hline +\summary \\ +\hline +\end{tabular} +} +\vskip 0.2in +} + +% +% setup float environment spacing +% +\setlength\textfloatsep{5pt} +\setlength{\abovecaptionskip}{3pt} +\renewcommand{\figurename}{Fig.} + +% +% cancel the date formatting +% +\date{} + + +% +% Rename the Bibliography section label +% +\renewcommand{\refname}{REFERENCES} + +% +% Miscellaneous definitions +% + diff --git a/src/fswAlgorithms/attDetermination/sunlineEKF/_Documentation/Sunline_EKF.pdf b/src/fswAlgorithms/attDetermination/sunlineEKF/_Documentation/Sunline_EKF.pdf index 318fa565d5..2b3fcc1557 100644 Binary files a/src/fswAlgorithms/attDetermination/sunlineEKF/_Documentation/Sunline_EKF.pdf and b/src/fswAlgorithms/attDetermination/sunlineEKF/_Documentation/Sunline_EKF.pdf differ diff --git a/src/fswAlgorithms/attDetermination/sunlineEKF/_Documentation/Sunline_EKF.tex b/src/fswAlgorithms/attDetermination/sunlineEKF/_Documentation/Sunline_EKF.tex index 41c0dd16b9..6dc1d0d599 100644 --- a/src/fswAlgorithms/attDetermination/sunlineEKF/_Documentation/Sunline_EKF.tex +++ b/src/fswAlgorithms/attDetermination/sunlineEKF/_Documentation/Sunline_EKF.tex @@ -121,15 +121,6 @@ \subsection{User initialization} \end{itemize} -The messages must also be set as such: - -\begin{itemize} -\item \texttt{ filterObject.navStateOutMsgName = "sunline$\_$state$\_$estimate"} -\item \texttt{ filterObject.filtDataOutMsgName = "sunline$\_$filter$\_$data"} -\item \texttt{ filterObject.cssDataInMsgName = "css$\_$sensors$\_$data"} -\item \texttt{ filterObject.cssConfInMsgName = "css$\_$config$\_$data"} -\end{itemize} - \subsection{Inputs and Outputs} The EKF reads in the measurements from the coarse sun sensors. These are under the form of a list of cosine values. Knowing the normals to each of the sensors, we can therefore use them to estimate sun heading. diff --git a/src/fswAlgorithms/attDetermination/sunlineEphem/_Documentation/Basilisk-SunlineEphem-20181204.pdf b/src/fswAlgorithms/attDetermination/sunlineEphem/_Documentation/Basilisk-SunlineEphem-20181204.pdf index 9ec1c2eadb..081d94e7e0 100644 Binary files a/src/fswAlgorithms/attDetermination/sunlineEphem/_Documentation/Basilisk-SunlineEphem-20181204.pdf and b/src/fswAlgorithms/attDetermination/sunlineEphem/_Documentation/Basilisk-SunlineEphem-20181204.pdf differ diff --git a/src/fswAlgorithms/attDetermination/sunlineEphem/_Documentation/secTest.tex b/src/fswAlgorithms/attDetermination/sunlineEphem/_Documentation/secTest.tex index 223796298f..aa95217479 100644 --- a/src/fswAlgorithms/attDetermination/sunlineEphem/_Documentation/secTest.tex +++ b/src/fswAlgorithms/attDetermination/sunlineEphem/_Documentation/secTest.tex @@ -17,7 +17,7 @@ \section{Test Parameters} \hline\hline \textbf{Output Value Tested} & \textbf{Tolerated Error} \\ \hline - {\tt estVector} & \input{AutoTeX/toleranceValue} \\ + {\tt estVector} & see script \\ \hline\hline \end{tabular} \end{table} @@ -25,27 +25,27 @@ \section{Test Parameters} -\section{Test Results} - - -All of the tests passed: -\begin{table}[H] - \caption{Test results} - \label{tab:results} - \centering \fontsize{10}{10}\selectfont - \begin{tabular}{c | c } % Column formatting, - \hline\hline - \textbf{Check} &\textbf{Pass/Fail} \\ - \hline - 1 & \input{AutoTeX/passFail11} \\ - 2 & \input{AutoTeX/passFail13} \\ - 3 & \input{AutoTeX/passFail22} \\ - 4 & \input{AutoTeX/passFail11} \\ - 5 & \input{AutoTeX/passFail13} \\ - 6 & \input{AutoTeX/passFail22} \\ - \hline\hline - \end{tabular} -\end{table} +%\section{Test Results} +% +% +%All of the tests passed: +%\begin{table}[H] +% \caption{Test results} +% \label{tab:results} +% \centering \fontsize{10}{10}\selectfont +% \begin{tabular}{c | c } % Column formatting, +% \hline\hline +% \textbf{Check} &\textbf{Pass/Fail} \\ +% \hline +%% 1 & \input{AutoTeX/passFail11} \\ +%% 2 & \input{AutoTeX/passFail13} \\ +%% 3 & \input{AutoTeX/passFail22} \\ +%% 4 & \input{AutoTeX/passFail11} \\ +%% 5 & \input{AutoTeX/passFail13} \\ +% 6 & \input{AutoTeX/passFail22} \\ +% \hline\hline +% \end{tabular} +%\end{table} diff --git a/src/fswAlgorithms/attDetermination/sunlineEphem/_Documentation/secUserGuide.tex b/src/fswAlgorithms/attDetermination/sunlineEphem/_Documentation/secUserGuide.tex index 8790899cce..d3ec487ee8 100644 --- a/src/fswAlgorithms/attDetermination/sunlineEphem/_Documentation/secUserGuide.tex +++ b/src/fswAlgorithms/attDetermination/sunlineEphem/_Documentation/secUserGuide.tex @@ -1,11 +1,3 @@ % !TEX root = ./Basilisk-SunlineEphem-20181204.tex \section{User Guide} -The messages must be set as such: - -\begin{itemize} -\item \texttt{sunlineEphemConfig.scPositionInMsgName = "simple$\_$trans$\_$nav$\_$output"} -\item \texttt{sunlineEphemConfig.scAttitudeInMsgName = "simple$\_$att$\_$nav$\_$output"} -\item \texttt{sunlineEphemConfig.sunPositionInMsgName = "sun$\_$position$\_$output"} -\item \texttt{sunlineEphemConfig.navStateOutMsgName = "sunline$\_$ephem$\_$output"} -\end{itemize} \ No newline at end of file diff --git a/src/fswAlgorithms/attDetermination/sunlineSEKF/_Documentation/BasiliskReportMemo.cls b/src/fswAlgorithms/attDetermination/sunlineSEKF/_Documentation/BasiliskReportMemo.cls new file mode 100755 index 0000000000..ff4b4ccf33 --- /dev/null +++ b/src/fswAlgorithms/attDetermination/sunlineSEKF/_Documentation/BasiliskReportMemo.cls @@ -0,0 +1,121 @@ +\NeedsTeXFormat{LaTeX2e}[1994/06/01] +\ProvidesClass{IAC}[2015/03/30 v1.0 AVS Lab Software document class] +\typeout{TYPESETTING in AVS Lab Software Report...} + +\LoadClass[titlepage,11pt]{article} + +% +% Load in required packages +% +\RequirePackage{graphicx} +\RequirePackage{bm} +\RequirePackage{overcite} +\RequirePackage{amssymb} +\RequirePackage{amsmath} +\RequirePackage{subfigure} +\RequirePackage{longtable} +\RequirePackage{mathabx} +\RequirePackage{mathtools} +\RequirePackage{color} +\RequirePackage[normalem]{ulem} +\RequirePackage{lastpage} +%\RequirePackage[original,runin]{abstract} +\RequirePackage[total={6.5in,9in},top=1in, left=1in]{geometry} +\RequirePackage[colorlinks=false,hyperfootnotes=false]{hyperref} +\RequirePackage{url} +\RequirePackage{titling} +\RequirePackage[compact]{titlesec} +\RequirePackage[margin=0pt,font=small,labelfont=bf,labelsep=colon,indention=1.5em]{caption} +%\RequirePackage{ragged2e} +\RequirePackage[perpage,ragged,hang]{footmisc} +\RequirePackage[absolute]{textpos} + +\renewcommand*{\familydefault}{\sfdefault} +\renewcommand*{\thefootnote}{\fnsymbol{footnote}} + + +% +% setup header and footers +% +\RequirePackage{fancyhdr} +\fancyhead{} +\fancyfoot{} +\fancyhead[L]{\footnotesize Doc. ID: Basilisk-\ModuleName} +\fancyhead[R]{\footnotesize Page \thepage \ of \pageref{LastPage}} +\renewcommand{\headrulewidth}{0pt} +\renewcommand{\footrulewidth}{0pt} + +\setcounter{secnumdepth}{5} +\setcounter{tocdepth}{5} + + +% +% setup makeCover command +% +\newcommand{\makeCover}{ + +\begin{textblock*}{6.625in}(2.25in,0.975in) + \includegraphics[width=3.5in]{Figures/Basilisk-Logo.pdf} +\end{textblock*} + + + +\begin{textblock*}{6.5in}(1in,3.5in) +\centering +\LARGE\bfseries \noindent \submiterInstitute\\ +\vskip 0.1in +\noindent Basilisk Technical Memorandum\\ +\large\noindent Document ID: Basilisk-\ModuleName\\ +\vskip 0.1in +\noindent \MakeUppercase{\subject} +\end{textblock*} + +~\\ +\vskip 4.25in +{\renewcommand{\arraystretch}{2} +\noindent +\begin{tabular}{|p{1.6in}|p{4.7in}|} +\hline +~Prepared by & \preparer\\ +\hline +\end{tabular} +} +\vskip 0.2in + +{\renewcommand{\arraystretch}{2} +\noindent +\begin{tabular}{|p{6.46in}|} +\hline +~{\bfseries Status:}~~ \status \\ +\hline +~{\bfseries Scope/Contents} \\ +\hline +\summary \\ +\hline +\end{tabular} +} +\vskip 0.2in +} + +% +% setup float environment spacing +% +\setlength\textfloatsep{5pt} +\setlength{\abovecaptionskip}{3pt} +\renewcommand{\figurename}{Fig.} + +% +% cancel the date formatting +% +\date{} + + +% +% Rename the Bibliography section label +% +\renewcommand{\refname}{REFERENCES} + +% +% Miscellaneous definitions +% + diff --git a/src/fswAlgorithms/attDetermination/sunlineSEKF/_Documentation/Sunline_SEKF.pdf b/src/fswAlgorithms/attDetermination/sunlineSEKF/_Documentation/Sunline_SEKF.pdf index f64c38f5c1..ec7142ee29 100644 Binary files a/src/fswAlgorithms/attDetermination/sunlineSEKF/_Documentation/Sunline_SEKF.pdf and b/src/fswAlgorithms/attDetermination/sunlineSEKF/_Documentation/Sunline_SEKF.pdf differ diff --git a/src/fswAlgorithms/attDetermination/sunlineSEKF/_Documentation/Sunline_SEKF.tex b/src/fswAlgorithms/attDetermination/sunlineSEKF/_Documentation/Sunline_SEKF.tex index a738ec2135..fd04f0de83 100644 --- a/src/fswAlgorithms/attDetermination/sunlineSEKF/_Documentation/Sunline_SEKF.tex +++ b/src/fswAlgorithms/attDetermination/sunlineSEKF/_Documentation/Sunline_SEKF.tex @@ -202,14 +202,6 @@ \subsection{User initialization} \texttt{Filter.state =[0.0, 0.0, 1.0, 0.0, 0.0]} \end{itemize} -The messages must also be set as such: - -\begin{itemize} -\item \texttt{ filterObject.navStateOutMsgName = "sunline$\_$state$\_$estimate"} -\item \texttt{ filterObject.filtDataOutMsgName = "sunline$\_$filter$\_$data"} -\item \texttt{ filterObject.cssDataInMsgName = "css$\_$sensors$\_$data"} -\item \texttt{ filterObject.cssConfInMsgName = "css$\_$config$\_$data"} -\end{itemize} \subsection{Inputs and Outputs} diff --git a/src/fswAlgorithms/attDetermination/sunlineSuKF/_Documentation/Sunline_SuKF.pdf b/src/fswAlgorithms/attDetermination/sunlineSuKF/_Documentation/Sunline_SuKF.pdf index e2b6425434..cf0bd4996a 100644 Binary files a/src/fswAlgorithms/attDetermination/sunlineSuKF/_Documentation/Sunline_SuKF.pdf and b/src/fswAlgorithms/attDetermination/sunlineSuKF/_Documentation/Sunline_SuKF.pdf differ diff --git a/src/fswAlgorithms/attDetermination/sunlineSuKF/_Documentation/Sunline_SuKF.tex b/src/fswAlgorithms/attDetermination/sunlineSuKF/_Documentation/Sunline_SuKF.tex index 5d78fb82cf..b69a93cc78 100644 --- a/src/fswAlgorithms/attDetermination/sunlineSuKF/_Documentation/Sunline_SuKF.tex +++ b/src/fswAlgorithms/attDetermination/sunlineSuKF/_Documentation/Sunline_SuKF.tex @@ -164,14 +164,6 @@ \subsection{User initialization} \texttt{Filter.state =[0.0, 0.0, 1.0, 0.0, 0.0]} \end{itemize} -The messages must also be set as such: - -\begin{itemize} -\item \texttt{ filterObject.navStateOutMsgName = "sunline$\_$state$\_$estimate"} -\item \texttt{ filterObject.filtDataOutMsgName = "sunline$\_$filter$\_$data"} -\item \texttt{ filterObject.cssDataInMsgName = "css$\_$sensors$\_$data"} -\item \texttt{ filterObject.cssConfInMsgName = "css$\_$config$\_$data"} -\end{itemize} \subsection{Inputs and Outputs} @@ -222,7 +214,7 @@ \subsection{Individual tests} \subsection{Static Propagation} -\input{AutoTeX/StatesPlotprop.tex} +%\input{AutoTeX/StatesPlotprop.tex} This test also takes no measurements in, and propagates with the expectation of no change. It then tests that the states and covariance are as expected throughout the time of simulation. Plotted results are seen in Figure \ref{fig:StatesPlotprop}. We indeed see that the state and covariance that evolve nominally and without bias . @@ -241,8 +233,8 @@ \subsection{Full Filter test} Figure \ref{fig:PostFitupdate} shows the post fit residuals for the filter, with no measurement noise. We see that the observations are read in well an that the residuals are brought back down to zero. -\input{AutoTeX/StatesPlotupdate.tex} -\input{AutoTeX/PostFitupdate.tex} +%\input{AutoTeX/StatesPlotupdate.tex} +%\input{AutoTeX/PostFitupdate.tex} \bibliographystyle{AAS_publication} % Number the references. diff --git a/src/fswAlgorithms/attDetermination/sunlineUKF/_Documentation/BasiliskReportMemo.cls b/src/fswAlgorithms/attDetermination/sunlineUKF/_Documentation/BasiliskReportMemo.cls new file mode 100755 index 0000000000..ff4b4ccf33 --- /dev/null +++ b/src/fswAlgorithms/attDetermination/sunlineUKF/_Documentation/BasiliskReportMemo.cls @@ -0,0 +1,121 @@ +\NeedsTeXFormat{LaTeX2e}[1994/06/01] +\ProvidesClass{IAC}[2015/03/30 v1.0 AVS Lab Software document class] +\typeout{TYPESETTING in AVS Lab Software Report...} + +\LoadClass[titlepage,11pt]{article} + +% +% Load in required packages +% +\RequirePackage{graphicx} +\RequirePackage{bm} +\RequirePackage{overcite} +\RequirePackage{amssymb} +\RequirePackage{amsmath} +\RequirePackage{subfigure} +\RequirePackage{longtable} +\RequirePackage{mathabx} +\RequirePackage{mathtools} +\RequirePackage{color} +\RequirePackage[normalem]{ulem} +\RequirePackage{lastpage} +%\RequirePackage[original,runin]{abstract} +\RequirePackage[total={6.5in,9in},top=1in, left=1in]{geometry} +\RequirePackage[colorlinks=false,hyperfootnotes=false]{hyperref} +\RequirePackage{url} +\RequirePackage{titling} +\RequirePackage[compact]{titlesec} +\RequirePackage[margin=0pt,font=small,labelfont=bf,labelsep=colon,indention=1.5em]{caption} +%\RequirePackage{ragged2e} +\RequirePackage[perpage,ragged,hang]{footmisc} +\RequirePackage[absolute]{textpos} + +\renewcommand*{\familydefault}{\sfdefault} +\renewcommand*{\thefootnote}{\fnsymbol{footnote}} + + +% +% setup header and footers +% +\RequirePackage{fancyhdr} +\fancyhead{} +\fancyfoot{} +\fancyhead[L]{\footnotesize Doc. ID: Basilisk-\ModuleName} +\fancyhead[R]{\footnotesize Page \thepage \ of \pageref{LastPage}} +\renewcommand{\headrulewidth}{0pt} +\renewcommand{\footrulewidth}{0pt} + +\setcounter{secnumdepth}{5} +\setcounter{tocdepth}{5} + + +% +% setup makeCover command +% +\newcommand{\makeCover}{ + +\begin{textblock*}{6.625in}(2.25in,0.975in) + \includegraphics[width=3.5in]{Figures/Basilisk-Logo.pdf} +\end{textblock*} + + + +\begin{textblock*}{6.5in}(1in,3.5in) +\centering +\LARGE\bfseries \noindent \submiterInstitute\\ +\vskip 0.1in +\noindent Basilisk Technical Memorandum\\ +\large\noindent Document ID: Basilisk-\ModuleName\\ +\vskip 0.1in +\noindent \MakeUppercase{\subject} +\end{textblock*} + +~\\ +\vskip 4.25in +{\renewcommand{\arraystretch}{2} +\noindent +\begin{tabular}{|p{1.6in}|p{4.7in}|} +\hline +~Prepared by & \preparer\\ +\hline +\end{tabular} +} +\vskip 0.2in + +{\renewcommand{\arraystretch}{2} +\noindent +\begin{tabular}{|p{6.46in}|} +\hline +~{\bfseries Status:}~~ \status \\ +\hline +~{\bfseries Scope/Contents} \\ +\hline +\summary \\ +\hline +\end{tabular} +} +\vskip 0.2in +} + +% +% setup float environment spacing +% +\setlength\textfloatsep{5pt} +\setlength{\abovecaptionskip}{3pt} +\renewcommand{\figurename}{Fig.} + +% +% cancel the date formatting +% +\date{} + + +% +% Rename the Bibliography section label +% +\renewcommand{\refname}{REFERENCES} + +% +% Miscellaneous definitions +% + diff --git a/src/fswAlgorithms/attDetermination/sunlineUKF/_Documentation/Sunline_UKF.tex b/src/fswAlgorithms/attDetermination/sunlineUKF/_Documentation/Sunline_UKF.tex index 2b82de65ee..ac8e2231d2 100644 --- a/src/fswAlgorithms/attDetermination/sunlineUKF/_Documentation/Sunline_UKF.tex +++ b/src/fswAlgorithms/attDetermination/sunlineUKF/_Documentation/Sunline_UKF.tex @@ -115,14 +115,6 @@ \subsection{User initialization} \item The initial state :\\ \texttt{Filter.state =[1.0, 0.0, 0.0, 0.0, 0.0, 0.0]} \end{itemize} -The messages must also be set as such: - -\begin{itemize} -\item \texttt{ filterObject.navStateOutMsgName = "sunline$\_$state$\_$estimate"} -\item \texttt{ filterObject.filtDataOutMsgName = "sunline$\_$filter$\_$data"} -\item \texttt{ filterObject.cssDataInMsgName = "css$\_$sensors$\_$data"} -\item \texttt{ filterObject.cssConfInMsgName = "css$\_$config$\_$data"} -\end{itemize} \subsection{Inputs and Outputs} diff --git a/src/fswAlgorithms/attDetermination/sunlineUKF/_Documentation/Sunline_uKF.pdf b/src/fswAlgorithms/attDetermination/sunlineUKF/_Documentation/Sunline_uKF.pdf index dc8870adea..3df904df4b 100644 Binary files a/src/fswAlgorithms/attDetermination/sunlineUKF/_Documentation/Sunline_uKF.pdf and b/src/fswAlgorithms/attDetermination/sunlineUKF/_Documentation/Sunline_uKF.pdf differ diff --git a/src/fswAlgorithms/attGuidance/mrpRotation/_Documentation/Basilisk-MRPROTATION-20180522.pdf b/src/fswAlgorithms/attGuidance/mrpRotation/_Documentation/Basilisk-MRPROTATION-20180522.pdf index 496e8767a6..d467b3556e 100644 Binary files a/src/fswAlgorithms/attGuidance/mrpRotation/_Documentation/Basilisk-MRPROTATION-20180522.pdf and b/src/fswAlgorithms/attGuidance/mrpRotation/_Documentation/Basilisk-MRPROTATION-20180522.pdf differ diff --git a/src/fswAlgorithms/attGuidance/mrpRotation/_Documentation/secTest.tex b/src/fswAlgorithms/attGuidance/mrpRotation/_Documentation/secTest.tex index 4f0fc4035c..eef95e0b33 100644 --- a/src/fswAlgorithms/attGuidance/mrpRotation/_Documentation/secTest.tex +++ b/src/fswAlgorithms/attGuidance/mrpRotation/_Documentation/secTest.tex @@ -36,11 +36,11 @@ \section{Test Parameters} \hline\hline \textbf{Output Value Tested} & \textbf{Tolerated Error} \\ \hline - {\tt attRefOutMsgName.sigma\_RN} & \input{AutoTex/toleranceValue} \\ - {\tt attRefOutMsgName.omega\_RN\_N} & \input{AutoTex/toleranceValue} \\ - {\tt attRefOutMsgName.domega\_RN\_N} & \input{AutoTex/toleranceValue} \\ - {\tt attitudeOutMsgName.state} & \input{AutoTex/toleranceValue} \\ - {\tt attitudeOutMsgName.rate} & \input{AutoTex/toleranceValue} \\ + {\tt attRefOutMsg.sigma\_RN} & \input{AutoTex/toleranceValue} \\ + {\tt attRefOutMsg.omega\_RN\_N} & \input{AutoTex/toleranceValue} \\ + {\tt attRefOutMsg.domega\_RN\_N} & \input{AutoTex/toleranceValue} \\ + {\tt attitudeOutMsg.state} & \input{AutoTex/toleranceValue} \\ + {\tt attitudeOutMsg.rate} & \input{AutoTex/toleranceValue} \\ \hline\hline \end{tabular} \end{table} diff --git a/src/fswAlgorithms/effectorInterfaces/rwMotorVoltage/_Documentation/Basilisk-rwMotorVoltage-20170113.pdf b/src/fswAlgorithms/effectorInterfaces/rwMotorVoltage/_Documentation/Basilisk-rwMotorVoltage-20170113.pdf index a3ea8405fc..b0f905628b 100644 Binary files a/src/fswAlgorithms/effectorInterfaces/rwMotorVoltage/_Documentation/Basilisk-rwMotorVoltage-20170113.pdf and b/src/fswAlgorithms/effectorInterfaces/rwMotorVoltage/_Documentation/Basilisk-rwMotorVoltage-20170113.pdf differ diff --git a/src/fswAlgorithms/effectorInterfaces/rwMotorVoltage/_Documentation/secModelDescription.tex b/src/fswAlgorithms/effectorInterfaces/rwMotorVoltage/_Documentation/secModelDescription.tex index 3235efd1f9..c6cab84553 100644 --- a/src/fswAlgorithms/effectorInterfaces/rwMotorVoltage/_Documentation/secModelDescription.tex +++ b/src/fswAlgorithms/effectorInterfaces/rwMotorVoltage/_Documentation/secModelDescription.tex @@ -24,7 +24,7 @@ \subsection{Open-loop voltage conversion} \end{equation} \subsection{RW Availability} -If the input message name {\tt rwAvailInMsgName} is defined, then the RW availability message is read in. The voltage mapping is only performed if the individual RW availability setting is {\tt AVAILABLE}. If it is {\tt UNAVAILABLE} then the output voltage is set to zero. +If the input message name {\tt rwAvailInMsg} is defined, then the RW availability message is read in. The voltage mapping is only performed if the individual RW availability setting is {\tt AVAILABLE}. If it is {\tt UNAVAILABLE} then the output voltage is set to zero. \subsection{Closed-loop commanded torque tracking} diff --git a/src/fswAlgorithms/effectorInterfaces/rwMotorVoltage/_UnitTest/test_rwMotorVoltage.py b/src/fswAlgorithms/effectorInterfaces/rwMotorVoltage/_UnitTest/test_rwMotorVoltage.py index 50b38e343a..ce6f9a6ed8 100755 --- a/src/fswAlgorithms/effectorInterfaces/rwMotorVoltage/_UnitTest/test_rwMotorVoltage.py +++ b/src/fswAlgorithms/effectorInterfaces/rwMotorVoltage/_UnitTest/test_rwMotorVoltage.py @@ -87,10 +87,6 @@ def run(show_plots, useLargeVoltage, useAvailability, useTorqueLoop, testName): unitTestSim.AddModelToTask(unitTaskName, module) # Initialize the test module configuration data - # module.torqueInMsgName = "rw_torque_Lr" - # module.rwParamsInMsgName = "rw_parameters" - # module.voltageOutMsgName = "rw_volt_cmd" - # set module parameters module.VMin = 1.0 # Volts module.VMax = 11.0 # Volts diff --git a/src/fswAlgorithms/effectorInterfaces/thrFiringRemainder/thrFiringRemainder.h b/src/fswAlgorithms/effectorInterfaces/thrFiringRemainder/thrFiringRemainder.h index 59638e039d..d2c2a881f4 100755 --- a/src/fswAlgorithms/effectorInterfaces/thrFiringRemainder/thrFiringRemainder.h +++ b/src/fswAlgorithms/effectorInterfaces/thrFiringRemainder/thrFiringRemainder.h @@ -38,14 +38,14 @@ typedef struct { double thrMinFireTime; //!< [s] Minimum fire time int numThrusters; //!< [-] The number of thrusters available on vehicle double maxThrust[MAX_EFF_CNT]; //!< [N] Max thrust - int baseThrustState; //!< [-] Indicates on-pulsing (0) or off-pusling (1) + int baseThrustState; //!< [-] Indicates on-pulsing (0) or off-pulsing (1) uint64_t prevCallTime; //!< callTime from previous function call /* declare module IO interfaces */ THRArrayCmdForceMsg_C thrForceInMsg; //!< The name of the Input message - THRArrayOnTimeCmdMsg_C onTimeOutMsg; //!< The name of the output message, onTimeOutMsgName + THRArrayOnTimeCmdMsg_C onTimeOutMsg; //!< The name of the output message, onTimeOutMsg THRArrayConfigMsg_C thrConfInMsg; //!< The name of the thruster cluster Input message BSKLogger *bskLogger; //!< BSK Logging diff --git a/src/fswAlgorithms/effectorInterfaces/thrFiringSchmitt/thrFiringSchmitt.h b/src/fswAlgorithms/effectorInterfaces/thrFiringSchmitt/thrFiringSchmitt.h index 67350497f3..aadcacfe78 100755 --- a/src/fswAlgorithms/effectorInterfaces/thrFiringSchmitt/thrFiringSchmitt.h +++ b/src/fswAlgorithms/effectorInterfaces/thrFiringSchmitt/thrFiringSchmitt.h @@ -50,7 +50,7 @@ typedef struct { /* declare module IO interfaces */ THRArrayCmdForceMsg_C thrForceInMsg; //!< The name of the Input message - THRArrayOnTimeCmdMsg_C onTimeOutMsg; //!< The name of the output message*, onTimeOutMsgName + THRArrayOnTimeCmdMsg_C onTimeOutMsg; //!< The name of the output message*, onTimeOutMsg THRArrayConfigMsg_C thrConfInMsg; //!< The name of the thruster cluster Input message BSKLogger *bskLogger; //!< BSK Logging diff --git a/src/fswAlgorithms/formationFlying/spacecraftPointing/_Documentation/example/modularizedDocumentationExample.pdf b/src/fswAlgorithms/formationFlying/spacecraftPointing/_Documentation/example/modularizedDocumentationExample.pdf index 6f74f8511f..239f2dbd8b 100644 Binary files a/src/fswAlgorithms/formationFlying/spacecraftPointing/_Documentation/example/modularizedDocumentationExample.pdf and b/src/fswAlgorithms/formationFlying/spacecraftPointing/_Documentation/example/modularizedDocumentationExample.pdf differ diff --git a/src/fswAlgorithms/formationFlying/spacecraftPointing/_Documentation/example/secUserGuide.tex b/src/fswAlgorithms/formationFlying/spacecraftPointing/_Documentation/example/secUserGuide.tex index b5ea6242cc..dd3bb30321 100644 --- a/src/fswAlgorithms/formationFlying/spacecraftPointing/_Documentation/example/secUserGuide.tex +++ b/src/fswAlgorithms/formationFlying/spacecraftPointing/_Documentation/example/secUserGuide.tex @@ -17,8 +17,6 @@ \subsection{Variable Definition and Code Description} isDisplayBody & N/A & bool & Default setting: False. Determines whether the body in question is the focus of the visualization\\ \hline ephemTime & N/A & double & [s] Default setting: 0. The ephemeris time for the body in question \\ \hline ephIntTime & N/A & double & [s] Default setting: 0. Required Input. The integration time asociated with the ephem data. \\ \hline - bodyInMsgName & N/A & string & Required Input. The name of the message with body data in the body frame. \\ \hline - outputMsgName & N/A & string & Required Input. The name of the message containing ephemeris information in display frame \\ \hline planetEphemName & N/A & string & Required Input. An ephemeris name for the planet (user-named). \\ \hline \end{tabular} \label{tabular:vars} diff --git a/src/fswAlgorithms/formationFlying/spacecraftReconfig/spacecraftReconfig.rst b/src/fswAlgorithms/formationFlying/spacecraftReconfig/spacecraftReconfig.rst index 1a9868a96c..eb6766c45a 100644 --- a/src/fswAlgorithms/formationFlying/spacecraftReconfig/spacecraftReconfig.rst +++ b/src/fswAlgorithms/formationFlying/spacecraftReconfig/spacecraftReconfig.rst @@ -9,8 +9,8 @@ is scheduled so that reconfiguration is completed in one orbit period. In addition to formation control algorithm described in the textbook, some extensions and improvements are included in this module. First, this module assumes that deputy spacecraft has one-axis thrusters. Therefore, attitude control is also necessary -along with burn at certain period. When burn timing is approaching, target attitude is output as ``attRefOutMsgName``. -Otherwise, and if ``attRefInMsgName`` (which is optional) is set, the reference message is output as ``attRefOutMsgName``. +along with burn at certain period. When burn timing is approaching, target attitude is output as ``attRefOutMsg``. +Otherwise, and if ``attRefInMsg`` (which is optional) is set, the reference message is output as ``attRefOutMsg``. Second, if :math:`\delta a` is not zero, drift of :math:`\delta M` occurs. This module can take this drift into consideration . Therefore, this module can achieve formation reconfiguration in orbital period. Third, in general three-time burn is necessary for reconfiguration. Two of them occur at perigee and apogee each. diff --git a/src/fswAlgorithms/imageProcessing/pixelLineConverter/_Documentation/Basilisk-pixelLineConverter-20190524.pdf b/src/fswAlgorithms/imageProcessing/pixelLineConverter/_Documentation/Basilisk-pixelLineConverter-20190524.pdf index a8e9cbc759..8d700ab4b0 100644 Binary files a/src/fswAlgorithms/imageProcessing/pixelLineConverter/_Documentation/Basilisk-pixelLineConverter-20190524.pdf and b/src/fswAlgorithms/imageProcessing/pixelLineConverter/_Documentation/Basilisk-pixelLineConverter-20190524.pdf differ diff --git a/src/fswAlgorithms/imageProcessing/pixelLineConverter/_Documentation/secUserGuide.tex b/src/fswAlgorithms/imageProcessing/pixelLineConverter/_Documentation/secUserGuide.tex index a476112e91..212d2d9626 100644 --- a/src/fswAlgorithms/imageProcessing/pixelLineConverter/_Documentation/secUserGuide.tex +++ b/src/fswAlgorithms/imageProcessing/pixelLineConverter/_Documentation/secUserGuide.tex @@ -22,6 +22,4 @@ \section{User Guide} \texttt{inputAtt.sigma$\_$BN = [0., 1., 0.]}\\ \item Set module for Mars: \\ \texttt{pixelLine.planetTarget = 2}\\ -\texttt{pixelLine.opNavOutMsgName = "output$\_$nav$\_$msg"}\\ -\texttt{unitTestSim.TotalSim.logThisMessage(pixelLine.opNavOutMsgName)}\\ \end{itemize} \ No newline at end of file diff --git a/src/fswAlgorithms/transDetermination/ephemDifference/_Documentation/Basilisk-ephemDifference-2019-03-27.pdf b/src/fswAlgorithms/transDetermination/ephemDifference/_Documentation/Basilisk-ephemDifference-2019-03-27.pdf index 14d1a14f16..6ab8088e4b 100644 Binary files a/src/fswAlgorithms/transDetermination/ephemDifference/_Documentation/Basilisk-ephemDifference-2019-03-27.pdf and b/src/fswAlgorithms/transDetermination/ephemDifference/_Documentation/Basilisk-ephemDifference-2019-03-27.pdf differ diff --git a/src/fswAlgorithms/transDetermination/ephemDifference/_Documentation/secModuleDescription.tex b/src/fswAlgorithms/transDetermination/ephemDifference/_Documentation/secModuleDescription.tex index 5cd51c104f..495e123479 100644 --- a/src/fswAlgorithms/transDetermination/ephemDifference/_Documentation/secModuleDescription.tex +++ b/src/fswAlgorithms/transDetermination/ephemDifference/_Documentation/secModuleDescription.tex @@ -14,5 +14,5 @@ \section{Model Description} The time tag of the output message is copied from the corresponding input message, not the base ephemeris message. -The number of input messages to consider is determined by searching the {\tt ephInMsgName} and {\tt ephOutMsgName} names and finding the first zero string where either name was not set. +The number of input messages to consider is determined by searching the {\tt ephInMsg} and {\tt ephOutMsg} names and finding the first zero string where either name was not set. diff --git a/src/fswAlgorithms/transDetermination/ephemDifference/_Documentation/secModuleFunctions.tex b/src/fswAlgorithms/transDetermination/ephemDifference/_Documentation/secModuleFunctions.tex index c8c41f78d7..e7ad27d8d7 100644 --- a/src/fswAlgorithms/transDetermination/ephemDifference/_Documentation/secModuleFunctions.tex +++ b/src/fswAlgorithms/transDetermination/ephemDifference/_Documentation/secModuleFunctions.tex @@ -3,7 +3,7 @@ \section{Module Functions} \begin{itemize} - \item \textbf{Variable input messages}: The user can specify up to {\tt MAX\_NUM\_CHANGE\_BODIES} input messages {\tt ephInMsgName}. + \item \textbf{Variable input messages}: The user can specify up to {\tt MAX\_NUM\_CHANGE\_BODIES} input messages {\tt ephInMsg}. \item \textbf{Number of messages}: The first zero message string terminates the loop and sets the number of incoming and outgoing messages \end{itemize} diff --git a/src/simulation/dynamics/GravityGradientEffector/GravityGradientEffector.rst b/src/simulation/dynamics/GravityGradientEffector/GravityGradientEffector.rst index 923d6f5644..5ae4f31032 100644 --- a/src/simulation/dynamics/GravityGradientEffector/GravityGradientEffector.rst +++ b/src/simulation/dynamics/GravityGradientEffector/GravityGradientEffector.rst @@ -79,10 +79,10 @@ To specify which planets must be considered for gravity gradient torques, use th ggEff.addPlanetName("name") where ``name`` should be the Spice planetary output name. For example, for earth this is `earth_planet_data`. If -the ``gravBodyFactory`` class is used to setup planets, then the ``bodyInMsgName`` variable will contain this +the ``gravBodyFactory`` class is used to setup planets, then the ``planetName`` message will contain this information:: - ggEff.addPlanetName(earth.bodyInMsgName) + ggEff.addPlanetName(earth.planetName) .. warning:: The effector requires at least one planet to be specified. diff --git a/src/simulation/dynamics/GravityGradientEffector/_UnitTest/test_gravityGradient.py b/src/simulation/dynamics/GravityGradientEffector/_UnitTest/test_gravityGradient.py index 004bdb69ab..3adb1ad2de 100644 --- a/src/simulation/dynamics/GravityGradientEffector/_UnitTest/test_gravityGradient.py +++ b/src/simulation/dynamics/GravityGradientEffector/_UnitTest/test_gravityGradient.py @@ -136,7 +136,7 @@ def run(show_plots, cmOffset, planetCase, simTime): timeInitString = "2012 MAY 1 00:28:30.0" gravFactory.createSpiceInterface(bskPath + '/supportData/EphemerisData/', timeInitString, - epochInMsgName=True) + epochInMsg=True) scSim.AddModelToTask(simTaskName, gravFactory.spiceObject, -1) diff --git a/src/simulation/dynamics/HingedRigidBodies/_Documentation/Basilisk-HINGEDRIGIDBODYSTATEEFFECTOR-20170703.pdf b/src/simulation/dynamics/HingedRigidBodies/_Documentation/Basilisk-HINGEDRIGIDBODYSTATEEFFECTOR-20170703.pdf index b9925a6af6..125ab2242a 100644 Binary files a/src/simulation/dynamics/HingedRigidBodies/_Documentation/Basilisk-HINGEDRIGIDBODYSTATEEFFECTOR-20170703.pdf and b/src/simulation/dynamics/HingedRigidBodies/_Documentation/Basilisk-HINGEDRIGIDBODYSTATEEFFECTOR-20170703.pdf differ diff --git a/src/simulation/dynamics/HingedRigidBodies/_Documentation/secModelDescription.tex b/src/simulation/dynamics/HingedRigidBodies/_Documentation/secModelDescription.tex index 369d5833ea..e5bd94377c 100644 --- a/src/simulation/dynamics/HingedRigidBodies/_Documentation/secModelDescription.tex +++ b/src/simulation/dynamics/HingedRigidBodies/_Documentation/secModelDescription.tex @@ -120,7 +120,7 @@ \subsection{Back Substitution Method} \subsection{Panel State Configuration Log Message Information} -The panel provides an output message {\tt hingedRigidBodyConfigLogOutMsgName} of type {\tt SCStatesMsg}. This message contains the panel frame $S_i$ position and attitude states. As this is a regular spacecraft state message, this output message can be piped to other modules such as the coarse sun sensor or solar panel power module spacecraft state input message. This allows the CSS or solar power evaluation to be performed relative to the time-varying panel configuration. +The panel provides an output message {\tt hingedRigidBodyConfigLogOutMsg} of type {\tt SCStatesMsg}. This message contains the panel frame $S_i$ position and attitude states. As this is a regular spacecraft state message, this output message can be piped to other modules such as the coarse sun sensor or solar panel power module spacecraft state input message. This allows the CSS or solar power evaluation to be performed relative to the time-varying panel configuration. The configuration log records the following 4 message variables: {\tt r\_BN\_N}, {\tt r\_BN\_N}, {\tt sigma\_BN} and {\tt omega\_BN\_B}. These states are evaluated using: \begin{align} diff --git a/src/simulation/dynamics/NHingedRigidBodies/nHingedRigidBodyStateEffector.h b/src/simulation/dynamics/NHingedRigidBodies/nHingedRigidBodyStateEffector.h index 5282ce9df7..d34e4ab9df 100755 --- a/src/simulation/dynamics/NHingedRigidBodies/nHingedRigidBodyStateEffector.h +++ b/src/simulation/dynamics/NHingedRigidBodies/nHingedRigidBodyStateEffector.h @@ -59,7 +59,6 @@ struct HingedPanel { /*! @brief NHingedRigidBodyStateEffector class */ class NHingedRigidBodyStateEffector : public StateEffector, public SysModel { public: - std::string NHingedRigidBodyOutMsgName; //!< -- state output message name std::string nameOfThetaState; //!< -- Identifier for the theta state data container std::string nameOfThetaDotState; //!< -- Identifier for the thetaDot state data container Eigen::Vector3d r_HB_B; //!< [m] vector pointing from body frame origin to the first Hinge location diff --git a/src/simulation/dynamics/extForceTorque/_Documentation/Basilisk-extForceTorque-20161103.pdf b/src/simulation/dynamics/extForceTorque/_Documentation/Basilisk-extForceTorque-20161103.pdf index c91d856592..cb4f5d502e 100644 Binary files a/src/simulation/dynamics/extForceTorque/_Documentation/Basilisk-extForceTorque-20161103.pdf and b/src/simulation/dynamics/extForceTorque/_Documentation/Basilisk-extForceTorque-20161103.pdf differ diff --git a/src/simulation/dynamics/extForceTorque/_Documentation/Basilisk-extForceTorque-20161103.tex b/src/simulation/dynamics/extForceTorque/_Documentation/Basilisk-extForceTorque-20161103.tex index 59660e8cdb..aa847f869e 100755 --- a/src/simulation/dynamics/extForceTorque/_Documentation/Basilisk-extForceTorque-20161103.tex +++ b/src/simulation/dynamics/extForceTorque/_Documentation/Basilisk-extForceTorque-20161103.tex @@ -55,34 +55,6 @@ \section{Introduction} \section{Specifying the Forces/Torques through Messages} The module reads in a message that specifies an external force or external torque. Not that there essentially are 3 input options. The torque vector is always provided in body frame vector components. The external force can be provided as a vector with respect to the inertial or body frame. {\bfseries Note, it is possible to set both types, but this applies 2 separate vectors to the rigid body.} -\subsection{External Torque} -The torque message $\leftexp{B}{\bm\tau}_{B}$ is stored in a message with default name - -{\tt extTorquePntB\_B\_cmds} - -\noindent stored in the module variable - -{\tt cmdTorqueInMsgName} - -\subsection{External Force in $\mathcal{N}$ Inertial Frame Vector Components} -The inertial force message $\leftexp{N}{\bm F}$ is stored in a message with default name - -{\tt extForce\_N\_cmds} - -\noindent stored in the module variable - -{\tt cmdForceInertialInMsgName} - - -\subsection{External Force in $\mathcal{B}$ Body Frame Vector Components} -The inertial force message $\leftexp{B}{\bm F}$ is stored in a message with default name - -{\tt extForce\_B\_cmds} - -\noindent stored in the module variable - -{\tt cmdForceBodyInMsgName} - diff --git a/src/simulation/dynamics/facetDragEffector/_Documentation/Basilisk-facet_drag-20190515.pdf b/src/simulation/dynamics/facetDragEffector/_Documentation/Basilisk-facet_drag-20190515.pdf index cf539c1a5a..bda26fc97e 100644 Binary files a/src/simulation/dynamics/facetDragEffector/_Documentation/Basilisk-facet_drag-20190515.pdf and b/src/simulation/dynamics/facetDragEffector/_Documentation/Basilisk-facet_drag-20190515.pdf differ diff --git a/src/simulation/dynamics/facetDragEffector/_Documentation/secTest.tex b/src/simulation/dynamics/facetDragEffector/_Documentation/secTest.tex index 300fab60de..63048f7e23 100644 --- a/src/simulation/dynamics/facetDragEffector/_Documentation/secTest.tex +++ b/src/simulation/dynamics/facetDragEffector/_Documentation/secTest.tex @@ -33,7 +33,6 @@ \section{Test Parameters} \hline\hline \textbf{Output Value Tested} & \textbf{Tolerated Error} \\ \hline - {\tt facetDragDynamicEffector.atmoDensInMsgName } & {\tt 0 (str)} \\ {\tt newDrag.forceExternal\_N} & \input{AutoTeX/toleranceValue} (relative) \\ \hline\hline \end{tabular} \end{table} diff --git a/src/simulation/dynamics/gravityEffector/_Documentation/Basilisk-GravityEffector-20170712.pdf b/src/simulation/dynamics/gravityEffector/_Documentation/Basilisk-GravityEffector-20170712.pdf index 62975b8163..4b1efbf7cc 100755 Binary files a/src/simulation/dynamics/gravityEffector/_Documentation/Basilisk-GravityEffector-20170712.pdf and b/src/simulation/dynamics/gravityEffector/_Documentation/Basilisk-GravityEffector-20170712.pdf differ diff --git a/src/simulation/dynamics/gravityEffector/_Documentation/secUserGuide.tex b/src/simulation/dynamics/gravityEffector/_Documentation/secUserGuide.tex index 65795be927..c985a5a175 100755 --- a/src/simulation/dynamics/gravityEffector/_Documentation/secUserGuide.tex +++ b/src/simulation/dynamics/gravityEffector/_Documentation/secUserGuide.tex @@ -28,8 +28,6 @@ \subsection{Variable Definition and Code Description} isDisplayBody & N/A & bool & Default setting: False. Determines whether the body in question is the focus of the visualization\\ \hline ephemTime & N/A & double & [s] Default setting: 0. The ephemeris time for the body in question \\ \hline ephIntTime & N/A & double & [s] Default setting: 0. Required Input. The integration time associated with the ephem data. \\ \hline - bodyInMsgName & N/A & string & Required Input. The name of the message with gravity body data in the body frame. \\ \hline - outputMsgName & N/A & string & Required Input. The name of the message containing ephemeris information in display frame \\ \hline planetEphemName & N/A & string & Required Input. An ephemeris name for the planet (user-named). \\ \hline \label{tabular:vars} \end{tabular} diff --git a/src/simulation/environment/ExponentialAtmosphere/_Documentation/Basilisk-atmosphere-20190221.pdf b/src/simulation/environment/ExponentialAtmosphere/_Documentation/Basilisk-atmosphere-20190221.pdf index 58b21e6c9a..10fe65bf00 100644 Binary files a/src/simulation/environment/ExponentialAtmosphere/_Documentation/Basilisk-atmosphere-20190221.pdf and b/src/simulation/environment/ExponentialAtmosphere/_Documentation/Basilisk-atmosphere-20190221.pdf differ diff --git a/src/simulation/environment/ExponentialAtmosphere/_Documentation/secTest.tex b/src/simulation/environment/ExponentialAtmosphere/_Documentation/secTest.tex index afc66ec0f5..25d2220f10 100644 --- a/src/simulation/environment/ExponentialAtmosphere/_Documentation/secTest.tex +++ b/src/simulation/environment/ExponentialAtmosphere/_Documentation/secTest.tex @@ -20,9 +20,7 @@ \section{Test Parameters} \hline\hline \textbf{Output Value Tested} & \textbf{Tolerated Error} \\ \hline - {\tt length(atmo.scStateInMsgNames)} & {\tt 0 (int)} \\ - {\tt length(atmo.envOutMsgNames)} & {\tt 0 (int)} \\ - {\tt neutralDensity} & \input{AutoTeX/toleranceValue} (relative) \\ + {\tt neutralDensity} & \input{AutoTeX/toleranceValue} (relative) \\ \hline\hline \end{tabular} \end{table} diff --git a/src/simulation/environment/MsisAtmosphere/msisAtmosphere.h b/src/simulation/environment/MsisAtmosphere/msisAtmosphere.h index 98efb6ae48..6af673b8b2 100644 --- a/src/simulation/environment/MsisAtmosphere/msisAtmosphere.h +++ b/src/simulation/environment/MsisAtmosphere/msisAtmosphere.h @@ -57,7 +57,6 @@ class MsisAtmosphere: public AtmosphereBase { public: std::vector> swDataInMsgs; //!< Vector of space weather input message names int epochDoy; //!< [day] Day-of-Year at epoch - std::string epochInMsgName; //!< epoch input msg name BSKLogger bskLogger; //!< -- BSK Logging diff --git a/src/simulation/environment/spiceInterface/_Documentation/Basilisk-SPICE_INTERFACE20170712.pdf b/src/simulation/environment/spiceInterface/_Documentation/Basilisk-SPICE_INTERFACE20170712.pdf index 3f3591a4a7..b191e0f04a 100644 Binary files a/src/simulation/environment/spiceInterface/_Documentation/Basilisk-SPICE_INTERFACE20170712.pdf and b/src/simulation/environment/spiceInterface/_Documentation/Basilisk-SPICE_INTERFACE20170712.pdf differ diff --git a/src/simulation/environment/spiceInterface/_Documentation/secModelDescription.tex b/src/simulation/environment/spiceInterface/_Documentation/secModelDescription.tex index 937932ca83..4e906cdd95 100644 --- a/src/simulation/environment/spiceInterface/_Documentation/secModelDescription.tex +++ b/src/simulation/environment/spiceInterface/_Documentation/secModelDescription.tex @@ -1,7 +1,7 @@ \section{Model Description} -Spice interfaces with the AVS Basilisk simulation. This is done through spice\_interface.cpp, which loads the proper kernels in External/EphemerisData. Given an epoch, it generates information on universal time (UTC/GPS...) as well as ephemeris information for the bodies of the Solar System. It writes this out in a spice output message for other modules to use. The epoch time can be provided by providing the optional epoch input message of type {\tt EpochSimMsg}, or by specifying the module variable {\tt UTCCalInit} directly as a date/time string. If a message is provided by specifying the message name variable {\tt epochInMsgName}, then this takes precedence over the {\tt UTCCalInit} variable. +Spice interfaces with the AVS Basilisk simulation. This is done through spice\_interface.cpp, which loads the proper kernels in External/EphemerisData. Given an epoch, it generates information on universal time (UTC/GPS...) as well as ephemeris information for the bodies of the Solar System. It writes this out in a spice output message for other modules to use. The epoch time can be provided by providing the optional epoch input message of type {\tt EpochSimMsg}, or by specifying the module variable {\tt UTCCalInit} directly as a date/time string. If a message is provided by specifying the message name variable {\tt epochInMsg}, then this takes precedence over the {\tt UTCCalInit} variable. \subsection{Output message} diff --git a/src/simulation/navigation/planetHeading/planetHeading.cpp b/src/simulation/navigation/planetHeading/planetHeading.cpp index ec3d4773c5..986701f706 100755 --- a/src/simulation/navigation/planetHeading/planetHeading.cpp +++ b/src/simulation/navigation/planetHeading/planetHeading.cpp @@ -22,7 +22,7 @@ #include "architecture/utilities/avsEigenSupport.h" #include -/*! Customer constructor just sets the spacecraftSTateInMsgName by default*/ +/*! Customer constructor just sets the spacecraftSTateInMsg by default*/ PlanetHeading::PlanetHeading() { diff --git a/src/simulation/onboardDataHandling/transmitter/simpleTransmitter.rst b/src/simulation/onboardDataHandling/transmitter/simpleTransmitter.rst index 3bb14e5e0e..47b21168d1 100644 --- a/src/simulation/onboardDataHandling/transmitter/simpleTransmitter.rst +++ b/src/simulation/onboardDataHandling/transmitter/simpleTransmitter.rst @@ -51,9 +51,8 @@ The next step is to attach one or more :ref:`DataStorageStatusMsgPayload` instan transmitter.addStorageUnitToTransmitter("msg name") -The final step is to specify the output message name and add the model to task:: +The final step is to add the model to task:: - transmitter.nodeDataOutMsgName = "TransmitterMsg" scenarioSim.AddModelToTask(taskName, transmitter) Follow the :ref:`partitionedStorageUnit` or :ref:`simpleStorageUnit` instructions to add the transmitter to a storage unit. diff --git a/src/simulation/power/ReactionWheelPower/_Documentation/Images/PowerRW.svg b/src/simulation/power/ReactionWheelPower/_Documentation/Images/PowerRW.svg index 14efc7d838..64b0a365e5 100644 --- a/src/simulation/power/ReactionWheelPower/_Documentation/Images/PowerRW.svg +++ b/src/simulation/power/ReactionWheelPower/_Documentation/Images/PowerRW.svg @@ -51,7 +51,7 @@ - nodePowerOutMsgName + nodePowerOutMsg @@ -61,7 +61,7 @@ - rwStateInMsgName + rwStateInMsg @@ -74,7 +74,7 @@ - nodeStatusInMsgName + nodeStatusInMsg diff --git a/src/simulation/sensors/coarseSunSensor/_UnitTest/test_CSSConfig.py b/src/simulation/sensors/coarseSunSensor/_UnitTest/test_CSSConfig.py index 75acc32edb..9a4821d86e 100644 --- a/src/simulation/sensors/coarseSunSensor/_UnitTest/test_CSSConfig.py +++ b/src/simulation/sensors/coarseSunSensor/_UnitTest/test_CSSConfig.py @@ -70,7 +70,6 @@ def run(show_plots, accuracy): CSS1.ModelTag = "CSS1" CSS1.fov = 80. * macros.D2R CSS1.maxOutput = 10. - # CSS1.cssConfigLogMsgName is not set to check default behavior CSS1.nHat_B = [1.0, 0.0, 0.0] CSS2 = coarseSunSensor.CoarseSunSensor() diff --git a/src/simulation/vizard/dataFileToViz/dataFileToViz.cpp b/src/simulation/vizard/dataFileToViz/dataFileToViz.cpp index 20c406f2dd..46344d9e52 100755 --- a/src/simulation/vizard/dataFileToViz/dataFileToViz.cpp +++ b/src/simulation/vizard/dataFileToViz/dataFileToViz.cpp @@ -92,7 +92,7 @@ void DataFileToViz::Reset(uint64_t CurrentSimNanos) if (this->rwScOutMsgs.size() > 0) { if (this->scStateOutMsgs.size() != this->rwScOutMsgs.size()) { - bskLogger.bskLog(BSK_ERROR, "DataFileToViz: you set appendRwMsgNames %d times, but set number of spacecraft to %d", (int) this->rwScOutMsgs.size(), (int) this->scStateOutMsgs.size()); + bskLogger.bskLog(BSK_ERROR, "DataFileToViz: you set appendRwMsg %d times, but set number of spacecraft to %d", (int) this->rwScOutMsgs.size(), (int) this->scStateOutMsgs.size()); } /* check vector dimensions */ diff --git a/src/utilities/simIncludeGravBody.py b/src/utilities/simIncludeGravBody.py index 8d6ae64957..694a475906 100644 --- a/src/utilities/simIncludeGravBody.py +++ b/src/utilities/simIncludeGravBody.py @@ -282,7 +282,7 @@ def createCustomGravObject(self, label, mu, **kwargs): def createSpiceInterface(self, path, time, **kwargs): """ A convenience function to configure a NAIF Spice module for the simulation. - It connect the gravBodyData objects to the spice planet state messages. Thus, + It connects the gravBodyData objects to the spice planet state messages. Thus, it must be run after the gravBodyData objects are created. Parameters diff --git a/src/utilities/vizSupport.py b/src/utilities/vizSupport.py index 797bfb836a..45b8d914b4 100644 --- a/src/utilities/vizSupport.py +++ b/src/utilities/vizSupport.py @@ -1554,7 +1554,5 @@ def enableUnityVisualization(scSim, simTaskName, scList, **kwargs): print('ERROR: vizSupport: opNavMode must be 0 (off), 1 (regular opNav) or 2 (high performance opNav)') exit(1) vizMessenger.opNavMode = val - if val > 0: - vizMessenger.opnavImageOutMsgName = "opnav_circles" return vizMessenger