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

Merge branch 'dev' of https://github.com/Next-Flip/Momentum-Firmware into dev

Browse Source
This commit is contained in:
Willy-JL
2024-03-17 04:35:59 +00:00
parent e07f3f51bd 6f9e50d7df
commit 10a03e0cc1
264 changed files with 2203 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
applications/system/findmy/findmy.c
View File

@@ -53,7 +53,7 @@ static FindMy* findmy_app_alloc() {
findmy_main_update_active(app->findmy_main, furi_hal_bt_extra_beacon_is_active());
findmy_main_update_interval(app->findmy_main, app->state.broadcast_interval);
findmy_main_update_type(app->findmy_main, findmy_data_get_type(app->state.data));
findmy_main_update_type(app->findmy_main, app->state.tag_type);
return app;
}
@@ -141,16 +141,19 @@ void findmy_toggle_beacon(FindMy* app) {
findmy_main_update_active(app->findmy_main, furi_hal_bt_extra_beacon_is_active());
}
FindMyType findmy_data_get_type(uint8_t data[EXTRA_BEACON_MAX_DATA_SIZE]) {
if(data[0] == 0x1E && // Length
data[1] == 0xFF && // Manufacturer Specific Data
data[2] == 0x4C && // Company ID (Apple, Inc.)
data[3] == 0x00 && // ...
data[4] == 0x12 && // Type (FindMy)
data[5] == 0x19 // Length
) {
return FindMyTypeApple;
} else {
return FindMyTypeSamsung;
void findmy_set_tag_type(FindMy* app, FindMyType type) {
app->state.tag_type = type;
findmy_state_sync_config(&app->state);
findmy_state_save(&app->state);
findmy_main_update_type(app->findmy_main, type);
FURI_LOG_I("TagType2", "Tag Type: %d", type);
}
void furi_hal_bt_reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]) {
uint8_t tmp;
for(size_t i = 0; i < GAP_MAC_ADDR_SIZE / 2; i++) {
tmp = mac_addr[i];
mac_addr[i] = mac_addr[GAP_MAC_ADDR_SIZE - 1 - i];
mac_addr[GAP_MAC_ADDR_SIZE - 1 - i] = tmp;
}
}

2
applications/system/findmy/findmy.h
View File

@@ -1,5 +1,3 @@
#pragma once
typedef struct FindMy FindMy;
typedef enum FindMyType FindMyType;

10
applications/system/findmy/findmy_i.h
View File

@@ -20,6 +20,9 @@
#include <gui/modules/popup.h>
#include "scenes/findmy_scene.h"
#include "helpers/base64.h"
#if FW_ORIGIN_Official
void furi_hal_bt_reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]);
#endif
struct FindMy {
Gui* gui;
@@ -46,12 +49,7 @@ typedef enum {
FindMyViewPopup,
} FindMyView;
enum FindMyType {
FindMyTypeApple,
FindMyTypeSamsung,
};
void findmy_change_broadcast_interval(FindMy* app, uint8_t value);
void findmy_change_transmit_power(FindMy* app, uint8_t value);
void findmy_set_tag_type(FindMy* app, FindMyType type);
void findmy_toggle_beacon(FindMy* app);
FindMyType findmy_data_get_type(uint8_t data[EXTRA_BEACON_MAX_DATA_SIZE]);

35
applications/system/findmy/findmy_state.c
View File

@@ -29,9 +29,18 @@ bool findmy_state_load(FindMyState* out_state) {
if(!flipper_format_read_uint32(file, "transmit_power", &tmp, 1)) break;
state.transmit_power = tmp;
if(!flipper_format_read_uint32(file, "tag_type", &tmp, 1)) {
// Support migrating from old config
tmp = FindMyTypeApple;
flipper_format_rewind(file);
}
state.tag_type = tmp;
if(!flipper_format_read_hex(file, "mac", state.mac, sizeof(state.mac))) break;
if(!flipper_format_read_hex(file, "data", state.data, sizeof(state.data))) break;
if(!flipper_format_read_hex(
file, "data", state.data, findmy_state_data_size(state.tag_type)))
break;
loaded_from_file = true;
} while(0);
@@ -45,6 +54,8 @@ bool findmy_state_load(FindMyState* out_state) {
state.broadcast_interval = 5;
state.transmit_power = 6;
state.tag_type = FindMyTypeApple;
// Set default mac
uint8_t default_mac[EXTRA_BEACON_MAC_ADDR_SIZE] = {0x66, 0x55, 0x44, 0x33, 0x22, 0x11};
memcpy(state.mac, default_mac, sizeof(state.mac));
@@ -88,7 +99,8 @@ void findmy_state_apply(FindMyState* state) {
furi_check(furi_hal_bt_extra_beacon_set_config(&state->config));
furi_check(furi_hal_bt_extra_beacon_set_data(state->data, sizeof(state->data)));
furi_check(
furi_hal_bt_extra_beacon_set_data(state->data, findmy_state_data_size(state->tag_type)));
if(state->beacon_active) {
furi_check(furi_hal_bt_extra_beacon_start());
@@ -120,11 +132,28 @@ void findmy_state_save(FindMyState* state) {
tmp = state->transmit_power;
if(!flipper_format_write_uint32(file, "transmit_power", &tmp, 1)) break;
tmp = state->tag_type;
if(!flipper_format_write_uint32(file, "tag_type", &tmp, 1)) break;
if(!flipper_format_write_hex(file, "mac", state->mac, sizeof(state->mac))) break;
if(!flipper_format_write_hex(file, "data", state->data, sizeof(state->data))) break;
if(!flipper_format_write_hex(
file, "data", state->data, findmy_state_data_size(state->tag_type)))
break;
} while(0);
flipper_format_free(file);
furi_record_close(RECORD_STORAGE);
}
uint8_t findmy_state_data_size(FindMyType type) {
switch(type) {
case FindMyTypeApple:
case FindMyTypeSamsung:
return 31;
case FindMyTypeTile:
return 21;
default:
return 0;
}
}

9
applications/system/findmy/findmy_state.h
View File

@@ -7,6 +7,12 @@
#define FINDMY_STATE_DIR EXT_PATH("apps_data/findmy")
#define FINDMY_STATE_PATH FINDMY_STATE_DIR "/findmy_state.txt"
typedef enum {
FindMyTypeApple,
FindMyTypeSamsung,
FindMyTypeTile,
} FindMyType;
typedef struct {
bool beacon_active;
uint8_t broadcast_interval;
@@ -14,6 +20,7 @@ typedef struct {
uint8_t mac[EXTRA_BEACON_MAC_ADDR_SIZE];
uint8_t data[EXTRA_BEACON_MAX_DATA_SIZE];
FindMyType tag_type;
// Generated from the other state values
GapExtraBeaconConfig config;
@@ -26,3 +33,5 @@ void findmy_state_apply(FindMyState* state);
void findmy_state_sync_config(FindMyState* state);
void findmy_state_save(FindMyState* state);
uint8_t findmy_state_data_size(FindMyType type);

11
applications/system/findmy/generate_keys.py
View File

@@ -73,11 +73,7 @@ def main():
s256_b64 = base64.b64encode(public_key_hash.finalize()).decode("ascii")
if "/" not in s256_b64[:7]:
fname = (
f"{prefix}_{s256_b64[:7]}.keys"
if prefix
else f"{s256_b64[:7]}.keys"
)
fname = f"{prefix}_{mac}.keys" if prefix else f"{mac}.keys"
print(f"{i + 1})")
print("Private key (Base64):", private_key_b64)
@@ -95,8 +91,9 @@ def main():
print("Payload:", payload)
print()
print(
"Place the .keys file onto your Flipper or input the MAC and Payload manually."
"Place the .keys file onto your Flipper in the Apps_Data->FindMyFlipper folder or input the MAC and Payload manually."
)
print()
with open(f"keys/{fname}", "w") as f:
f.write(f"Private key: {private_key_b64}\n")
@@ -106,6 +103,8 @@ def main():
f.write(f"Public key (Hex): {public_key_hex}\n")
f.write(f"MAC: {mac}\n")
f.write(f"Payload: {payload}\n")
print("Keys file saved to:", os.path.abspath(f"keys/{fname}"))
print()
break

14
applications/system/findmy/scenes/findmy_scene_config.c
View File

@@ -3,8 +3,7 @@
enum VarItemListIndex {
VarItemListIndexBroadcastInterval,
VarItemListIndexTransmitPower,
VarItemListIndexImportTagFromFile,
VarItemListIndexRegisterTagManually,
VarItemListIndexRegisterTag,
VarItemListIndexAbout,
};
@@ -58,9 +57,7 @@ void findmy_scene_config_on_enter(void* context) {
snprintf(power_str, sizeof(power_str), "%ddBm", app->state.transmit_power);
variable_item_set_current_value_text(item, power_str);
item = variable_item_list_add(var_item_list, "Import Tag From File", 0, NULL, NULL);
item = variable_item_list_add(var_item_list, "Register Tag Manually", 0, NULL, NULL);
item = variable_item_list_add(var_item_list, "Register Tag", 0, NULL, NULL);
item = variable_item_list_add(
var_item_list,
@@ -86,11 +83,8 @@ bool findmy_scene_config_on_event(void* context, SceneManagerEvent event) {
scene_manager_set_scene_state(app->scene_manager, FindMySceneConfig, event.event);
consumed = true;
switch(event.event) {
case VarItemListIndexImportTagFromFile:
scene_manager_next_scene(app->scene_manager, FindMySceneConfigImport);
break;
case VarItemListIndexRegisterTagManually:
scene_manager_next_scene(app->scene_manager, FindMySceneConfigMac);
case VarItemListIndexRegisterTag:
scene_manager_next_scene(app->scene_manager, FindMySceneConfigTagtype);
break;
case VarItemListIndexAbout:
break;

17
applications/system/findmy/scenes/findmy_scene_config_import.c
View File

@@ -3,6 +3,7 @@
enum VarItemListIndex {
VarItemListIndexNrfConnect,
VarItemListIndexOpenHaystack,
VarItemListIndexRegisterTagManually,
};
static const char* parse_nrf_connect(FindMy* app, const char* path) {
@@ -42,10 +43,15 @@ static const char* parse_nrf_connect(FindMy* app, const char* path) {
furi_string_trim(line);
error = "Wrong payload size";
uint8_t data[EXTRA_BEACON_MAX_DATA_SIZE];
if(furi_string_size(line) != sizeof(data) * 2) break;
size_t line_size = furi_string_size(line);
uint8_t data_size = findmy_state_data_size(app->state.tag_type);
FURI_LOG_I("ImportPayload", "Line Size: %d", line_size);
FURI_LOG_I("ImportPayload", "Data Size: %d", data_size * 2);
if(line_size != data_size * 2) break;
// Initialize full data to 0's, then fill only first data_size bytes
uint8_t data[EXTRA_BEACON_MAX_DATA_SIZE] = {0};
error = NULL;
for(size_t i = 0; i < sizeof(data); i++) {
for(size_t i = 0; i < data_size; i++) {
char a = furi_string_get_char(line, i * 2);
char b = furi_string_get_char(line, i * 2 + 1);
if((a < 'A' && a > 'F') || (a < '0' && a > '9') || (b < 'A' && b > 'F') ||
@@ -151,6 +157,8 @@ void findmy_scene_config_import_on_enter(void* context) {
item = variable_item_list_add(var_item_list, "OpenHaystack (.keys)", 0, NULL, NULL);
item = variable_item_list_add(var_item_list, "Register Tag Manually", 0, NULL, NULL);
// This scene acts more like a submenu than a var item list tbh
UNUSED(item);
@@ -178,6 +186,9 @@ bool findmy_scene_config_import_on_event(void* context, SceneManagerEvent event)
case VarItemListIndexOpenHaystack:
extension = ".keys";
break;
case VarItemListIndexRegisterTagManually:
scene_manager_next_scene(app->scene_manager, FindMySceneConfigMac);
break;
default:
break;
}

11
applications/system/findmy/scenes/findmy_scene_config_packet.c
View File

@@ -16,7 +16,7 @@ void findmy_scene_config_packet_on_enter(void* context) {
byte_input_set_header_text(byte_input, "Enter Bluetooth Payload:");
memcpy(app->packet_buf, app->state.data, sizeof(app->packet_buf));
memcpy(app->packet_buf, app->state.data, findmy_state_data_size(app->state.tag_type));
byte_input_set_result_callback(
byte_input,
@@ -24,7 +24,7 @@ void findmy_scene_config_packet_on_enter(void* context) {
NULL,
app,
app->packet_buf,
sizeof(app->packet_buf));
findmy_state_data_size(app->state.tag_type));
view_dispatcher_switch_to_view(app->view_dispatcher, FindMyViewByteInput);
}
@@ -39,11 +39,10 @@ bool findmy_scene_config_packet_on_event(void* context, SceneManagerEvent event)
case ByteInputResultOk:
scene_manager_search_and_switch_to_previous_scene(
app->scene_manager, FindMySceneConfig);
memcpy(app->state.data, app->packet_buf, sizeof(app->state.data));
memcpy(app->state.data, app->packet_buf, findmy_state_data_size(app->state.tag_type));
findmy_state_save(&app->state);
furi_check(
furi_hal_bt_extra_beacon_set_data(app->state.data, sizeof(app->state.data)));
findmy_main_update_type(app->findmy_main, findmy_data_get_type(app->state.data));
furi_check(furi_hal_bt_extra_beacon_set_data(
app->state.data, findmy_state_data_size(app->state.tag_type)));
break;
default:
break;

70
applications/system/findmy/scenes/findmy_scene_config_tagtype.c Normal file
View File

@@ -0,0 +1,70 @@
#include "../findmy_i.h"
enum VarItemListIndex {
VarItemListIndexApple,
VarItemListIndexSamsung,
VarItemListIndexTile,
};
void findmy_scene_config_tagtype_callback(void* context, uint32_t index) {
furi_assert(context);
FindMy* app = context;
view_dispatcher_send_custom_event(app->view_dispatcher, index);
}
void findmy_scene_config_tagtype_on_enter(void* context) {
FindMy* app = context;
VariableItemList* var_item_list = app->var_item_list;
VariableItem* item;
variable_item_list_set_header(var_item_list, "Choose tag type");
item = variable_item_list_add(var_item_list, "Apple AirTag", 0, NULL, NULL);
item = variable_item_list_add(var_item_list, "Samsung SmartTag", 0, NULL, NULL);
item = variable_item_list_add(var_item_list, "Tile SmartTag", 0, NULL, NULL);
UNUSED(item);
variable_item_list_set_enter_callback(
var_item_list, findmy_scene_config_tagtype_callback, app);
variable_item_list_set_selected_item(
var_item_list, scene_manager_get_scene_state(app->scene_manager, FindMySceneConfigImport));
view_dispatcher_switch_to_view(app->view_dispatcher, FindMyViewVarItemList);
}
bool findmy_scene_config_tagtype_on_event(void* context, SceneManagerEvent event) {
FindMy* app = context;
bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) {
scene_manager_set_scene_state(app->scene_manager, FindMySceneConfigTagtype, event.event);
consumed = true;
switch(event.event) {
case VarItemListIndexApple:
findmy_set_tag_type(app, FindMyTypeApple);
break;
case VarItemListIndexSamsung:
findmy_set_tag_type(app, FindMyTypeSamsung);
break;
case VarItemListIndexTile:
findmy_set_tag_type(app, FindMyTypeTile);
break;
default:
break;
}
scene_manager_next_scene(app->scene_manager, FindMySceneConfigImport);
}
return consumed;
}
void findmy_scene_config_tagtype_on_exit(void* context) {
FindMy* app = context;
VariableItemList* var_item_list = app->var_item_list;
variable_item_list_reset(var_item_list);
}

1
applications/system/findmy/scenes/findmy_scenes.h
View File

@@ -1,6 +1,7 @@
ADD_SCENE(findmy, main, Main)
ADD_SCENE(findmy, config, Config)
ADD_SCENE(findmy, config_import, ConfigImport)
ADD_SCENE(findmy, config_tagtype, ConfigTagtype)
ADD_SCENE(findmy, config_import_result, ConfigImportResult)
ADD_SCENE(findmy, config_mac, ConfigMac)
ADD_SCENE(findmy, config_packet, ConfigPacket)

14
applications/system/findmy/views/findmy_main.c
View File

@@ -34,18 +34,22 @@ static void findmy_main_draw_callback(Canvas* canvas, void* _model) {
snprintf(interval_str, sizeof(interval_str), "Ping Interval: %ds", model->interval);
canvas_draw_str(canvas, 4, 62, interval_str);
canvas_set_font(canvas, FontPrimary);
const char* network_text = "";
switch(model->type) {
case FindMyTypeApple:
canvas_draw_str(canvas, 4, 32, "Apple Network");
canvas_draw_icon(canvas, 80, 24, &I_Lock_7x8);
network_text = "Apple Network";
break;
case FindMyTypeSamsung:
canvas_draw_str(canvas, 4, 32, "Samsung Network");
canvas_draw_icon(canvas, 97, 24, &I_Lock_7x8);
network_text = "Samsung Network";
break;
case FindMyTypeTile:
network_text = "Tile Network";
break;
default:
break;
}
canvas_draw_str(canvas, 4, 32, network_text);
canvas_draw_icon(canvas, 6 + canvas_string_width(canvas, network_text), 24, &I_Lock_7x8);
canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 100, 61, "Config");
canvas_draw_line(canvas, 100, 51, 127, 51);
@@ -103,7 +107,7 @@ FindMyMain* findmy_main_alloc(FindMy* app) {
{
model->active = app->state.beacon_active;
model->interval = app->state.broadcast_interval;
model->type = findmy_data_get_type(app->state.data);
model->type = app->state.tag_type;
},
false);
view_set_context(findmy_main->view, findmy_main);

1
applications/system/findmy/views/findmy_main.h
View File

@@ -1,6 +1,7 @@
#pragma once
#include "../findmy.h"
#include "../findmy_state.h"
#include <gui/view.h>
typedef enum {

9
applications/system/js_app/application.fam
View File

@@ -94,6 +94,7 @@ App(
requires=["js_app"],
sources=["modules/js_keyboard.c"],
)
App(
appid="js_subghz",
apptype=FlipperAppType.PLUGIN,
@@ -101,3 +102,11 @@ App(
requires=["js_app"],
sources=["modules/js_subghz/*.c"],
)
App(
appid="js_gpio",
apptype=FlipperAppType.PLUGIN,
entry_point="js_gpio_ep",
requires=["js_app"],
sources=["modules/js_gpio.c"],
)

5
applications/system/js_app/examples/apps/Scripts/dialog.js
View File

@@ -7,13 +7,16 @@ let dialog_params = ({
header: "Test_header",
text: "Test_text",
button_left: "Left",
button_right: "Right",
button_right: "Files",
button_center: "OK"
});
let result2 = dialog.custom(dialog_params);
if (result2 === "") {
print("Back is pressed");
} else if (result2 === "Files") {
let result3 = dialog.pickFile("/ext", "*");
print("Selected", result3);
} else {
print(result2, "is pressed");
}

62
applications/system/js_app/examples/apps/Scripts/gpio.js Normal file
View File

@@ -0,0 +1,62 @@
let gpio = require("gpio");
// initialize pins
gpio.init("PC3", "outputPushPull", "up"); // pin, mode, pull
print("PC3 is initialized as outputPushPull with pull-up");
gpio.init("PC1", "input", "down"); // pin, mode, pull
print("PC1 is initialized as input with pull-down");
// let led on PC3 blink
gpio.write("PC3", true); // high
delay(1000);
gpio.write("PC3", false); // low
delay(1000);
gpio.write("PC3", true); // high
delay(1000);
gpio.write("PC3", false); // low
// read value from PC1 and write it to PC3
while (true) {
let value = gpio.read("PC1");
gpio.write("PC3", value);
value ? print("PC1 is high") : print("PC1 is low");
delay(100);
}
// possible pins https://docs.flipper.net/gpio-and-modules#miFsS
// "PA7" aka 2
// "PA6" aka 3
// "PA4" aka 4
// "PB3" aka 5
// "PB2" aka 6
// "PC3" aka 7
// "PA14" aka 10
// "PA13" aka 12
// "PB6" aka 13
// "PB7" aka 14
// "PC1" aka 15
// "PC0" aka 16
// "PB14" aka 17
// possible modes
// "input"
// "outputPushPull"
// "outputOpenDrain"
// "altFunctionPushPull"
// "altFunctionOpenDrain"
// "analog"
// "interruptRise"
// "interruptFall"
// "interruptRiseFall"
// "eventRise"
// "eventFall"
// "eventRiseFall"
// possible pull
// "no"
// "up"
// "down"

5
applications/system/js_app/examples/apps/Scripts/storage.js
View File

@@ -4,10 +4,13 @@ let path = "/ext/storage.test";
print("File exists:", storage.exists(path));
print("Writing...");
storage.write(path, "Hello World!");
storage.write(path, "Hello ");
print("File exists:", storage.exists(path));
// Append will create the file even if it doesnt exist!
storage.append(path, "World!");
print("Reading...");
let data = storage.read(path);
print(data);

53
applications/system/js_app/modules/js_dialog.c
View File

@@ -1,6 +1,7 @@
#include <core/common_defines.h>
#include "../js_modules.h"
#include <dialogs/dialogs.h>
#include <assets_icons.h>
static bool js_dialog_msg_parse_params(struct mjs* mjs, const char** hdr, const char** msg) {
size_t num_args = mjs_nargs(mjs);
@@ -128,10 +129,62 @@ static void js_dialog_custom(struct mjs* mjs) {
}
}
static void js_dialog_pick_file(struct mjs* mjs) {
if(mjs_nargs(mjs) != 2) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Wrong arguments");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
mjs_val_t base_path_obj = mjs_arg(mjs, 0);
if(!mjs_is_string(base_path_obj)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Base path must be a string");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
size_t base_path_len = 0;
const char* base_path = mjs_get_string(mjs, &base_path_obj, &base_path_len);
if((base_path_len == 0) || (base_path == NULL)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Bad base path argument");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
mjs_val_t extension_obj = mjs_arg(mjs, 1);
if(!mjs_is_string(extension_obj)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Extension must be a string");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
size_t extension_len = 0;
const char* extension = mjs_get_string(mjs, &extension_obj, &extension_len);
if((extension_len == 0) || (extension == NULL)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Bad extension argument");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
const DialogsFileBrowserOptions browser_options = {
.extension = extension,
.icon = &I_file_10px,
.base_path = base_path,
};
FuriString* path = furi_string_alloc_set(base_path);
if(dialog_file_browser_show(dialogs, path, path, &browser_options)) {
mjs_return(mjs, mjs_mk_string(mjs, furi_string_get_cstr(path), ~0, true));
} else {
mjs_return(mjs, MJS_UNDEFINED);
}
furi_string_free(path);
furi_record_close(RECORD_DIALOGS);
}
static void* js_dialog_create(struct mjs* mjs, mjs_val_t* object) {
mjs_val_t dialog_obj = mjs_mk_object(mjs);
mjs_set(mjs, dialog_obj, "message", ~0, MJS_MK_FN(js_dialog_message));
mjs_set(mjs, dialog_obj, "custom", ~0, MJS_MK_FN(js_dialog_custom));
mjs_set(mjs, dialog_obj, "pickFile", ~0, MJS_MK_FN(js_dialog_pick_file));
*object = dialog_obj;
return (void*)1;

272
applications/system/js_app/modules/js_gpio.c Normal file
View File

@@ -0,0 +1,272 @@
#include "../js_modules.h"
#include <furi_hal_gpio.h>
#include <furi_hal_resources.h>
#include <expansion/expansion.h>
typedef struct {
const GpioPin* pin;
const char* name;
} GpioPinCtx;
static const GpioPinCtx js_gpio_pins[] = {
{.pin = &gpio_ext_pa7, .name = "PA7"}, // 2
{.pin = &gpio_ext_pa6, .name = "PA6"}, // 3
{.pin = &gpio_ext_pa4, .name = "PA4"}, // 4
{.pin = &gpio_ext_pb3, .name = "PB3"}, // 5
{.pin = &gpio_ext_pb2, .name = "PB2"}, // 6
{.pin = &gpio_ext_pc3, .name = "PC3"}, // 7
{.pin = &gpio_swclk, .name = "PA14"}, // 10
{.pin = &gpio_swdio, .name = "PA13"}, // 12
{.pin = &gpio_usart_tx, .name = "PB6"}, // 13
{.pin = &gpio_usart_rx, .name = "PB7"}, // 14
{.pin = &gpio_ext_pc1, .name = "PC1"}, // 15
{.pin = &gpio_ext_pc0, .name = "PC0"}, // 16
{.pin = &gpio_ibutton, .name = "PB14"}, // 17
};
bool js_gpio_get_gpio_pull(const char* pull, GpioPull* value) {
if(strcmp(pull, "no") == 0) {
*value = GpioPullNo;
return true;
} else if(strcmp(pull, "up") == 0) {
*value = GpioPullUp;
return true;
} else if(strcmp(pull, "down") == 0) {
*value = GpioPullDown;
return true;
} else {
*value = GpioPullNo;
return true;
}
return false;
}
bool js_gpio_get_gpio_mode(const char* mode, GpioMode* value) {
if(strcmp(mode, "input") == 0) {
*value = GpioModeInput;
return true;
} else if(strcmp(mode, "outputPushPull") == 0) {
*value = GpioModeOutputPushPull;
return true;
} else if(strcmp(mode, "outputOpenDrain") == 0) {
*value = GpioModeOutputOpenDrain;
return true;
} else if(strcmp(mode, "altFunctionPushPull") == 0) {
*value = GpioModeAltFunctionPushPull;
return true;
} else if(strcmp(mode, "altFunctionOpenDrain") == 0) {
*value = GpioModeAltFunctionOpenDrain;
return true;
} else if(strcmp(mode, "analog") == 0) {
*value = GpioModeAnalog;
return true;
} else if(strcmp(mode, "interruptRise") == 0) {
*value = GpioModeInterruptRise;
return true;
} else if(strcmp(mode, "interruptFall") == 0) {
*value = GpioModeInterruptFall;
return true;
} else if(strcmp(mode, "interruptRiseFall") == 0) {
*value = GpioModeInterruptRiseFall;
return true;
} else if(strcmp(mode, "eventRise") == 0) {
*value = GpioModeEventRise;
return true;
} else if(strcmp(mode, "eventFall") == 0) {
*value = GpioModeEventFall;
return true;
} else if(strcmp(mode, "eventRiseFall") == 0) {
*value = GpioModeEventRiseFall;
return true;
} else {
return false;
}
}
const GpioPin* js_gpio_get_gpio_pin(const char* name) {
for(size_t i = 0; i < COUNT_OF(js_gpio_pins); i++) {
if(strcmp(js_gpio_pins[i].name, name) == 0) {
return js_gpio_pins[i].pin;
}
}
return NULL;
}
static void js_gpio_init(struct mjs* mjs) {
mjs_val_t pin_arg = mjs_arg(mjs, 0);
mjs_val_t mode_arg = mjs_arg(mjs, 1);
mjs_val_t pull_arg = mjs_arg(mjs, 2);
if(!mjs_is_string(pin_arg)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a string");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
const char* pin_name = mjs_get_string(mjs, &pin_arg, NULL);
if(!pin_name) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Failed to get pin name");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
if(!mjs_is_string(mode_arg)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a string");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
const char* mode_name = mjs_get_string(mjs, &mode_arg, NULL);
if(!mode_name) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Failed to get mode name");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
if(!mjs_is_string(pull_arg)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a string");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
const char* pull_name = mjs_get_string(mjs, &pull_arg, NULL);
if(!pull_name) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Failed to get pull name");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
const GpioPin* gpio_pin = js_gpio_get_gpio_pin(pin_name);
if(gpio_pin == NULL) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Invalid pin name");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
GpioMode gpio_mode;
if(!js_gpio_get_gpio_mode(mode_name, &gpio_mode)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Invalid mode name");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
GpioPull gpio_pull;
if(!js_gpio_get_gpio_pull(pull_name, &gpio_pull)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Invalid pull name");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
expansion_disable(furi_record_open(RECORD_EXPANSION));
furi_record_close(RECORD_EXPANSION);
furi_hal_gpio_init(gpio_pin, gpio_mode, gpio_pull, GpioSpeedVeryHigh);
mjs_return(mjs, MJS_UNDEFINED);
}
static void js_gpio_write(struct mjs* mjs) {
mjs_val_t pin_arg = mjs_arg(mjs, 0);
mjs_val_t value_arg = mjs_arg(mjs, 1);
if(!mjs_is_string(pin_arg)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a string");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
const char* pin_name = mjs_get_string(mjs, &pin_arg, NULL);
if(!pin_name) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Failed to get pin name");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
if(!mjs_is_boolean(value_arg)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a boolean");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
bool value = mjs_get_bool(mjs, value_arg);
const GpioPin* gpio_pin = js_gpio_get_gpio_pin(pin_name);
if(gpio_pin == NULL) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Invalid pin name");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
furi_hal_gpio_write(gpio_pin, value);
mjs_return(mjs, MJS_UNDEFINED);
}
static void js_gpio_read(struct mjs* mjs) {
mjs_val_t pin_arg = mjs_arg(mjs, 0);
if(!mjs_is_string(pin_arg)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a string");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
const char* pin_name = mjs_get_string(mjs, &pin_arg, NULL);
if(!pin_name) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Failed to get pin name");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
const GpioPin* gpio_pin = js_gpio_get_gpio_pin(pin_name);
if(gpio_pin == NULL) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Invalid pin name");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
bool value = furi_hal_gpio_read(gpio_pin);
mjs_return(mjs, mjs_mk_boolean(mjs, value));
}
static void* js_gpio_create(struct mjs* mjs, mjs_val_t* object) {
mjs_val_t gpio_obj = mjs_mk_object(mjs);
mjs_set(mjs, gpio_obj, "init", ~0, MJS_MK_FN(js_gpio_init));
mjs_set(mjs, gpio_obj, "write", ~0, MJS_MK_FN(js_gpio_write));
mjs_set(mjs, gpio_obj, "read", ~0, MJS_MK_FN(js_gpio_read));
*object = gpio_obj;
return (void*)1;
}
static void js_gpio_destroy(void* inst) {
UNUSED(inst);
// loop through all pins and reset them to analog mode
for(size_t i = 0; i < COUNT_OF(js_gpio_pins); i++) {
furi_hal_gpio_write(js_gpio_pins[i].pin, false);
furi_hal_gpio_init(js_gpio_pins[i].pin, GpioModeAnalog, GpioPullNo, GpioSpeedVeryHigh);
}
expansion_enable(furi_record_open(RECORD_EXPANSION));
furi_record_close(RECORD_EXPANSION);
}
static const JsModuleDescriptor js_gpio_desc = {
"gpio",
js_gpio_create,
js_gpio_destroy,
};
static const FlipperAppPluginDescriptor plugin_descriptor = {
.appid = PLUGIN_APP_ID,
.ep_api_version = PLUGIN_API_VERSION,
.entry_point = &js_gpio_desc,
};
const FlipperAppPluginDescriptor* js_gpio_ep(void) {
return &plugin_descriptor;
}

30
applications/system/js_app/modules/js_storage.c
View File

@@ -108,6 +108,35 @@ static void js_storage_write(struct mjs* mjs) {
storage_file_free(file);
}
static void js_storage_append(struct mjs* mjs) {
JsStorageInst* storage = get_this_ctx(mjs);
if(!check_arg_count(mjs, 2)) return;
const char* path;
if(!get_path_arg(mjs, &path)) return;
mjs_val_t data_obj = mjs_arg(mjs, 1);
if(!mjs_is_string(data_obj)) {
ret_bad_args(mjs, "Data must be a string");
return;
}
size_t data_len = 0;
const char* data = mjs_get_string(mjs, &data_obj, &data_len);
if((data_len == 0) || (data == NULL)) {
ret_bad_args(mjs, "Bad data argument");
return;
}
File* file = storage_file_alloc(storage->api);
if(!storage_file_open(file, path, FSAM_WRITE, FSOM_OPEN_APPEND)) {
ret_int_err(mjs, storage_file_get_error_desc(file));
} else {
size_t write = storage_file_write(file, data, data_len);
mjs_return(mjs, mjs_mk_boolean(mjs, write == data_len));
}
storage_file_free(file);
}
static void js_storage_exists(struct mjs* mjs) {
JsStorageInst* storage = get_this_ctx(mjs);
if(!check_arg_count(mjs, 1)) return;
@@ -194,6 +223,7 @@ static void* js_storage_create(struct mjs* mjs, mjs_val_t* object) {
mjs_set(mjs, storage_obj, INST_PROP_NAME, ~0, mjs_mk_foreign(mjs, storage));
mjs_set(mjs, storage_obj, "read", ~0, MJS_MK_FN(js_storage_read));
mjs_set(mjs, storage_obj, "write", ~0, MJS_MK_FN(js_storage_write));
mjs_set(mjs, storage_obj, "append", ~0, MJS_MK_FN(js_storage_append));
mjs_set(mjs, storage_obj, "exists", ~0, MJS_MK_FN(js_storage_exists));
mjs_set(mjs, storage_obj, "remove", ~0, MJS_MK_FN(js_storage_remove));
mjs_set(mjs, storage_obj, "virtualInit", ~0, MJS_MK_FN(js_storage_virtual_init));