2021-06-10 11:53:59 +00:00
|
|
|
#include "args.h"
|
2021-06-30 12:02:46 +00:00
|
|
|
#include "hex.h"
|
2021-06-10 11:53:59 +00:00
|
|
|
|
2022-10-05 15:15:23 +00:00
|
|
|
size_t args_get_first_word_length(FuriString* args) {
|
|
|
|
size_t ws = furi_string_search_char(args, ' ');
|
|
|
|
if(ws == FURI_STRING_FAILURE) {
|
|
|
|
ws = furi_string_size(args);
|
2021-06-10 11:53:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return ws;
|
|
|
|
}
|
|
|
|
|
2022-10-05 15:15:23 +00:00
|
|
|
size_t args_length(FuriString* args) {
|
|
|
|
return furi_string_size(args);
|
2021-06-10 11:53:59 +00:00
|
|
|
}
|
|
|
|
|
2022-10-05 15:15:23 +00:00
|
|
|
bool args_read_int_and_trim(FuriString* args, int* value) {
|
2021-09-15 09:59:49 +00:00
|
|
|
size_t cmd_length = args_get_first_word_length(args);
|
|
|
|
|
|
|
|
if(cmd_length == 0) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2022-10-05 15:15:23 +00:00
|
|
|
if(sscanf(furi_string_get_cstr(args), "%d", value) == 1) {
|
|
|
|
furi_string_right(args, cmd_length);
|
|
|
|
furi_string_trim(args);
|
2021-09-15 09:59:49 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2022-10-05 15:15:23 +00:00
|
|
|
bool args_read_string_and_trim(FuriString* args, FuriString* word) {
|
2021-06-10 11:53:59 +00:00
|
|
|
size_t cmd_length = args_get_first_word_length(args);
|
|
|
|
|
|
|
|
if(cmd_length == 0) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2022-10-05 15:15:23 +00:00
|
|
|
furi_string_set_n(word, args, 0, cmd_length);
|
|
|
|
furi_string_right(args, cmd_length);
|
|
|
|
furi_string_trim(args);
|
2021-06-10 11:53:59 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2022-10-05 15:15:23 +00:00
|
|
|
bool args_read_probably_quoted_string_and_trim(FuriString* args, FuriString* word) {
|
|
|
|
if(furi_string_size(args) > 1 && furi_string_get_char(args, 0) == '\"') {
|
|
|
|
size_t second_quote_pos = furi_string_search_char(args, '\"', 1);
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
|
|
|
|
if(second_quote_pos == 0) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2022-10-05 15:15:23 +00:00
|
|
|
furi_string_set_n(word, args, 1, second_quote_pos - 1);
|
|
|
|
furi_string_right(args, second_quote_pos + 1);
|
|
|
|
furi_string_trim(args);
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
return true;
|
|
|
|
} else {
|
|
|
|
return args_read_string_and_trim(args, word);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-10 11:53:59 +00:00
|
|
|
bool args_char_to_hex(char hi_nibble, char low_nibble, uint8_t* byte) {
|
|
|
|
uint8_t hi_nibble_value = 0;
|
|
|
|
uint8_t low_nibble_value = 0;
|
|
|
|
bool result = false;
|
|
|
|
|
2021-06-30 12:02:46 +00:00
|
|
|
if(hex_char_to_hex_nibble(hi_nibble, &hi_nibble_value)) {
|
|
|
|
if(hex_char_to_hex_nibble(low_nibble, &low_nibble_value)) {
|
2021-06-10 11:53:59 +00:00
|
|
|
result = true;
|
|
|
|
*byte = (hi_nibble_value << 4) | low_nibble_value;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2022-10-05 15:15:23 +00:00
|
|
|
bool args_read_hex_bytes(FuriString* args, uint8_t* bytes, size_t bytes_count) {
|
2021-06-10 11:53:59 +00:00
|
|
|
bool result = true;
|
2022-10-05 15:15:23 +00:00
|
|
|
const char* str_pointer = furi_string_get_cstr(args);
|
2021-06-10 11:53:59 +00:00
|
|
|
|
|
|
|
if(args_get_first_word_length(args) == (bytes_count * 2)) {
|
2021-09-17 09:21:08 +00:00
|
|
|
for(size_t i = 0; i < bytes_count; i++) {
|
2021-06-10 11:53:59 +00:00
|
|
|
if(!args_char_to_hex(str_pointer[i * 2], str_pointer[i * 2 + 1], &(bytes[i]))) {
|
|
|
|
result = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
result = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
2022-05-06 13:37:10 +00:00
|
|
|
}
|