Skip to content

Commit

Permalink
Merge pull request #10 from TylerWilley/tw/updates
Browse files Browse the repository at this point in the history
Tw/updates
  • Loading branch information
TylerWilley authored Jun 24, 2024
2 parents d08db18 + 10897b1 commit 5e2bca7
Show file tree
Hide file tree
Showing 93 changed files with 44 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .catalog/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Digimon F-Com

This application can be used to communicate with Digimon Virtual pets. You will need a small circuit between the Flipper Zero and the device in order for this to work as described [Here](https://github.com/TylerWilley/flipper-f-com)

You may also want to copy the digirom codes from that repository into your app_data/fcom directory on your Flipper so they are accessible on the device for convenience.
27 changes: 27 additions & 0 deletions .catalog/changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
## v1.4

Shut down GPIO when exiting app
File browser now returns to the same location instead of resetting to application root
Set up for publishing on flipper app store
Add file browser icon and require .digirom extension for files to appear

## v1.3

Update app icon
Add support for Alpha Serial by echoing "ready" back to it

## v1.2

Optimize event loop
Add support for Joushiikuta's PCB
Fix listen mode
Emulate an arduino's USB VID/PID


## v1.1

Add support for color digimon devices

## v1.0

Initial version
Binary file added .catalog/screenshots/fcom-digiroms.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .catalog/screenshots/fcom-sendcode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .catalog/screenshots/fcom-topmenu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dist
.github
.vscode
.vscode
.idea
6 changes: 5 additions & 1 deletion app_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ App* app_alloc() {
app->dialog_text = furi_string_alloc();
app->text_input = text_input_alloc();
app->file_path = furi_string_alloc();

// Initialize to our root app directory
furi_string_printf(app->file_path, "%s", APP_DIRECTORY_PATH);

app->file_browser = file_browser_alloc(app->file_path);
app->text_box = text_box_alloc();
app->text_box_store = furi_string_alloc();
Expand All @@ -35,7 +39,7 @@ App* app_alloc() {
app->dmcomm_input_stream = furi_stream_buffer_alloc(256, 1);
app->dmcomm_output_stream = furi_stream_buffer_alloc(256, 1);

file_browser_configure(app->file_browser, "*", NULL, true, false, &I_badusb_10px, true);
file_browser_configure(app->file_browser, "digirom", NULL, true, false, &I_botamon_10px, true);

view_dispatcher_add_view(
app->view_dispatcher, FcomMainMenuView, submenu_get_view(app->submenu));
Expand Down
2 changes: 1 addition & 1 deletion application.fam
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ App(
stack_size=3 * 1024,
fap_category="GPIO",
# Optional values
fap_version="1.3",
fap_version="1.4",
fap_icon="logo.png", # 10x10 1-bit PNG
# fap_description="A simple app",
# fap_author="J. Doe",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 2 additions & 1 deletion dmcomm-lib/flipper_pin_control.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FComOutput::FComOutput(const GpioPin* pin_out) :
}

FComOutput::~FComOutput() {

furi_hal_gpio_init(pin_out_, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
}

void FComOutput::begin() {
Expand All @@ -36,6 +36,7 @@ FComInput::FComInput(const GpioPin* pin_in) : pin_in_(pin_in) {
}

FComInput::~FComInput() {
furi_hal_gpio_init(pin_in_, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
}

void FComInput::begin() {
Expand Down
Binary file added images/botamon_10px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion scene_save_code.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ void save_text_input_callback(void* context) {
FlipperFormat* fff_file = flipper_format_file_alloc(app->storage);
FuriString* path = furi_string_alloc();

furi_string_printf(path, "%s/%s",APP_DIRECTORY_PATH, app->state->file_name_tmp);
// Add the .digirom extension so it will show up in the file picker
furi_string_printf(path, "%s/%s.digirom",APP_DIRECTORY_PATH, app->state->file_name_tmp);

const char* path_cstr = furi_string_get_cstr(path);

Expand Down
1 change: 0 additions & 1 deletion scene_select_code.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ void fcom_select_code_scene_on_enter(void* context) {

file_browser_set_callback(app->file_browser, file_browser_callback, app);

furi_string_printf(app->file_path, "%s", APP_DIRECTORY_PATH);
file_browser_start(app->file_browser, app->file_path);

view_dispatcher_switch_to_view(app->view_dispatcher, FcomFileSelectView);
Expand Down

0 comments on commit 5e2bca7

Please sign in to comment.