Ignore:
Timestamp:
10/15/15 20:27:46 (9 years ago)
Author:
dneise
Message:
changing names of ressources as Thomas wanted. setting them to not-required and setting a hopefully useful default. It does throw an exception when being started, and I don't know where it is thrown yet.
Location:
branches/fscctrl_safety_limits/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fscctrl_safety_limits/src/HeadersFSC.h

    r18342 r18343  
    4848        uint16_t time_ms;
    4949    } __attribute__((__packed__));
    50 
    51 
    52     //struct SecurityCurrentLimits
    53     //{
    54     //    double ethernet_switch;
    55     //    double FFC;
    56     //    double FLP;
    57     //    double FAD_digital;
    58     //    double FAD_negative;
    59     //    double FAD_positive;
    60     //    double FPA_digital;
    61     //    double FPA_negative;
    62     //    double FPA_positive;
    63     //};
    6450}
    6551
  • branches/fscctrl_safety_limits/src/fscctrl.cc

    r18342 r18343  
    617617       
    618618        Out() << ". - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . -." << endl;
    619        
    620 
    621619    }
    622620
     
    705703    }
    706704
    707 
    708 
    709705    void StartRead()
    710706    {
     
    12261222    po::options_description current_limits("Security current limits");
    12271223    current_limits.add_options()
    1228         ("ethernet_switch", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
    1229         ("FFC", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
    1230         ("FLP", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
    1231         ("FAD_digital", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
    1232         ("FAD_negative", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
    1233         ("FAD_positive", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
    1234         ("FPA_digital", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
    1235         ("FPA_negative", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
    1236         ("FPA_positive", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
     1224        ("max-current.ethernet-switch", var<double>(INFINITY), "Maximum current for the Ethernet Switch [A]")
     1225        ("max-current.FFC", var<double>(INFINITY), "Maximum current for the FFC [A]")
     1226        ("max-current.FLP", var<double>(INFINITY), "Maximum current for the FLP [A]")
     1227        ("max-current.FAD-digital", var<double>(INFINITY), "Maximum current for the FAD digital [A]")
     1228        ("max-current.FAD-negative", var<double>(INFINITY), "Maximum current for the FAD negative [A]")
     1229        ("max-current.FAD-positive", var<double>(INFINITY), "Maximum current for the FAD positive [A]")
     1230        ("max-current.FPA-digital", var<double>(INFINITY), "Maximum current for the FPA digital [A]")
     1231        ("max-current.FPA-negative", var<double>(INFINITY), "Maximum current for the FPA negative [A]")
     1232        ("max-current.FPA-positive", var<double>(INFINITY), "Maximum current for the FPA positive [A]")
    12371233        ;
    12381234
Note: See TracChangeset for help on using the changeset viewer.