CoRE Simulation Models for Real-time Networks

Changeset 6e2a6bf in FiCo4OMNeT


Ignore:
Timestamp:
04/04/16 16:01:40 (3 years ago)
Author:
Till Steinbach <till.steinbach@…>
Branches:
master
Children:
806a055
Parents:
6a969d3 (diff), d522875 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'origin/integration' into refactor/omnet50

Conflicts:

src/fico4omnet/bus/can/CanID.h
src/fico4omnet/utilities/ResultFilters.h

Location:
src/fico4omnet
Files:
30 edited

Legend:

Unmodified
Added
Removed
  • src/fico4omnet/applications/can/sink/CanTrafficSinkAppBase.h

    r6a969d3 r6e2a6bf  
    2727//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 #ifndef __FICO4OMNET_CANTRAFFICSINKAPPBASE_H_
    30 #define __FICO4OMNET_CANTRAFFICSINKAPPBASE_H_
     29#ifndef FICO4OMNET_CANTRAFFICSINKAPPBASE_H_
     30#define FICO4OMNET_CANTRAFFICSINKAPPBASE_H_
    3131
    3232//FiCo4OMNeT
  • src/fico4omnet/applications/can/source/CanTrafficSourceAppBase.cc

    r6a969d3 r6e2a6bf  
    125125                    atof(remoteFramesPeriodicityTokenizer.nextToken()));
    126126            registerRemoteFrameAtPort(can_msg->getCanID());
     127#pragma GCC diagnostic push
     128#pragma GCC diagnostic ignored "-Wfloat-equal"
    127129            if (can_msg->getPeriod() == 0) {
     130#pragma GCC diagnostic pop
    128131                EV<< "Remote frame with ID " << can_msg->getCanID()
    129132                << " has no period. Hence it will be ignored.\n";
  • src/fico4omnet/applications/can/source/CanTrafficSourceAppBase.h

    r6a969d3 r6e2a6bf  
    2828//
    2929
    30 #ifndef __FICO4OMNET_CANTRAFFICSOURCEAPPBASE_H_
    31 #define __FICO4OMNET_CANTRAFFICSOURCEAPPBASE_H_
     30#ifndef FICO4OMNET_CANTRAFFICSOURCEAPPBASE_H_
     31#define FICO4OMNET_CANTRAFFICSOURCEAPPBASE_H_
    3232
    3333//FiCo4OMNeT
     
    9595     * @return Returns the size for the can frame without the size needed for the data field.
    9696     */
    97     unsigned int calculateLength(unsigned int datalength);
     97    unsigned int calculateLength(unsigned int dataLength);
    9898
    9999    /**
  • src/fico4omnet/applications/can/source/colouredsourceapp/CanColouredSourceApp.h

    r6a969d3 r6e2a6bf  
    2828//
    2929
    30 #ifndef __FICO4OMNET_CANCOLOUREDSOURCEAPPE_H_
    31 #define __FICO4OMNET_CANCOLOUREDSOURCEAPPE_H_
     30#ifndef FICO4OMNET_CANCOLOUREDSOURCEAPPE_H_
     31#define FICO4OMNET_CANCOLOUREDSOURCEAPPE_H_
    3232
    3333//FiCo4OMNeT
  • src/fico4omnet/applications/flexray/sink/FRTrafficSinkAppBase.h

    r6a969d3 r6e2a6bf  
    1414//
    1515
    16 #ifndef __FICO4OMNET_FRTRAFFICSINKAPPBASE_H_
    17 #define __FICO4OMNET_FRTRAFFICSINKAPPBASE_H_
     16#ifndef FICO4OMNET_FRTRAFFICSINKAPPBASE_H_
     17#define FICO4OMNET_FRTRAFFICSINKAPPBASE_H_
    1818
    1919//FiCo4OMNeT
  • src/fico4omnet/applications/flexray/source/FRTrafficSourceAppBase.h

    r6a969d3 r6e2a6bf  
    1414//
    1515
    16 #ifndef __FICO4OMNET_FRTRAFFICSOURCEAPPBASE_H_
    17 #define __FICO4OMNET_FRTRAFFICSOURCEAPPBASE_H_
     16#ifndef FICO4OMNET_FRTRAFFICSOURCEAPPBASE_H_
     17#define FICO4OMNET_FRTRAFFICSOURCEAPPBASE_H_
    1818
    1919//FiCo4OMNeT
  • src/fico4omnet/buffer/Buffer.h

    r6a969d3 r6e2a6bf  
    2727//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 #ifndef __FICO4OMNET_BUFFER_H_
    30 #define __FICO4OMNET_BUFFER_H_
     29#ifndef FICO4OMNET_BUFFER_H_
     30#define FICO4OMNET_BUFFER_H_
    3131
    3232//FiCo4OMNeT
     
    5757     * @brief Searches the buffer for a specific frame.
    5858     *
    59      * @param objectID The unique identifier for the frame that should be searched.
     59     * @param objectId The unique identifier for the frame that should be searched.
    6060     *
    6161     * @return A pointer to the DataFrame with the corresponding object identifier. Returns
     
    7676     * @brief Deletes the frame with the corresponding object identifier from the collection #frames.
    7777     *
    78      * @param objectID The unique identifier for the frame that should be deleted.
     78     * @param objectId The unique identifier for the frame that should be deleted.
    7979     */
    8080    void deleteFrame(int objectId);
     
    8383     * @brief Forwards the frame with the corresponding id to all destination gates.
    8484     *
    85      * @param objectID The unique identifier for the frame that should be delivered.
     85     * @param objectId The unique identifier for the frame that should be delivered.
    8686     */
    8787    void deliverFrame(int objectId);
  • src/fico4omnet/buffer/can/CanBuffer.h

    r6a969d3 r6e2a6bf  
    2727//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 #ifndef __FICO4OMNET_CANBUFFER_H_
    30 #define __FICO4OMNET_CANBUFFER_H_
     29#ifndef FICO4OMNET_CANBUFFER_H_
     30#define FICO4OMNET_CANBUFFER_H_
    3131
    3232//FiCo4OMNeT
  • src/fico4omnet/buffer/can/CanInputBuffer.h

    r6a969d3 r6e2a6bf  
    2727//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 #ifndef __FICO4OMNET_CANINPUTBUFFER_H_
    30 #define __FICO4OMNET_CANINPUTBUFFER_H_
     29#ifndef FICO4OMNET_CANINPUTBUFFER_H_
     30#define FICO4OMNET_CANINPUTBUFFER_H_
    3131
    3232//FiCo4OMNeT
  • src/fico4omnet/buffer/can/CanOutputBuffer.h

    r6a969d3 r6e2a6bf  
    2727//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 #ifndef __FICO4OMNET_CANOUTPUTBUFFER_H_
    30 #define __FICO4OMNET_CANOUTPUTBUFFER_H_
     29#ifndef FICO4OMNET_CANOUTPUTBUFFER_H_
     30#define FICO4OMNET_CANOUTPUTBUFFER_H_
    3131
    3232//FiCo4OMNeT
  • src/fico4omnet/buffer/flexray/FRBuffer.h

    r6a969d3 r6e2a6bf  
    1 #ifndef __FICO4OMNET_FRBUFFER_H_
    2 #define __FICO4OMNET_FRBUFFER_H_
     1#ifndef FICO4OMNET_FRBUFFER_H_
     2#define FICO4OMNET_FRBUFFER_H_
    33
    44//FiCo4OMNeT
  • src/fico4omnet/buffer/flexray/FRInputBuffer.h

    r6a969d3 r6e2a6bf  
    1414//
    1515
    16 #ifndef __FICO4OMNET_FRINPUTBUFFER_H_
    17 #define __FICO4OMNET_FRINPUTBUFFER_H_
     16#ifndef FICO4OMNET_FRINPUTBUFFER_H_
     17#define FICO4OMNET_FRINPUTBUFFER_H_
    1818
    1919//FiCo4OMNeT
  • src/fico4omnet/buffer/flexray/FROutputBuffer.h

    r6a969d3 r6e2a6bf  
    1414//
    1515
    16 #ifndef __FICO4OMNET_FROUTPUTBUFFER_H_
    17 #define __FICO4OMNET_FROUTPUTBUFFER_H_
     16#ifndef FICO4OMNET_FROUTPUTBUFFER_H_
     17#define FICO4OMNET_FROUTPUTBUFFER_H_
    1818
    1919//FiCo4OMNeT
  • src/fico4omnet/bus/BusPort.h

    r6a969d3 r6e2a6bf  
    2727//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 #ifndef __FICO4OMNET_BUSPORT_H_
    30 #define __FICO4OMNET_BUSPORT_H_
     29#ifndef FICO4OMNET_BUSPORT_H_
     30#define FICO4OMNET_BUSPORT_H_
    3131
    3232//FiCo4OMNeT
  • src/fico4omnet/bus/can/CanBusLogic.h

    r6a969d3 r6e2a6bf  
    2727//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 #ifndef __FICO4OMNET_CANBUSLOGIC_H_
    30 #define __FICO4OMNET_CANBUSLOGIC_H_
     29#ifndef FICO4OMNET_CANBUSLOGIC_H_
     30#define FICO4OMNET_CANBUSLOGIC_H_
    3131
    3232//FiCo4OMNeT
     
    6969     *
    7070     * @param canID the ID of the can frame
    71      * @param node the module which wants to send the message
     71     * @param module the module which wants to send the message
    7272     * @param signInTime the time the frame was signed in
    7373     * @param rtr identifier whether the frame is a remote frame
  • src/fico4omnet/bus/can/CanID.cc

    r6a969d3 r6e2a6bf  
    3131namespace FiCo4OMNeT {
    3232
    33 CanID::CanID(unsigned int canID, cModule *module, simtime_t signInTime, bool rtr) :
    34         canID(canID), module(module), signInTime(signInTime), rtr(rtr) {
     33CanID::CanID(unsigned int setCanID, cModule *setModule, simtime_t setSignInTime, bool setRtr) :
     34        canID(setCanID), module(setModule), signInTime(setSignInTime), rtr(setRtr) {
    3535}
    3636
  • src/fico4omnet/bus/can/CanID.h

    r6a969d3 r6e2a6bf  
    2727//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 #ifndef __FICO4OMNET_CANID_H_
    30 #define __FICO4OMNET_CANID_H_
     29#ifndef FICO4OMNET_CANID_H_
     30#define FICO4OMNET_CANID_H_
    3131
    3232//FiCo4OMNeT
     
    5353                 * Creates an ID object
    5454                 *
    55                  * @param canID the ID of the can frame
    56                  * @param node the module which wants to send the message
    57                  * @param signInTime the time the frame was signed in
    58                  * @param rtr identifier whether the frame is a remote frame
     55                 * @param setCanID the ID of the can frame
     56                 * @param setModule the module which wants to send the message
     57                 * @param setSignInTime the time the frame was signed in
     58                 * @param setRtr identifier whether the frame is a remote frame
    5959                 */
    60                 CanID(unsigned int canID, cModule* module, simtime_t signInTime, bool rtr);
     60                CanID(unsigned int setCanID, cModule *setModule, simtime_t setSignInTime, bool setRtr);
    6161
    6262                /**
  • src/fico4omnet/bus/flexray/FRBusLogic.h

    r6a969d3 r6e2a6bf  
    1414//
    1515
    16 #ifndef __FICO4OMNET_FRBUSLOGIC_H_
    17 #define __FICO4OMNET_FRBUSLOGIC_H_
     16#ifndef FICO4OMNET_FRBUSLOGIC_H_
     17#define FICO4OMNET_FRBUSLOGIC_H_
    1818
    1919//FiCo4OMNeT
  • src/fico4omnet/bus/flexray/FRTopologyPort.h

    r6a969d3 r6e2a6bf  
    1414//
    1515
    16 #ifndef __FICO4OMNET_FRTOPOLOGYPORT_H_
    17 #define __FICO4OMNET_FRTOPOLOGYPORT_H_
     16#ifndef FICO4OMNET_FRTOPOLOGYPORT_H_
     17#define FICO4OMNET_FRTOPOLOGYPORT_H_
    1818
    1919//FiCo4OMNeT
  • src/fico4omnet/linklayer/NodePort.h

    r6a969d3 r6e2a6bf  
    2727//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 #ifndef __FICO4OMNET_NODEPORT_H_
    30 #define __FICO4OMNET_NODEPORT_H_
     29#ifndef FICO4OMNET_NODEPORT_H_
     30#define FICO4OMNET_NODEPORT_H_
    3131
    3232//FiCo4OMNeT
     
    6060     * @brief Forward a message to the bus module.
    6161     *
    62      * @param the message to be forwarded
     62     * @param msg the message to be forwarded
    6363     */
    6464    virtual void sendMsgToBus(cMessage *msg);
  • src/fico4omnet/linklayer/can/CanPortInput.cc

    r6a969d3 r6e2a6bf  
    9696    delete (scheduledDataFrame);
    9797    scheduledDataFrame = df->dup();
    98     scheduleAt((simTime() + calculateScheduleTiming(df->getBitLength())),
     98    scheduleAt((simTime() + calculateScheduleTiming(static_cast<int>(df->getBitLength()))),
    9999            scheduledDataFrame);
    100100}
  • src/fico4omnet/linklayer/can/CanPortInput.h

    r6a969d3 r6e2a6bf  
    2727//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 #ifndef __FICO4OMNET_CANPORTINPUT_H_
    30 #define __FICO4OMNET_CANPORTINPUT_H_
     29#ifndef FICO4OMNET_CANPORTINPUT_H_
     30#define FICO4OMNET_CANPORTINPUT_H_
    3131
    3232//FiCo4OMNeT
     
    4949public:
    5050    /**
    51 <<<<<<< HEAD
    52      * @brief Modules can register their CanIDs so that incoming remote frames are forwarded to them.
     51     * @brief Constructor
     52     */
     53    CanPortInput();
     54
     55    /**
     56     * @brief Source Applications can register their CanIDs so that incoming remote frames are forwarded to them.
    5357     *
    5458     * @param canID the can ID the module wants to register
    5559     * @param gate the direct input port of the application
    56 =======
    57      * @brief Constructor
    58      */
    59     CanPortInput();
    60 
    61     /**
    62      * @brief Source Applications can register their CanIDs so that incoming remote frames are forwarded to them.
    63 >>>>>>> integration
    6460     */
    6561    virtual void registerOutgoingDataFrame(unsigned int canID, omnetpp::cGate* gate);
  • src/fico4omnet/linklayer/can/CanPortOutput.h

    r6a969d3 r6e2a6bf  
    2727//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 #ifndef __FICO4OMNET_CANPORTOUTPUT_H_
    30 #define __FICO4OMNET_CANPORTOUTPUT_H_
     29#ifndef FICO4OMNET_CANPORTOUTPUT_H_
     30#define FICO4OMNET_CANPORTOUTPUT_H_
    3131
    3232//FiCo4OMNeT
  • src/fico4omnet/linklayer/flexray/FRPortInput.h

    r6a969d3 r6e2a6bf  
    1414//
    1515
    16 #ifndef __FICO4OMNET_FRPORTINPUT_H_
    17 #define __FICO4OMNET_FRPORTINPUT_H_
     16#ifndef FICO4OMNET_FRPORTINPUT_H_
     17#define FICO4OMNET_FRPORTINPUT_H_
    1818
    1919//FiCo4OMNeT
  • src/fico4omnet/linklayer/flexray/FRPortOutput.h

    r6a969d3 r6e2a6bf  
    1414//
    1515
    16 #ifndef __FICO4OMNET_FRPORTOUTPUT_H_
    17 #define __FICO4OMNET_FRPORTOUTPUT_H_
     16#ifndef FICO4OMNET_FRPORTOUTPUT_H_
     17#define FICO4OMNET_FRPORTOUTPUT_H_
    1818
    1919//FiCo4OMNeT
  • src/fico4omnet/scheduler/flexray/FRScheduler.h

    r6a969d3 r6e2a6bf  
    1414//
    1515
    16 #ifndef __FICO4OMNET_FRSCHEDULER_H_
    17 #define __FICO4OMNET_FRSCHEDULER_H_
     16#ifndef FICO4OMNET_FRSCHEDULER_H_
     17#define FICO4OMNET_FRSCHEDULER_H_
    1818
    1919//FiCo4OMNeT
  • src/fico4omnet/scheduler/flexray/SchedulerEvent.h

    r6a969d3 r6e2a6bf  
    1414//
    1515
    16 #ifndef __FICO4OMNET_SCHEDULEREVENT_H_
    17 #define __FICO4OMNET_SCHEDULEREVENT_H_
     16#ifndef FICO4OMNET_SCHEDULEREVENT_H_
     17#define FICO4OMNET_SCHEDULEREVENT_H_
    1818
    1919#include "fico4omnet/scheduler/flexray/SchedulerMessage_m.h"
  • src/fico4omnet/synchronisation/flexray/FRSync.h

    r6a969d3 r6e2a6bf  
    1414//
    1515
    16 #ifndef __FICO4OMNET_FRSYNC_H_
    17 #define __FICO4OMNET_FRSYNC_H_
     16#ifndef FICO4OMNET_FRSYNC_H_
     17#define FICO4OMNET_FRSYNC_H_
    1818
    1919//FiCo4OMNeT
  • src/fico4omnet/utilities/HelperFunctions.h

    r6a969d3 r6e2a6bf  
    1414//
    1515
    16 #ifndef __FICO4OMNET_HELPERFUNCTIONS_H_
    17 #define __FICO4OMNET_HELPERFUNCTIONS_H_
     16#ifndef FICO4OMNET_HELPERFUNCTIONS_H_
     17#define FICO4OMNET_HELPERFUNCTIONS_H_
    1818
    1919//FiCo4OMNeT
  • src/fico4omnet/utilities/ResultFilters.h

    r6a969d3 r6e2a6bf  
    1 #ifndef __FICO4OMNET_RESULTFILTERS_H
    2 #define __FICO4OMNET_RESULTFILTERS_H
     1//
     2// This program is free software: you can redistribute it and/or modify
     3// it under the terms of the GNU Lesser General Public License as published by
     4// the Free Software Foundation, either version 3 of the License, or
     5// (at your option) any later version.
     6//
     7// This program is distributed in the hope that it will be useful,
     8// but WITHOUT ANY WARRANTY; without even the implied warranty of
     9// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     10// GNU Lesser General Public License for more details.
     11//
     12// You should have received a copy of the GNU Lesser General Public License
     13// along with this program.  If not, see http://www.gnu.org/licenses/.
     14//
     15
     16#ifndef FICO4OMNET_RESULTFILTERS_H
     17#define FICO4OMNET_RESULTFILTERS_H
    318
    419//FiCo4OMNeT
Note: See TracChangeset for help on using the changeset viewer.