Skip to content

Commit

Permalink
Merge pull request #74 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
tblCRCTool Integration candidate: Caelum-rc4+dev23
  • Loading branch information
dzbaker authored Oct 3, 2022
2 parents f569bf5 + 7e42014 commit 251e28f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ This lab application is a ground utility to generate binary table CRCs for cFS.

## Version Notes

### Development Build: v1.3.0-rc4+dev18
- https://github.com/nasa/tblCRCTool/pull/70
- See <https://github.com/nasa/tblCRCTool/pull/70>

### Development Build: v1.3.0-rc4+dev14

- Update Copyright Headers
Expand Down
4 changes: 2 additions & 2 deletions cfe_ts_crc.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ uint32 CalculateCRC(void *DataPtr, uint32 DataLength, uint32 InputCRC)
Crc = ((Crc >> 8) & 0x00FF) ^ CrcTable[Index];
}

return (Crc);
return Crc;
}

int main(int argc, char **argv)
Expand Down Expand Up @@ -163,5 +163,5 @@ int main(int argc, char **argv)
exit(1);
}

return (0);
return 0;
}
2 changes: 1 addition & 1 deletion cfe_ts_crc_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
/*
* Development Build Macro Definitions
*/
#define CFE_TS_CRC_BUILD_NUMBER 14 /*!< @brief Number of commits since baseline */
#define CFE_TS_CRC_BUILD_NUMBER 18 /*!< @brief Number of commits since baseline */
#define CFE_TS_CRC_BUILD_BASELINE \
"v1.3.0-rc4+dev" /*!< @brief Development Build: git tag that is the base for the current */

Expand Down

0 comments on commit 251e28f

Please sign in to comment.