jh.chun/firmware-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Firmware 버전 식별 코드 정의를 main.h로 이동

Browse Source 
- parser.c: DR_DEVICE_VERSION 제거
This commit is contained in:
jhChun
2026-03-27 10:05:46 +09:00
parent 92ebe8ebb4
commit 923f29db82
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/ble_peripheral/ble_app_bladder_patch/fstorage.c
View File

@@ -109,9 +109,9 @@ void fds_default_value_set(void)
memset(m_config.hw_no, 0, 12);
memcpy(m_config.hw_no, HARDWARE_VERSION, strlen(HARDWARE_VERSION));
/* Serial Number - default from FIRMWARE_SERIAL_NO */
/* Serial Number - default from SERIAL_NUMBER */
memset(m_config.serial_no, 0, 12);
memcpy(m_config.serial_no, FIRMWARE_SERIAL_NO, strlen(FIRMWARE_SERIAL_NO));
memcpy(m_config.serial_no, SERIAL_NUMBER, strlen(SERIAL_NUMBER));
/* Static Passkey */
memcpy(m_config.static_passkey, static_passkey_dflt, 6);
@@ -125,7 +125,7 @@ void fds_default_value_set(void)
/* Device usage count */
m_config.life_cycle = 0;
/* 피에조 캡처 파라미터 기본값 */
/* 피에조 측정 파라미터 기본값 */
m_config.piezo_freq_option = 1; /* 2.1MHz */
m_config.piezo_delay_us = 10; /* 버스트 후 10us */
m_config.piezo_num_samples = 100; /* 100샘플 */

3
project/ble_peripheral/ble_app_bladder_patch/fstorage.h
View File

@@ -52,8 +52,7 @@
* - VB026030001 = 양산용 26년 3월 생산 1번
------------------------------------------------------------------------- */
#define HARDWARE_VERSION "VBTHW0100"
#define FIRMWARE_VERSION "VBTFW0100"
#define FIRMWARE_SERIAL_NO "VBT26030001"
#define SERIAL_NUMBER "VBT26030001"
#define DEFAULT_PASSKEY "123456"
#pragma pack(1)

6
project/ble_peripheral/ble_app_bladder_patch/main.c
View File

@@ -355,7 +355,7 @@ static void gpio_init(void)
static void load_default_config(void)
{
memset(SERIAL_NO, 0, SERIAL_NO_LENGTH);
memcpy(SERIAL_NO, FIRMWARE_SERIAL_NO, strlen(FIRMWARE_SERIAL_NO));
memcpy(SERIAL_NO, SERIAL_NUMBER, strlen(SERIAL_NUMBER));
memset(m_static_passkey, 0, PASSKEY_LENGTH);
memcpy(m_static_passkey, "123456", PASSKEY_LENGTH);
@@ -392,8 +392,8 @@ static void load_flash_config(void)
if (m_config.serial_no[0] == 0 || m_config.serial_no[0] == (char)0xFF)
{
memset(m_config.serial_no, 0, SERIAL_NO_LENGTH);
memcpy(m_config.serial_no, FIRMWARE_SERIAL_NO, strlen(FIRMWARE_SERIAL_NO));
DBG_PRINTF("[CFG] S/N empty, set default: %s\r\n", FIRMWARE_SERIAL_NO);
memcpy(m_config.serial_no, SERIAL_NUMBER, strlen(SERIAL_NUMBER));
DBG_PRINTF("[CFG] S/N empty, set default: %s\r\n", SERIAL_NUMBER);
m_need_save_defaults = true;
}

7
project/ble_peripheral/ble_app_bladder_patch/main.h
View File

@@ -23,6 +23,13 @@
#ifndef MAIN_H__
#define MAIN_H__
/* -------------------------------------------------------------------------
* Firmware 식별 코드
* - VBTFW0100 = 개발(시험)용 Ver 1.00
* - VB0FW0100 = 양산용 Ver 1.00
------------------------------------------------------------------------- */
#define FIRMWARE_VERSION "VBTFW0100"
/*==============================================================================
* 데이터 길이 상수
*============================================================================*/