Simplify bruteforce code --nobuild

This commit is contained in:
Willy-JL
2023-10-25 01:38:22 +01:00
parent ed364cbffd
commit 8eaff22935
5 changed files with 22 additions and 36 deletions

View File

@@ -15,7 +15,7 @@ struct ProtocolCfg {
ProtocolMode mode;
struct {
uint8_t counter;
uint32_t current;
uint32_t value;
uint8_t size;
} bruteforce;
union {

View File

@@ -148,11 +148,7 @@ static void make_packet(uint8_t* _size, uint8_t** _packet, ProtocolCfg* _cfg) {
model = cfg->data.proximity_pair.model;
break;
case ProtocolModeBruteforce:
if(_cfg->bruteforce.counter++ >= 10) {
_cfg->bruteforce.counter = 0;
if(_cfg->bruteforce.current++ >= 0xFFFF) _cfg->bruteforce.current = 0x0000;
}
model = cfg->data.proximity_pair.model = _cfg->bruteforce.current;
model = cfg->data.proximity_pair.model = _cfg->bruteforce.value;
break;
}
@@ -229,11 +225,7 @@ static void make_packet(uint8_t* _size, uint8_t** _packet, ProtocolCfg* _cfg) {
action = cfg->data.nearby_action.action;
break;
case ProtocolModeBruteforce:
if(_cfg->bruteforce.counter++ >= 10) {
_cfg->bruteforce.counter = 0;
if(_cfg->bruteforce.current++ >= 0xFF) _cfg->bruteforce.current = 0x00;
}
action = cfg->data.nearby_action.action = _cfg->bruteforce.current;
action = cfg->data.nearby_action.action = _cfg->bruteforce.value;
break;
}
@@ -575,7 +567,7 @@ static void pp_model_callback(void* _ctx, uint32_t index) {
case pp_models_count + 2:
_cfg->mode = ProtocolModeBruteforce;
_cfg->bruteforce.counter = 0;
_cfg->bruteforce.current = cfg->data.proximity_pair.model;
_cfg->bruteforce.value = cfg->data.proximity_pair.model;
_cfg->bruteforce.size = 2;
scene_manager_previous_scene(ctx->scene_manager);
break;
@@ -770,7 +762,7 @@ static void na_action_callback(void* _ctx, uint32_t index) {
case na_actions_count + 2:
_cfg->mode = ProtocolModeBruteforce;
_cfg->bruteforce.counter = 0;
_cfg->bruteforce.current = cfg->data.nearby_action.action;
_cfg->bruteforce.value = cfg->data.nearby_action.action;
_cfg->bruteforce.size = 1;
scene_manager_previous_scene(ctx->scene_manager);
break;

View File

@@ -107,11 +107,7 @@ void make_packet(uint8_t* out_size, uint8_t** out_packet, ProtocolCfg* _cfg) {
model = cfg->data.buds.model;
break;
case ProtocolModeBruteforce:
if(_cfg->bruteforce.counter++ >= 10) {
_cfg->bruteforce.counter = 0;
if(_cfg->bruteforce.current++ >= 0xFFFFFF) _cfg->bruteforce.current = 0x000000;
}
model = cfg->data.buds.model = _cfg->bruteforce.current;
model = cfg->data.buds.model = _cfg->bruteforce.value;
break;
}
@@ -161,11 +157,7 @@ void make_packet(uint8_t* out_size, uint8_t** out_packet, ProtocolCfg* _cfg) {
model = cfg->data.watch.model;
break;
case ProtocolModeBruteforce:
if(_cfg->bruteforce.counter++ >= 10) {
_cfg->bruteforce.counter = 0;
if(_cfg->bruteforce.current++ >= 0xFF) _cfg->bruteforce.current = 0x00;
}
model = cfg->data.watch.model = _cfg->bruteforce.current;
model = cfg->data.watch.model = _cfg->bruteforce.value;
break;
}
@@ -385,7 +377,7 @@ static void buds_model_callback(void* _ctx, uint32_t index) {
case buds_models_count + 2:
_cfg->mode = ProtocolModeBruteforce;
_cfg->bruteforce.counter = 0;
_cfg->bruteforce.current = cfg->data.buds.model;
_cfg->bruteforce.value = cfg->data.buds.model;
_cfg->bruteforce.size = 3;
scene_manager_previous_scene(ctx->scene_manager);
break;
@@ -492,7 +484,7 @@ static void watch_model_callback(void* _ctx, uint32_t index) {
case watch_models_count + 2:
_cfg->mode = ProtocolModeBruteforce;
_cfg->bruteforce.counter = 0;
_cfg->bruteforce.current = cfg->data.watch.model;
_cfg->bruteforce.value = cfg->data.watch.model;
_cfg->bruteforce.size = 1;
scene_manager_previous_scene(ctx->scene_manager);
break;

View File

@@ -83,11 +83,7 @@ static void make_packet(uint8_t* _size, uint8_t** _packet, ProtocolCfg* _cfg) {
model = cfg->model;
break;
case ProtocolModeBruteforce:
if(_cfg->bruteforce.counter++ >= 10) {
_cfg->bruteforce.counter = 0;
if(_cfg->bruteforce.current++ >= 0xFFFFFF) _cfg->bruteforce.current = 0x000000;
}
model = cfg->model = _cfg->bruteforce.current;
model = cfg->model = _cfg->bruteforce.value;
break;
}
@@ -221,7 +217,7 @@ static void model_callback(void* _ctx, uint32_t index) {
case models_count + 2:
_cfg->mode = ProtocolModeBruteforce;
_cfg->bruteforce.counter = 0;
_cfg->bruteforce.current = cfg->model;
_cfg->bruteforce.value = cfg->model;
_cfg->bruteforce.size = 3;
scene_manager_previous_scene(ctx->scene_manager);
break;