diff options
author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2018-06-13 12:07:08 +0200 |
---|---|---|
committer | Dominik Sliwa <dominik.sliwa@toradex.com> | 2018-06-13 12:07:08 +0200 |
commit | ae68313e9f3ff98015abf8dd549cd1bb09b91fac (patch) | |
tree | 123ad6055fa6cad9012f87f761bf63298e7b19c2 | |
parent | c4567ad80132edb17e410f6a60c4125f43277677 (diff) |
fw version 1.1Apalis-TK1_LXDE-Image_2.8b3.111-20180626Apalis-TK1-Mainline_LXDE-Image_2.8b3.111-20180627
Bump version to 1.1
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
-rw-r--r-- | source/apalis-tk1-k20-api.h | 7 | ||||
-rw-r--r-- | source/com_task.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source/apalis-tk1-k20-api.h b/source/apalis-tk1-k20-api.h index 35fc88d..199b433 100644 --- a/source/apalis-tk1-k20-api.h +++ b/source/apalis-tk1-k20-api.h @@ -104,11 +104,8 @@ #define APALIS_TK1_K20_TSC_IRQ 4 #define APALIS_TK1_K20_GPIO_IRQ 5 -#ifndef TESTER_BUILD -#define APALIS_TK1_K20_FW_VER 0x10 -#else -#define APALIS_TK1_K20_FW_VER 0xFE -#endif +#define APALIS_TK1_K20_FW_VER 0x11 +#define APALIS_TK1_K20_TESTER_FW_VER 0xFE #define FW_MINOR (APALIS_TK1_K20_FW_VER & 0x0F) #define FW_MAJOR ((APALIS_TK1_K20_FW_VER & 0xF0) >> 4) diff --git a/source/com_task.c b/source/com_task.c index cd5af10..56a4ce2 100644 --- a/source/com_task.c +++ b/source/com_task.c @@ -8,7 +8,11 @@ volatile uint8_t registers[APALIS_TK1_K20_LAST_REG]; volatile uint8_t regRxHandled; /* Put FW version at known address in a binary. Make it 32-bit to have room for the future*/ +#ifndef TESTER_BUILD const uint32_t __attribute__((section(".FwVersion"), used)) fw_version = APALIS_TK1_K20_FW_VER; +#else +const uint32_t __attribute__((section(".FwVersion"), used)) fw_version = APALIS_TK1_K20_TESTER_FW_VER; +#endif static dspi_slave_handle_t spi_handle; static uint8_t slaveRxData[APALIS_TK1_K20_MAX_BULK + APALIS_TK1_K20_HEADER]; |