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

[nasa/nos3#298] OnAIR Integration #402

Open
wants to merge 78 commits into
base: dev
Choose a base branch
from
Open

[nasa/nos3#298] OnAIR Integration #402

wants to merge 78 commits into from

Commits on May 9, 2024

  1. [#298] Initial commit, adding OnAIR as a submodule and beginning the …

    …adjustments to the docker_launch script to launch OnAIR with NOS3
    jstar authored and jstar committed May 9, 2024
    Configuration menu
    Copy the full SHA
    3bbb9dc View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. [nos3#298] Initial updates and alterations to allow OnAIR to launch a…

    …longside NOS3
    jstar authored and jstar committed May 20, 2024
    Configuration menu
    Copy the full SHA
    92a4cf6 View commit details
    Browse the repository at this point in the history
  2. [nos3#298] Adding the Dockerfile to NOS3 so that no changes to OnAIR …

    …are (thus far) necessary
    jstar authored and jstar committed May 20, 2024
    Configuration menu
    Copy the full SHA
    06ad9a3 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. [nos3#298] Adding the SBN and SBN Client submodules, which will be ne…

    …cessary for communication between cFS and OnAIR
    jstar authored and jstar committed May 23, 2024
    Configuration menu
    Copy the full SHA
    4892386 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. [nos3#298] Alterations to various cfg files to work towards getting O…

    …nAIR to compile alongside NOS3, instead of it having to be compiled separately but run together
    jstar authored and jstar committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    b8808e5 View commit details
    Browse the repository at this point in the history
  2. [nos3#298] Removing OnAIR as a submodule so as to be able to add it b…

    …ack again, hopefully with minimal trouble
    jstar authored and jstar committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    7a6a435 View commit details
    Browse the repository at this point in the history
  3. [nos3#298] Removing OnAIR to add it back (maybe in a different location)

    jstar authored and jstar committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    f9fb792 View commit details
    Browse the repository at this point in the history
  4. [nos3#298] Adding back OnAIR as a submodule; note that, at least for …

    …now, it has been necessary to set USER_ID and GROUP_ID equal to 1000 to get the Dockerfile to build properly.
    jstar authored and jstar committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    09eb124 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. [nos3#298] Moving around some of the submodules to be in the right pl…

    …ace and have the right name so as to make compiling/running as easy as possible
    jstar authored and jstar committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    c43d43d View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. [#298] Updates to resolve build issues in NOS3 with draco-rc4 without…

    … sbn_tcp just yet (not sure if needed);
    jlucas9 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    c7c7b6a View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Configuration menu
    Copy the full SHA
    dc391d2 View commit details
    Browse the repository at this point in the history
  2. [#298] Readded OnAIR

    kevincbruce committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    c45afd5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4a22d5b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3f27a91 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Configuration menu
    Copy the full SHA
    2290db8 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. [#298] Moved OnAIR container build to prep, launch into spacecraft lo…

    …op, and removed extra OnAIR submodule definition;
    jlucas9 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    dadc442 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c594e21 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fa8c926 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c9856f6 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Configuration menu
    Copy the full SHA
    a42c49d View commit details
    Browse the repository at this point in the history
  2. Submodule update.

    msuder committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    f70880f View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. [#298] Updated CFS_APP_PATH and added sbn_tcp to the targets - SBN st…

    …ill crashing on startup;
    jlucas9 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    e792ebf View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. [#298] Updates to SBN_TCP and SBN_Client to attempt to hack in DNS Na…

    …me Resolution. Currently doesn't seem to fully work, and should be improved in the future to be less hacky.
    kevincbruce committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    d951981 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2024

  1. [#298] Updates to SBN, SBN_Client, and OnAIR to utilize DNS Names nat…

    …ively (seems to work better than previous workaround, but still not fully integrated)
    kevincbruce committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    9273045 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4724217 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. [#298] Added absolute path to the sbn_client's python interface to On…

    …AIR. Likely should be fixed in CMAKE later
    kevincbruce committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    685bfb3 View commit details
    Browse the repository at this point in the history
  2. [#298] Added a line to add the path to the SBN_Client's Python Librar…

    …y to the sys path, and added __pycache__ to gitignore
    kevincbruce committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    b112431 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0e55df8 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. [#298] Readded and attempted to fix some issues in the DNS Name Resol…

    …ution code for SBN and SBN-Client. Still is broken and cycle crashes cFS.
    kevincbruce committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    4b8c552 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1538487 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. [#298] Updated SBN SCID to match NOS3 (0x2A or 42 base10), and starte…

    …d updates to utilize gethostbyname from stdlib for DNS Name Resolution as suggested.
    kevincbruce committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    e83b4f0 View commit details
    Browse the repository at this point in the history
  2. [#298] Further DNS Updates. Still not operating, but showing the prop…

    …er DNS Names and SCID. Likely still an issue in the translation process causing cycle crash.
    kevincbruce committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    870743a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2405275 View commit details
    Browse the repository at this point in the history
  4. [#298] Updated DNS name for FSW in SBN and SBN_Client, added debug st…

    …atements to SBN, other miscellaneous fixes
    kevincbruce committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    d38c660 View commit details
    Browse the repository at this point in the history
  5. [#298] Added William Zhang's message_headers.py file from his branch …

    …of OnAIR to ours, so the SBN Adapter should start working
    kevincbruce committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    4628560 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. [nos3#298] Testing the possibility of switching from gethostbyname to…

    … getaddrinfo for DNS resolution
    jstar authored and jstar committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    4bcec22 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ea06ff8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e4722f2 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. [#298] Switched to new dev branch rather than nos3_dev, and pulled in…

    … William Zhang's s_o_TLM_CONFIG.json file
    kevincbruce committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    2f8a9b1 View commit details
    Browse the repository at this point in the history
  2. [#298] Updated OnAIR TLM_CONFIG file to match Will Zhang's current ve…

    …rsion. Need to update our OnAIR to match his and remodify to avoid bugs he fixed recently from the Scenic version of the SBN code
    kevincbruce committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    7558b58 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    eaabfb7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    541ae3c View commit details
    Browse the repository at this point in the history
  5. [#298] Fixed DNS Name Resolution by updating memory allocation from 1…

    …6KB to 32KB, and switching back to gethostbyname (kept getaddrinfo code commented out for further review, and kept debug messages since OnAIR SBN link still seg faults due to container dying before SBN launches.)
    kevincbruce committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    dfd0d64 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Configuration menu
    Copy the full SHA
    8c9a7e2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0bfba5c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4035628 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. [#298] Updates to build OnAIR in an updated NOS3 Docker Image (found …

    …in deployment github page, in the nos3#298-OnAIR-Integration branch). Still not 100% working, but closer
    kevincbruce committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    beee0d7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a23966d View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. [#298] Updated OnAIR Launch Script and some relative paths in the OnA…

    …IR INI. Acheived a link between SBN, SBN_Client, and OnAIR in the NOS3 system (though there may be small errors remaining)
    kevincbruce committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    d874861 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Configuration menu
    Copy the full SHA
    abb8474 View commit details
    Browse the repository at this point in the history
  2. [#298] updated SBN MIDs to fix conflcits with Sample and Synopsis, pu…

    …t timmer for OnAIR Launch back to 30 secs, added more log prints to sbn_client python interface
    kevincbruce committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    df22ba9 View commit details
    Browse the repository at this point in the history
  3. [#298] Updated MID

    kevincbruce committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    17d68d8 View commit details
    Browse the repository at this point in the history
  4. [#298] Removed sleep in OnAIR Launch script, as it was unneeded; Upda…

    …ted some sizes in OnAIR and SBN_Client to match current cFS, added more debug print logs to SBN Client and SBN
    kevincbruce committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    8f99781 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. [#298] Added debug messages to SBN_Client to print the recieved messa…

    …ge object and the message id for the subscribe
    kevincbruce committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    4cc3a03 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. Configuration menu
    Copy the full SHA
    110f3f3 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Configuration menu
    Copy the full SHA
    cca7653 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. [#298] Added onair_launch.sh to sleep before launching OnAIR so it is…

    … launched after SBN is initialized, and added extra debug statements to the client initialization.
    kevincbruce committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    3176c70 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. [#298] Updated SBN Client to debug and fix pipe error. Updated SBN cl…

    …ient to help diagnose new error
    kevincbruce committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    bf8b109 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. [#298] Updated length of SBN client heartbeart message to 10, enabled…

    … sample in minimal config, and removed custom sbn_conf_tbl from cfg as the default was the same;
    jlucas9 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    14c5fa5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    48ddf0c View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Configuration menu
    Copy the full SHA
    62e83cb View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. [#298] Updated headers in SBN Client Python to match the new CFE_MSG …

    …standards for Draco. Still uses CFE_SB version in code, need to figure out how to finish porting.
    kevincbruce committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    90dbf24 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Configuration menu
    Copy the full SHA
    78572c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. [#298] Updated debug messages in SBN and SBN_Client and reverted to o…

    …ld CCSDS defs to prove both sides recieve the same data
    kevincbruce committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    b705909 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f61e50f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    90e535b View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Configuration menu
    Copy the full SHA
    b1e61c3 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Configuration menu
    Copy the full SHA
    254e37c View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Configuration menu
    Copy the full SHA
    cae84d5 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. [#298] Updated debug prints to SBN and SBN Client; messed with timing…

    … on OnAIR Launch, added pcap to gitignore
    kevincbruce committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    52800c4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    516613c View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. [#298] Fixes for debug prints in sbn_python_client, plus removing deb…

    …ug prints from C now that it is debugged.
    kevincbruce committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    af11109 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    79c9232 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    81035b5 View commit details
    Browse the repository at this point in the history
  4. [#298] modified cfs docker launch template in new copying system for …

    …config to include OnAIR launch
    kevincbruce committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    4a57923 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c120919 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    548099d View commit details
    Browse the repository at this point in the history
  7. [#298] verified successful transmission and reading of housekeeping p…

    …ackets by OnAIR through NOS3, and commented out debug prints after verification
    kevincbruce committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    53a0e65 View commit details
    Browse the repository at this point in the history