Skip to content

Commit

Permalink
5x App Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
RogueMaster committed Aug 2, 2023
1 parent 13bbc3b commit f8a0f6e
Show file tree
Hide file tree
Showing 54 changed files with 777 additions and 348 deletions.
9 changes: 5 additions & 4 deletions ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ This software is for experimental purposes only and is not meant for any illegal
- Updated: [ESP32-C6 Gravity (By chris-bc)](https://github.com/chris-bc/Flipper-Gravity)
- UL: [Init config for external radio driver #564 (By gid9798)](https://github.com/DarkFlippers/unleashed-firmware/pull/564)
- Updated: [ESP32 WIFI Mapping (By carvilsi)](https://github.com/carvilsi/flipper0-wifi-map)
- Updated: [GPIO Controller (By Lokno)](https://github.com/Lokno/gpio_controller)
- Updated: [YRM100 UHF RFID WIP (By frux-c)](https://github.com/frux-c/uhf_rfid) `Req: YRM100`
- [New Patreon Animation Set](https://www.patreon.com/RogueMaster/membership): [BMO (By wrenchathome)](https://github.com/wrenchathome/flip0anims/tree/main/Animations/BMO) will be released with next Patreon release
- [New Patreon Animation added to DBZ build: G0ku N3xt L3v3L (By RM)](https://www.patreon.com/RogueMaster/membership)
- Added: [Rock Paper Scissors 2 v1.0 (By benwoo1110)](https://github.com/benwoo1110/rps-FlipperZero)
Expand All @@ -66,15 +64,18 @@ This software is for experimental purposes only and is not meant for any illegal
- OFW: [New RTC flags in device info #2884 (By Programistich)](https://github.com/flipperdevices/flipperzero-firmware/pull/2884)
- OFW: [Backlight notification fix #2878 (By nminaylov)](https://github.com/flipperdevices/flipperzero-firmware/pull/2878)
- Updated: [Authenticator/TOTP v3.2 (By akopachov)](https://github.com/akopachov/flipper-zero_authenticator)
- Updated: [Enhanced Sub-Ghz Chat (By twisted-pear)](https://github.com/twisted-pear/esubghz_chat)
- Updated: [u-blox GPS (By liamhays)](https://github.com/liamhays/ublox)
- Updated: [ESP32 Evil Portal v0.2 (By bigbrodude6119)](https://github.com/bigbrodude6119/flipper-zero-evil-portal) [Changes By manu0466]( https://github.com/RogueMaster/flipper-zero-evil-portal/pull/1)
- OFW: [Overly missed feature: Infrared: move button (change button order in a remote) #2894 (By plgcoder)](https://github.com/flipperdevices/flipperzero-firmware/pull/2894)
- OFW: [External apps icounter #2928 (By Astrrra)](https://github.com/flipperdevices/flipperzero-firmware/pull/2928) Experience for every FAP!
- OFW: [change FuriThreadPriorityIsr to 31 (configMAX_PRIORITIES-1) #2920 (By leommxj)](https://github.com/flipperdevices/flipperzero-firmware/pull/2920)
- OFW: [Add Daikin FTXC35DV1B ac remote #2913 (By skotopes)](https://github.com/flipperdevices/flipperzero-firmware/pull/2913)
- OFW: [SubGhz: change CC1101_ext TIM17 resolution to 2µs #2909 (By Skorpionm)](https://github.com/flipperdevices/flipperzero-firmware/pull/2909)
- OFW: [Fix about screen #2907 (By andzhr)](https://github.com/flipperdevices/flipperzero-firmware/pull/2907)
- Updated: [Enhanced Sub-Ghz Chat (By twisted-pear)](https://github.com/twisted-pear/esubghz_chat)
- Updated: [GPIO Controller (By Lokno)](https://github.com/Lokno/gpio_controller)
- Updated: [YRM100 UHF RFID WIP (By frux-c)](https://github.com/frux-c/uhf_rfid) `Req: YRM100`
- Updated: [ESP32 Evil Portal v0.2 (By bigbrodude6119)](https://github.com/bigbrodude6119/flipper-zero-evil-portal) [Changes By manu0466]( https://github.com/RogueMaster/flipper-zero-evil-portal/pull/1)
- [Better Google Login for Evil Portal (By 8Root)](https://github.com/bigbrodude6119/flipper-zero-evil-portal/pull/56)

<a name="release">

Expand Down
12 changes: 9 additions & 3 deletions applications/external/esubghz_chat/crypto_wrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,14 @@ bool crypto_ctx_decrypt(ESubGhzChatCryptoCtx* ctx, uint8_t* in, size_t in_len, u
#ifdef FURI_HAL_CRYPTO_ADVANCED_AVAIL
return (
furi_hal_crypto_gcm_decrypt_and_verify(
ctx->key, in, in + IV_BYTES, out, in_len - MSG_OVERHEAD, in + in_len - TAG_BYTES) ==
FuriHalCryptoGCMStateOk);
ctx->key,
in,
NULL,
0,
in + IV_BYTES,
out,
in_len - MSG_OVERHEAD,
in + in_len - TAG_BYTES) == FuriHalCryptoGCMStateOk);
#else /* FURI_HAL_CRYPTO_ADVANCED_AVAIL */
return (
gcm_auth_decrypt(
Expand All @@ -89,7 +95,7 @@ bool crypto_ctx_encrypt(ESubGhzChatCryptoCtx* ctx, uint8_t* in, size_t in_len, u
#ifdef FURI_HAL_CRYPTO_ADVANCED_AVAIL
return (
furi_hal_crypto_gcm_encrypt_and_tag(
ctx->key, out, in, out + IV_BYTES, in_len, out + IV_BYTES + in_len) ==
ctx->key, out, NULL, 0, in, out + IV_BYTES, in_len, out + IV_BYTES + in_len) ==
FuriHalCryptoGCMStateOk);
#else /* FURI_HAL_CRYPTO_ADVANCED_AVAIL */
return (
Expand Down
4 changes: 2 additions & 2 deletions applications/external/evil_portal/application.fam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
App(
appid="esp32_evil_portal",
name="[ESP32] Evil Portal",
appid="evil_portal",
name="Evil Portal",
apptype=FlipperAppType.EXTERNAL,
entry_point="evil_portal_app",
# cdefines=["APP_EVIL_PORTAL"],
Expand Down
2 changes: 1 addition & 1 deletion applications/external/evil_portal/evil_portal_app_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define RESET_CMD "reset"

#define HTML_EXTENSION ".html"
#define HTML_FOLDER ANY_PATH("apps_data/esp32_evil_portal/html")
#define HTML_FOLDER ANY_PATH("apps_data/evil_portal/html")

struct Evil_PortalApp {
Gui* gui;
Expand Down
135 changes: 135 additions & 0 deletions applications/external/gpio_controller/app_defines.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
#ifndef APP_DEFINES_H
#define APP_DEFINES_H

#define GPIO_PIN_COUNT 8
#define ANIMATE_FRAME_TIME_MS 133
#define FRAME_TIME 66.666666

typedef void (*DrawView)(Canvas* canvas, void* ctx);
typedef void (*HandleInput)(InputEvent* event, void* ctx);

typedef enum { MAIN_VIEW, CONFIG_MENU_VIEW } enum_view;

typedef enum {
GPIO_MODE_INPUT,
GPIO_MODE_INPUT_PULLUP,
GPIO_MODE_OUTPUT,
GPIO_MODE_UNSET
} GpioUserMode;

typedef enum {
GPIO_VALUE_TRUE,
GPIO_VALUE_FALSE,
GPIO_VALUE_INPUT,
GPIO_VALUE_NONE
} GpioUserValue;

typedef enum { CONFIG_MENU_MODE, CONFIG_MENU_VALUE, CONFIG_MENU_INPUT } ConfigMenuOptions;

typedef struct {
GpioUserMode mode;
GpioUserValue value;
int gp_idx_input;
bool changed;
GpioUserMode prev_mode;
} GPIOPinUserSelection;

typedef struct {
int selected;
enum_view view;
int wiggle_frame;
size_t prev_frame_time;
size_t elapsed_time;
double result;
double freq_var;
double elapsed_var;
ConfigMenuOptions config_menu_selected;
} ViewerState;

// 5V A7 A6 A4 B3 B2 C3 GND SET
//
//
// 3V SWC GND SIO TX RX C1 C0 1W GND

typedef enum {
PIN_5V = 0,
PIN_A7,
PIN_A6,
PIN_A4,
PIN_B3,
PIN_B2,
PIN_C3,
GEARIC,
PIN_3V,
PIN_SWC,
PIN_SIO,
PIN_TX,
PIN_RX,
PIN_C1,
PIN_C0,
PIN_1W,
PIN_GND_08,
PIN_GND_11,
PIN_GND_18,
NONE
} enum_view_element;

typedef struct {
enum_view_element element;
enum_view_element opposite;
bool selectable;
bool editable;
bool top_row;
bool pull_out;
int gp_idx;
uint8_t x_pos;
uint8_t y_pos;
const char* name;
Icon* icon;
Icon* selected_icon;
} ViewElement;

typedef struct {
uint8_t element_idx;
const GpioPin* pin;
GpioMode mode;
GpioPull pull;
GpioSpeed speed;
double value;
const char* name;
bool unset;
bool found;
bool input;
GPIOPinUserSelection user;
} GPIOPin;

// GPIO enums from firmware/targets/f7/furi_hal/furi_hal_gpio.h

// /**
// * Gpio modes
// */
// typedef enum {
// *GpioModeInput,
// *GpioModeOutputPushPull,
// GpioModeOutputOpenDrain,
// GpioModeAltFunctionPushPull,
// GpioModeAltFunctionOpenDrain,
// *GpioModeAnalog,
// GpioModeInterruptRise,
// GpioModeInterruptFall,
// GpioModeInterruptRiseFall,
// GpioModeEventRise,
// GpioModeEventFall,
// GpioModeEventRiseFall,
// } GpioMode;

// /**
// * Gpio pull modes
// */
// typedef enum {
// GpioPullNo,
// GpioPullUp,
// GpioPullDown,
// } GpioPull;

#endif
Loading

0 comments on commit f8a0f6e

Please sign in to comment.