Merge pull request #106 from hefloryd/master
Bump build platform and fix GCC9 warningspull/105/head
commit
ff6be22c80
|
@ -4,7 +4,7 @@ env:
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-16.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# CMakeLists files in this project can
|
# CMakeLists files in this project can
|
||||||
# refer to the root source directory of the project as ${SOES_SOURCE_DIR} and
|
# refer to the root source directory of the project as ${SOES_SOURCE_DIR} and
|
||||||
# to the root binary directory of the project as ${SOES_BINARY_DIR}.
|
# to the root binary directory of the project as ${SOES_BINARY_DIR}.
|
||||||
cmake_minimum_required (VERSION 2.8.4)
|
cmake_minimum_required (VERSION 2.8.12)
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
|
||||||
project (SOES)
|
project (SOES)
|
||||||
|
|
||||||
|
|
|
@ -573,7 +573,7 @@ typedef struct CC_PACKED
|
||||||
CC_PACKED_END
|
CC_PACKED_END
|
||||||
|
|
||||||
CC_PACKED_BEGIN
|
CC_PACKED_BEGIN
|
||||||
typedef struct CC_PACKED
|
typedef struct CC_PACKED CC_ALIGNED(4)
|
||||||
{
|
{
|
||||||
_MBXh mbxheader;
|
_MBXh mbxheader;
|
||||||
_COEh coeheader;
|
_COEh coeheader;
|
||||||
|
@ -585,7 +585,7 @@ typedef struct CC_PACKED
|
||||||
CC_PACKED_END
|
CC_PACKED_END
|
||||||
|
|
||||||
CC_PACKED_BEGIN
|
CC_PACKED_BEGIN
|
||||||
typedef struct CC_PACKED
|
typedef struct CC_PACKED CC_ALIGNED(4)
|
||||||
{
|
{
|
||||||
_MBXh mbxheader;
|
_MBXh mbxheader;
|
||||||
_COEh coeheader;
|
_COEh coeheader;
|
||||||
|
|
|
@ -1022,8 +1022,8 @@ static void SDO_downloadsegment (void)
|
||||||
(coesdo->command & COE_TOGGLEBIT); /* copy toggle bit */
|
(coesdo->command & COE_TOGGLEBIT); /* copy toggle bit */
|
||||||
init_coesdo(coeres, COE_SDORESPONSE, command, 0, 0);
|
init_coesdo(coeres, COE_SDORESPONSE, command, 0, 0);
|
||||||
|
|
||||||
uint32_t *mbxdata = (uint32_t *)&(coesdo->index); /* data pointer */
|
void *mbxdata = &(coesdo->index); /* data pointer */
|
||||||
copy2mbx (mbxdata, (uint8_t *)ESCvar.data, size);
|
copy2mbx (mbxdata, ESCvar.data, size);
|
||||||
|
|
||||||
if (coesdo->command & COE_COMMAND_LASTSEGMENTBIT)
|
if (coesdo->command & COE_COMMAND_LASTSEGMENTBIT)
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,6 +32,7 @@ extern "C"
|
||||||
#define CC_PACKED_BEGIN
|
#define CC_PACKED_BEGIN
|
||||||
#define CC_PACKED_END
|
#define CC_PACKED_END
|
||||||
#define CC_PACKED __attribute__((packed))
|
#define CC_PACKED __attribute__((packed))
|
||||||
|
#define CC_ALIGNED(n) __attribute__((aligned (n)))
|
||||||
|
|
||||||
#ifdef __rtk__
|
#ifdef __rtk__
|
||||||
#define CC_ASSERT(exp) ASSERT (exp)
|
#define CC_ASSERT(exp) ASSERT (exp)
|
||||||
|
|
Loading…
Reference in New Issue