Hercules_RM46_HD_Project

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Brought vectorcast folder back in to repair merge.

    • -0
    • +10
    ./environment/ALARMLAMP/ALARMLAMP.env
    • -0
    • +413
    ./environment/ALARMLAMP/ALARMLAMP.tst
    • -0
    • +328
    ./environment/ALARMLAMP/AlarmLamp.html
    • -0
    • +682
    ./environment/BUTTONS/BUTTONS.tst
    • -0
    • +364
    ./environment/BUTTONS/Buttons.html
  1. … 179 more files in changeset.
Resolved merge conflict.

    • -10
    • +0
    ./environment/ALARMLAMP/ALARMLAMP.env
    • -413
    • +0
    ./environment/ALARMLAMP/ALARMLAMP.tst
    • -328
    • +0
    ./environment/ALARMLAMP/AlarmLamp.html
    • -682
    • +0
    ./environment/BUTTONS/BUTTONS.tst
    • -364
    • +0
    ./environment/BUTTONS/Buttons.html
  1. … 180 more files in changeset.
Updated setup_env.sh to point to the new location of the firmware and ran a test

  1. … 1 more file in changeset.
Transferred the master branch firmware to the firmware folder. Added the VectorCAST folder to the repository

    • -0
    • +1
    ./environment/ALARMLAMP/ALARMLAMP.cfg
    • -0
    • +10
    ./environment/ALARMLAMP/ALARMLAMP.env
    • -0
    • +7
    ./environment/ALARMLAMP/ALARMLAMP.mfg
    • -0
    • +413
    ./environment/ALARMLAMP/ALARMLAMP.tst
    • -0
    • +328
    ./environment/ALARMLAMP/AlarmLamp.html
    • -0
    • +1
    ./environment/BUTTONS/BUTTONS.cfg
    • -0
    • +8
    ./environment/BUTTONS/BUTTONS.env
    • -0
    • +7
    ./environment/BUTTONS/BUTTONS.mfg
    • -0
    • +682
    ./environment/BUTTONS/BUTTONS.tst
    • -0
    • +364
    ./environment/BUTTONS/Buttons.html
    • -0
    • +24
    ./environment/COMM/COMM.cfg
    • -0
    • +8
    ./environment/COMM/COMM.env
    • -0
    • +4
    ./environment/COMM/COMM.mfg
    • -0
    • +159
    ./environment/COMM/COMM.tst
    • -0
    • +327
    ./environment/COMM/Comm.html
  1. … 577 more files in changeset.