liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-831] Update DIS profile: add firmware generation and software version. Stack overflow fixes. (#322)

Browse Source 
* BLE: prevent stack overflow in hrs thread
* BLE: add firmware and software attribute to dis service
* BLE: return tx to 0dBm
* BLE: update tx power configuration comment to match real value
This commit is contained in:
あく 2021-02-02 19:41:19 +03:00 committed by GitHub
parent 41219cc78e
commit 8836e34840
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/targets/f4/ble-glue/app_conf.h
View File

@ -5,7 +5,7 @@
#include "hw_if.h" #include "hw_if.h"
#include "ble_bufsize.h" #include "ble_bufsize.h"
#define CFG_TX_POWER (0x1F) /* +6dBm */ #define CFG_TX_POWER (0x19) /* +0dBm */
/** /**
* Define Advertising parameters * Define Advertising parameters
@ -463,7 +463,7 @@ typedef enum
#define CFG_HRS_PROCESS_CB_SIZE (0) #define CFG_HRS_PROCESS_CB_SIZE (0)
#define CFG_HRS_PROCESS_STACK_MEM (0) #define CFG_HRS_PROCESS_STACK_MEM (0)
#define CFG_HRS_PROCESS_PRIORITY osPriorityNone #define CFG_HRS_PROCESS_PRIORITY osPriorityNone
#define CFG_HRS_PROCESS_STACK_SIZE (128 * 5) #define CFG_HRS_PROCESS_STACK_SIZE (128 * 8)
typedef enum { typedef enum {
CFG_LPM_APP, CFG_LPM_APP,

6
firmware/targets/f4/ble-glue/ble_conf.h
View File

@ -61,8 +61,8 @@
#define BLE_CFG_DIS_MODEL_NUMBER_STRING 1 #define BLE_CFG_DIS_MODEL_NUMBER_STRING 1
#define BLE_CFG_DIS_SERIAL_NUMBER_STRING 0 #define BLE_CFG_DIS_SERIAL_NUMBER_STRING 0
#define BLE_CFG_DIS_HARDWARE_REVISION_STRING 0 #define BLE_CFG_DIS_HARDWARE_REVISION_STRING 0
#define BLE_CFG_DIS_FIRMWARE_REVISION_STRING 0 #define BLE_CFG_DIS_FIRMWARE_REVISION_STRING 1
#define BLE_CFG_DIS_SOFTWARE_REVISION_STRING 0 #define BLE_CFG_DIS_SOFTWARE_REVISION_STRING 1
#define BLE_CFG_DIS_SYSTEM_ID 0 #define BLE_CFG_DIS_SYSTEM_ID 0
#define BLE_CFG_DIS_IEEE_CERTIFICATION 0 #define BLE_CFG_DIS_IEEE_CERTIFICATION 0
#define BLE_CFG_DIS_PNP_ID 0 #define BLE_CFG_DIS_PNP_ID 0
@ -75,7 +75,7 @@
#define BLE_CFG_DIS_SERIAL_NUMBER_STRING_LEN_MAX (32) #define BLE_CFG_DIS_SERIAL_NUMBER_STRING_LEN_MAX (32)
#define BLE_CFG_DIS_FIRMWARE_REVISION_STRING_LEN_MAX (32) #define BLE_CFG_DIS_FIRMWARE_REVISION_STRING_LEN_MAX (32)
#define BLE_CFG_DIS_HARDWARE_REVISION_STRING_LEN_MAX (32) #define BLE_CFG_DIS_HARDWARE_REVISION_STRING_LEN_MAX (32)
#define BLE_CFG_DIS_SOFTWARE_REVISION_STRING_LEN_MAX (32) #define BLE_CFG_DIS_SOFTWARE_REVISION_STRING_LEN_MAX (64)
#define BLE_CFG_DIS_MANUFACTURER_NAME_STRING_LEN_MAX (32) #define BLE_CFG_DIS_MANUFACTURER_NAME_STRING_LEN_MAX (32)
#define BLE_CFG_DIS_IEEE_CERTIFICATION_LEN_MAX (32) #define BLE_CFG_DIS_IEEE_CERTIFICATION_LEN_MAX (32)
#define BLE_CFG_DIS_PNP_ID_LEN_MAX (7) #define BLE_CFG_DIS_PNP_ID_LEN_MAX (7)

4
firmware/targets/f4/ble-glue/dis_app.h
View File

@ -8,8 +8,8 @@ extern "C" {
#define DISAPP_MODEL_NUMBER "FlipperZero" #define DISAPP_MODEL_NUMBER "FlipperZero"
#define DISAPP_SERIAL_NUMBER "1.0" #define DISAPP_SERIAL_NUMBER "1.0"
#define DISAPP_HARDWARE_REVISION_NUMBER "1.0" #define DISAPP_HARDWARE_REVISION_NUMBER "1.0"
#define DISAPP_FIRMWARE_REVISION_NUMBER "1.0" #define DISAPP_FIRMWARE_REVISION_NUMBER TARGET
#define DISAPP_SOFTWARE_REVISION_NUMBER "1.0" #define DISAPP_SOFTWARE_REVISION_NUMBER GIT_COMMIT " " GIT_BRANCH " " GIT_BRANCH_NUM " " BUILD_DATE
#define DISAPP_OUI 0x123456 #define DISAPP_OUI 0x123456
#define DISAPP_MANUFACTURER_ID 0x9ABCDE #define DISAPP_MANUFACTURER_ID 0x9ABCDE