File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change 12
12
13
13
- name : " Populate vars"
14
14
run : |
15
- FIRMWARE_VERSION=$(cat ./core/embed/firmware/version.h | grep "ONEKEY_VERSION " | awk -F "[\"\"]" '{print $2} ')
15
+ FIRMWARE_VERSION=$(cat ./core/embed/firmware/version.h | grep -E '#define ONEKEY_VERSION_(MAJOR|MINOR|PATCH)' | awk '{printf "%s.", $3}' | sed 's/\.$// ')
16
16
BUILD_DATE=$(date +"%Y%m%d")
17
17
SHORT_HASH=$(git rev-parse --short HEAD)
18
18
echo "FIRMWARE_VERSION=$FIRMWARE_VERSION" >> $GITHUB_ENV
Original file line number Diff line number Diff line change @@ -430,6 +430,7 @@ async def _deal_ble_status(value: bytes) -> None:
430
430
if config .is_unlocked ():
431
431
device .set_ble_status (enable = True )
432
432
elif res == _BLE_STATUS_CLOSED :
433
+ utils .BLE_CONNECTED = False
433
434
if not device .is_initialized ():
434
435
StatusBar .get_instance ().show_ble (StatusBar .BLE_STATE_ENABLED )
435
436
ctrl_ble (True )
@@ -543,9 +544,9 @@ def ctrl_ble(enable: bool) -> None:
543
544
"""Request to open or close ble.
544
545
@param enable: True to open, False to close
545
546
"""
546
- if ( not device . ble_enabled () or not device . is_initialized ()) and enable :
547
+ if enable :
547
548
BLE_CTRL .ctrl (0x81 , b"\x01 " )
548
- elif device . ble_enabled () and not enable :
549
+ else :
549
550
BLE_CTRL .ctrl (0x81 , b"\x02 " )
550
551
551
552
You can’t perform that action at this time.
0 commit comments