Skip to content

Canif integration#83

Open
Muhammed-ELGendy wants to merge 219 commits into
Dev_CANIFfrom
Canif_Integration
Open

Canif integration#83
Muhammed-ELGendy wants to merge 219 commits into
Dev_CANIFfrom
Canif_Integration

Conversation

@Muhammed-ELGendy

@Muhammed-ELGendy Muhammed-ELGendy commented Jun 23, 2020

Copy link
Copy Markdown
Collaborator

These changes were required to merge into Dev_CANIF.

Abdelrahman1412 and others added 30 commits January 23, 2020 00:39
CanIf_RxIndication still empty
… follow AUTOSAR standard and to be matched with the CanIf_Types
Completed Implementation of the CanIf_GetErrorState function.
Sahar and others added 12 commits May 6, 2020 15:02
added a line that assigns the controller state to the CanIf_ModuleState variable if controller state transition request has been accepted
- removed warnings in CanIf/src/CanIf_GetPduMode.c and CanIf/src/CanIf_GetControllerErrorState.c
…into Canif_Integration

# Conflicts:
#	Software/bsw/gen/CanIf_Cbk.h
#	Software/bsw/gen/CanIf_Cfg.h
#	Software/bsw/static/COM/CanIf/inc/CanIf.h
#	Software/bsw/static/COM/CanIf/src/CanIf_Deinit.c
#	Software/bsw/static/COM/CanIf/src/CanIf_GetControllerErrorState.c
#	Software/bsw/static/COM/CanIf/src/CanIf_GetPduMode.c
#	Software/bsw/static/COM/CanIf/src/CanIf_Init.c
#	Software/bsw/static/COM/CanIf/src/CanIf_ReadRxPduData.c
#	Software/bsw/static/COM/CanIf/src/CanIf_SetControllerMode.c
#	Software/bsw/static/COM/CanIf/src/CanIf_SetPduMode.c
#	Software/bsw/static/COM/CanIf/src/CanIf_Transmit.c
#	Software/bsw/static/Infrastructure/inc/Stub.h
#	Software/bsw/stub/stub.c
- fixed CanIf_SetBaudrate() in CanIf_SetBaudrate.c
@autosarzs

Copy link
Copy Markdown
Owner
  • Mention the issue on the pull request
  • Rebase on main

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Unexpected behavior of the software.

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.