Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

slac bi #158

Closed
wants to merge 3 commits into from
+13 −12
Closed

slac bi #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36b86c2
slac: fix cm_mnbc_sound_indicate not according to spec
michael-vassernis May 2, 2022
f14dd71
slac: fix RND field incorrect size inside session struct
michael-vassernis May 2, 2022
623f030
slac: send CM_START_ATTEN.IND three times
michael-vassernis May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions docbook/slac.h.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
byte PEV_MAC [ETHER_ADDR_LEN];
byte EVSE_ID [SLAC_UNIQUE_ID_LEN];
byte EVSE_MAC [ETHER_ADDR_LEN];
byte RND [SLAC_UNIQUE_ID_LEN];
byte RND [SLAC_RND_LEN];
byte NMK [SLAC_NMK_LEN];
byte NID [SLAC_NID_LEN];
byte original_nmk [SLAC_NMK_LEN];
Expand Down Expand Up @@ -320,7 +320,8 @@
uint8_t SenderID [SLAC_UNIQUE_ID_LEN];
uint8_t CNT;
uint8_t RunID [SLAC_RUNID_LEN];
uint8_t RND [SLAC_UNIQUE_ID_LEN];
uint8_t RSVD [8];
uint8_t RND [SLAC_RND_LEN];
}
MSVarField;
}
Expand Down
15 changes: 7 additions & 8 deletions slac/pev_cm_start_atten_char.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,24 +82,23 @@ signed pev_cm_start_atten_char (struct session * session, struct channel * chann
return (slac_debug (session, 1, __func__, CHANNEL_CANTSEND));
}

#if 0

/*
* the GreenPHY spec says to send CM_START_ATTEN.IND three times to ensure
* that is is received;
*/
/*
* the GreenPHY spec says to send CM_START_ATTEN.IND three times to ensure
* that is is received;
*/

slac_debug (session, 0, __func__, "--> CM_START_ATTEN_CHAR.IND");
if (sendmessage (channel, message, (ETHER_MIN_LEN - ETHER_CRC_LEN)) <= 0)
{
return (slac_debug (session, 1, __func__, CHANNEL_CANTSEND));
}

slac_debug (session, 0, __func__, "--> CM_START_ATTEN_CHAR.IND");
if (sendmessage (channel, message, (ETHER_MIN_LEN - ETHER_CRC_LEN)) <= 0)
{
return (slac_debug (session, 1, __func__, CHANNEL_CANTSEND));
}

#endif

return (0);
}

Expand Down
5 changes: 3 additions & 2 deletions slac/slac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ typedef struct __packed session
byte PEV_MAC [ETHER_ADDR_LEN];
byte EVSE_ID [SLAC_UNIQUE_ID_LEN];
byte EVSE_MAC [ETHER_ADDR_LEN];
byte RND [SLAC_UNIQUE_ID_LEN];
byte RND [SLAC_RND_LEN];
byte NMK [SLAC_NMK_LEN];
byte NID [SLAC_NID_LEN];
byte original_nmk [SLAC_NMK_LEN];
Expand Down Expand Up @@ -301,7 +301,8 @@ typedef struct __packed cm_mnbc_sound_indicate
uint8_t SenderID [SLAC_UNIQUE_ID_LEN];
uint8_t CNT;
uint8_t RunID [SLAC_RUNID_LEN];
uint8_t RND [SLAC_UNIQUE_ID_LEN];
uint8_t RSVD [8];
uint8_t RND [SLAC_RND_LEN];
}
MSVarField;
}
Expand Down