Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-11 06:09:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Source code C\C++ formating

Browse Source
This commit is contained in:
Dmitry422
2025-02-02 15:13:55 +07:00
parent eef2441af9
commit a5c241139d
5 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
applications/services/input/input.c
View File

@@ -82,7 +82,6 @@ const char* input_get_type_name(InputType type) {
}
}
// static void input_storage_callback(const void* message, void* context) {
// furi_assert(context);
// InputSettings* settings = context;
@@ -116,28 +115,28 @@ const char* input_get_type_name(InputType type) {
// //furi_record_close(RECORD_STORAGE);
// return;
// }
// furi_hal_vibro_on(true);
// furi_delay_tick (100);
// furi_hal_vibro_on(false);
// furi_delay_tick (100);
// furi_hal_vibro_on(true);
// furi_delay_tick (100);
// furi_hal_vibro_on(false);
// furi_hal_vibro_on(true);
// furi_delay_tick (100);
// furi_hal_vibro_on(false);
// furi_delay_tick (100);
// furi_hal_vibro_on(true);
// furi_delay_tick (100);
// furi_hal_vibro_on(false);
// input_settings_load(settings);
// furi_record_close(RECORD_STORAGE);
// }
// allocate memory for input_settings structure
static InputSettings* input_settings_alloc (void) {
static InputSettings* input_settings_alloc(void) {
InputSettings* settings = malloc(sizeof(InputSettings));
return settings;
}
//free memory from input_settings structure
void input_settings_free (InputSettings* settings) {
free (settings);
void input_settings_free(InputSettings* settings) {
free(settings);
}
int32_t input_srv(void* p) {
@@ -145,9 +144,9 @@ int32_t input_srv(void* p) {
const FuriThreadId thread_id = furi_thread_get_current_id();
FuriPubSub* event_pubsub = furi_pubsub_alloc();
uint32_t counter = 1;
uint32_t counter = 1;
furi_record_create(RECORD_INPUT_EVENTS, event_pubsub);
//define object input_settings, take memory load (or init) settings and create record for access to settings structure outside
InputSettings* settings = input_settings_alloc();
furi_record_create(RECORD_INPUT_SETTINGS, settings);
@@ -216,9 +215,9 @@ int32_t input_srv(void* p) {
event.type = pin_states[i].state ? InputTypePress : InputTypeRelease;
furi_pubsub_publish(event_pubsub, &event);
// do vibro if user setup vibro touch level in Settings-Input.
if (settings->vibro_touch_level) {
if(settings->vibro_touch_level) {
furi_hal_vibro_on(true);
furi_delay_tick (settings->vibro_touch_level);
furi_delay_tick(settings->vibro_touch_level);
furi_hal_vibro_on(false);
};
}
@@ -237,6 +236,5 @@ int32_t input_srv(void* p) {
}
}
return 0;
}

1
applications/services/input/input.h
View File

@@ -9,7 +9,6 @@
#include "input_settings.h"
#include <storage/storage.h>
#ifdef __cplusplus
extern "C" {
#endif

16
applications/services/input/input_settings.c
View File

@@ -26,16 +26,16 @@ void input_settings_load(InputSettings* settings) {
// take version from settings file metadata, if cant then break and fill settings with 0 and save to settings file;
uint8_t version;
if(!saved_struct_get_metadata(INPUT_SETTINGS_PATH, NULL, &version, NULL)) break;
// if config actual version - load it directly
if(version == INPUT_SETTINGS_VER) {
if(version == INPUT_SETTINGS_VER) {
success = saved_struct_load(
INPUT_SETTINGS_PATH,
settings,
sizeof(InputSettings),
INPUT_SETTINGS_MAGIC,
INPUT_SETTINGS_VER);
// if config previous version - load it and inicialize new settings
// if config previous version - load it and inicialize new settings
} else if(
version ==
INPUT_SETTINGS_VER_0) { // if config previous version - load it and manual set new settings to inital value
@@ -75,11 +75,11 @@ void input_settings_save(const InputSettings* settings) {
INPUT_SETTINGS_MAGIC,
INPUT_SETTINGS_VER);
// debug log
// FURI_LOG_D(TAG,"SAVE");
// char buffer[12] = {};
// snprintf(buffer, sizeof(buffer), "%d",settings->vibro_touch_level);
// FURI_LOG_D(TAG,buffer);
// debug log
// FURI_LOG_D(TAG,"SAVE");
// char buffer[12] = {};
// snprintf(buffer, sizeof(buffer), "%d",settings->vibro_touch_level);
// FURI_LOG_D(TAG,buffer);
if(!success) {
FURI_LOG_E(TAG, "Failed to save file");