Merge branch 'master' of https://github.com/7u83/actube
FossilOrigin-Name: 62c4cb8d0c8db41d622cc22b538572ec3b5f099debef172affc2e0237623aa94
This commit is contained in:
commit
c6aed6d463
@ -209,6 +209,8 @@ int wtpconf_preinit()
|
|||||||
|
|
||||||
conf_vendor_id = CONF_DEFAULT_VENDOR_ID;
|
conf_vendor_id = CONF_DEFAULT_VENDOR_ID;
|
||||||
conf_software_version = bstr_create_from_cfgstr(CONF_DEFAULT_SOFTWARE_VERSION);
|
conf_software_version = bstr_create_from_cfgstr(CONF_DEFAULT_SOFTWARE_VERSION);
|
||||||
|
conf_hardware_version = bstr_create_from_cfgstr(CONF_DEFAULT_HARDWARE_VERSION);
|
||||||
|
conf_bootloader_version = bstr_create_from_cfgstr(CONF_DEFAULT_BOOTLOADER_VERSION);
|
||||||
conf_serial_no = bstr_create_from_cfgstr(CONF_DEFAULT_SERIAL_NO);
|
conf_serial_no = bstr_create_from_cfgstr(CONF_DEFAULT_SERIAL_NO);
|
||||||
|
|
||||||
conf_board_id = bstr_create_from_cfgstr(CONF_DEFAULT_BOARD_ID);
|
conf_board_id = bstr_create_from_cfgstr(CONF_DEFAULT_BOARD_ID);
|
||||||
|
@ -61,6 +61,10 @@ extern uint8_t conf_macaddress_len;
|
|||||||
#define CONF_DEFAULT_BOOTLOADER_VENDOR_ID CW_VENDOR_ID_FSF
|
#define CONF_DEFAULT_BOOTLOADER_VENDOR_ID CW_VENDOR_ID_FSF
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONF_DEFAULT_BOOTLOADER_VERSION
|
||||||
|
#define CONF_DEFAULT_BOOTLOADER_VERSION "W-FAT-BL-0.1"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef CONF_DEFAULT_MODEL_NO
|
#ifndef CONF_DEFAULT_MODEL_NO
|
||||||
#define CONF_DEFAULT_MODEL_NO "W-FAT"
|
#define CONF_DEFAULT_MODEL_NO "W-FAT"
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user