Set the EOL-style to native for most files using svn propset command. Some files also had inconsistent line endings. Seems that subversion doesn't set the eol-style automatically when files are created unless it is configured for autoprops. The autoprops setting is local to the subversion installation and not the project.
This commit is contained in:
+2
-1
@@ -49,4 +49,5 @@ extern "C" {
|
|||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
#endif /*
|
#endif /* */
|
||||||
|
|
||||||
|
|||||||
@@ -159,7 +159,8 @@ int Life_Safety_Point_Encode_Property_APDU(uint8_t * apdu,
|
|||||||
unsigned object_index = 0;
|
unsigned object_index = 0;
|
||||||
bool state = false;
|
bool state = false;
|
||||||
BACNET_RELIABILITY reliability = RELIABILITY_NO_FAULT_DETECTED;
|
BACNET_RELIABILITY reliability = RELIABILITY_NO_FAULT_DETECTED;
|
||||||
|
|
||||||
|
(void) array_index; /* currently not used */
|
||||||
Life_Safety_Point_Init();
|
Life_Safety_Point_Init();
|
||||||
switch (property) {
|
switch (property) {
|
||||||
case PROP_OBJECT_IDENTIFIER:
|
case PROP_OBJECT_IDENTIFIER:
|
||||||
@@ -354,3 +355,4 @@ int main(void)
|
|||||||
}
|
}
|
||||||
#endif /* TEST_LIFE_SAFETY_POINT */
|
#endif /* TEST_LIFE_SAFETY_POINT */
|
||||||
#endif /* TEST */
|
#endif /* TEST */
|
||||||
|
|
||||||
|
|||||||
@@ -770,7 +770,7 @@ bool MSTP_Master_Node_FSM(volatile struct mstp_port_struct_t * mstp_port)
|
|||||||
mstp_port->DataLength);
|
mstp_port->DataLength);
|
||||||
break;
|
break;
|
||||||
case FRAME_TYPE_BACNET_DATA_EXPECTING_REPLY:
|
case FRAME_TYPE_BACNET_DATA_EXPECTING_REPLY:
|
||||||
/*mstp_port->ReplyPostponedTimer = 0;
|
/*mstp_port->ReplyPostponedTimer = 0; */
|
||||||
/* indicate successful reception to the higher layers */
|
/* indicate successful reception to the higher layers */
|
||||||
dlmstp_put_receive(mstp_port->SourceAddress,
|
dlmstp_put_receive(mstp_port->SourceAddress,
|
||||||
(uint8_t *) & mstp_port->InputBuffer[0],
|
(uint8_t *) & mstp_port->InputBuffer[0],
|
||||||
@@ -1217,12 +1217,12 @@ void MSTP_Init(volatile struct mstp_port_struct_t *mstp_port)
|
|||||||
mstp_port->ReceivedValidFrame = false;
|
mstp_port->ReceivedValidFrame = false;
|
||||||
mstp_port->RetryCount = 0;
|
mstp_port->RetryCount = 0;
|
||||||
mstp_port->SilenceTimer = 0;
|
mstp_port->SilenceTimer = 0;
|
||||||
mstp_port->SilenceTimer = 0;
|
/* mstp_port->ReplyPostponedTimer = 0; */
|
||||||
mstp_port->SoleMaster = false;
|
mstp_port->SoleMaster = false;
|
||||||
mstp_port->SourceAddress = 0;
|
mstp_port->SourceAddress = 0;
|
||||||
mstp_port->TokenCount = 0;
|
mstp_port->TokenCount = 0;
|
||||||
#if 0
|
#if 0
|
||||||
mstp_port->TokenCount = 0;
|
/* these are adjustable, so should already be set */
|
||||||
mstp_port->Nmax_info_frames = DEFAULT_MAX_INFO_FRAMES;
|
mstp_port->Nmax_info_frames = DEFAULT_MAX_INFO_FRAMES;
|
||||||
mstp_port->Nmax_master = DEFAULT_MAX_MASTER;
|
mstp_port->Nmax_master = DEFAULT_MAX_MASTER;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ struct mstp_port_struct_t {
|
|||||||
/* Machine when a Data Expecting Reply Answer activity is completed. */
|
/* Machine when a Data Expecting Reply Answer activity is completed. */
|
||||||
/* note: we always send a reply postponed since a message other than
|
/* note: we always send a reply postponed since a message other than
|
||||||
the reply may be in the transmit queue */
|
the reply may be in the transmit queue */
|
||||||
/* uint16_t ReplyPostponedTimer;
|
/* uint16_t ReplyPostponedTimer; */
|
||||||
|
|
||||||
/* Used to store the Source Address of a received frame. */
|
/* Used to store the Source Address of a received frame. */
|
||||||
uint8_t SourceAddress;
|
uint8_t SourceAddress;
|
||||||
|
|||||||
Reference in New Issue
Block a user