Merge pull request #224 from kwagyeman/master

Add ID string to arch output.
This commit is contained in:
Ibrahim Abd Elkader 2017-05-01 03:51:27 +02:00 committed by GitHub
commit 2dcc14c962
3 changed files with 9 additions and 5 deletions

View File

@ -10,7 +10,9 @@
#define __OMV_BOARDCONFIG_H__
// Architecture info
#define OMV_ARCH_STR "OMV2 F4 256 JPEG"
#define OMV_ARCH_STR "OMV2 F4 256 JPEG" // 33 chars max
#define OMV_BOARD_TYPE "M4"
#define OMV_UNIQUE_ID_ADDR 0x1FFF7A10
#define OMV_XCLK_MCO (0U)
#define OMV_XCLK_TIM (1U)

View File

@ -10,7 +10,9 @@
#define __OMV_BOARDCONFIG_H__
// Architecture info
#define OMV_ARCH_STR "OMV3 F7 512"
#define OMV_ARCH_STR "OMV3 F7 512" // 33 chars max
#define OMV_BOARD_TYPE "M7"
#define OMV_UNIQUE_ID_ADDR 0x1FF0F420
#define OMV_XCLK_MCO (0U)
#define OMV_XCLK_TIM (1U)

View File

@ -126,9 +126,9 @@ void usbdbg_data_in(void *buffer, int length)
break;
case USBDBG_ARCH_STR: {
int len = IM_MIN(64, (strlen(OMV_ARCH_STR)+1));
((char *)buffer)[len-1] = 0;
memcpy(buffer, OMV_ARCH_STR, len);
snprintf((char *) buffer, 64, "%s [%s:%08X%08X%08X]", OMV_ARCH_STR, OMV_BOARD_TYPE, *((unsigned int *) (OMV_UNIQUE_ID_ADDR + 8)),
*((unsigned int *) (OMV_UNIQUE_ID_ADDR + 4)),
*((unsigned int *) (OMV_UNIQUE_ID_ADDR + 0)));
cmd = USBDBG_NONE;
break;
}