rfidrig/ChameleonUltra
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/ChameleonUltra.git synced 2026-05-12 11:22:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #131 from Foxushka/bump-settings

Browse Source 
Update cmd_processor_get_settings
This commit is contained in:
Philippe Teuwen
2023-09-07 20:04:44 +02:00
committed by GitHub
parent e888115d3f 6e4d861625
commit 6a5afb752d
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/application/src/app_cmd.c
+4 -3
View File
@@ -118,15 +118,16 @@ data_frame_tx_t *cmd_processor_reset_settings(uint16_t cmd, uint16_t status, uin
}
data_frame_tx_t *cmd_processor_get_settings(uint16_t cmd, uint16_t status, uint16_t length, uint8_t *data) {
uint8_t settings[6 + BLE_CONNECT_KEY_LEN_MAX] = {};
uint8_t settings[7 + BLE_CONNECT_KEY_LEN_MAX] = {};
settings[0] = SETTINGS_CURRENT_VERSION; // current version
settings[1] = settings_get_animation_config(); // animation mode
settings[2] = settings_get_button_press_config('A'); // short A button press mode
settings[3] = settings_get_button_press_config('B'); // short B button press mode
settings[4] = settings_get_long_button_press_config('A'); // long A button press mode
settings[5] = settings_get_long_button_press_config('B'); // long B button press mode
memcpy(settings + 6, settings_get_ble_connect_key(), BLE_CONNECT_KEY_LEN_MAX);
return data_frame_make(cmd, STATUS_DEVICE_SUCCESS, 6 + BLE_CONNECT_KEY_LEN_MAX, settings);
settings[6] = settings_get_ble_pairing_enable(); // is device require pairing
memcpy(settings + 7, settings_get_ble_connect_key(), BLE_CONNECT_KEY_LEN_MAX);
return data_frame_make(cmd, STATUS_DEVICE_SUCCESS, 7 + BLE_CONNECT_KEY_LEN_MAX, settings);
}
data_frame_tx_t *cmd_processor_set_animation_mode(uint16_t cmd, uint16_t status, uint16_t length, uint8_t *data) {
software/script/chameleon_cmd.py
+4 -3
View File
@@ -5,7 +5,7 @@ import chameleon_com
import chameleon_status
from chameleon_utils import expect_response
CURRENT_VERSION_SETTINGS = 4
CURRENT_VERSION_SETTINGS = 5
DATA_CMD_GET_APP_VERSION = 1000
DATA_CMD_CHANGE_MODE = 1001
@@ -852,14 +852,15 @@ class ChameleonCMD:
def get_device_settings(self):
"""
Get all possible settings
For version 4:
For version 5:
settings[0] = SETTINGS_CURRENT_VERSION; // current version
settings[1] = settings_get_animation_config(); // animation mode
settings[2] = settings_get_button_press_config('A'); // short A button press mode
settings[3] = settings_get_button_press_config('B'); // short B button press mode
settings[4] = settings_get_long_button_press_config('A'); // long A button press mode
settings[5] = settings_get_long_button_press_config('B'); // long B button press mode
settings[6:12] = settings_get_ble_connect_key(); // BLE connection key
settings[6] = settings_get_ble_pairing_enable(); // is device require pairing
settings[7:13] = settings_get_ble_connect_key(); // BLE connection key
"""
data = self.device.send_cmd_sync(DATA_CMD_GET_SETTINGS, 0x00).data
if data[0] != CURRENT_VERSION_SETTINGS: