From 41895118bd5a73f5358d60ce89f337bec57f1d4d Mon Sep 17 00:00:00 2001
From: ushastoe <40743392+krolchonok@users.noreply.github.com>
Date: Fri, 28 Apr 2023 01:28:40 +0300
Subject: [PATCH 01/23] Update HowToInstall.md
46 version
---
documentation/HowToInstall.md | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/documentation/HowToInstall.md b/documentation/HowToInstall.md
index a650d97ee7..abbca0830f 100644
--- a/documentation/HowToInstall.md
+++ b/documentation/HowToInstall.md
@@ -23,7 +23,7 @@ after that on web updater page - press `Connect` button
- And wait, if all flashed
successfully - you will have all needed assets pre installed
- Done
-
+
@@ -40,7 +40,7 @@ after that on web updater page - press `Connect` button
- Error in ios app will show up, but flipper will be updated successfully
- And if all flashed successfully - you will have all needed assets pre installed
- Done
-
+
@@ -56,7 +56,7 @@ after that on web updater page - press `Connect` button
- Wait until update is finished
- And if all flashed successfully - you will have all needed assets pre installed
- Done
-
+
@@ -71,7 +71,7 @@ after that on web updater page - press `Connect` button
- Wait until update is finished
- And if all flashed successfully - you will have all needed assets pre installed
- Done
-
+
@@ -90,7 +90,7 @@ after that on web updater page - press `Connect` button
- And wait, if all flashed successfully - you will have all needed assets pre installed
- Done
-
+
@@ -111,7 +111,7 @@ after that on web updater page - press `Connect` button
- Update will start, wait for all stages
- Done
-
+
From b31e955744d329601b087c0099d7c1734f0980cc Mon Sep 17 00:00:00 2001
From: ushastoe <40743392+krolchonok@users.noreply.github.com>
Date: Fri, 28 Apr 2023 01:39:58 +0300
Subject: [PATCH 02/23] Update HowToInstall.md
---
documentation/HowToInstall.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/documentation/HowToInstall.md b/documentation/HowToInstall.md
index abbca0830f..9b762ea112 100644
--- a/documentation/HowToInstall.md
+++ b/documentation/HowToInstall.md
@@ -23,7 +23,7 @@ after that on web updater page - press `Connect` button
- And wait, if all flashed
successfully - you will have all needed assets pre installed
- Done
-
+
@@ -40,7 +40,7 @@ after that on web updater page - press `Connect` button
- Error in ios app will show up, but flipper will be updated successfully
- And if all flashed successfully - you will have all needed assets pre installed
- Done
-
+
@@ -56,7 +56,8 @@ after that on web updater page - press `Connect` button
- Wait until update is finished
- And if all flashed successfully - you will have all needed assets pre installed
- Done
-
+
+
@@ -71,7 +72,7 @@ after that on web updater page - press `Connect` button
- Wait until update is finished
- And if all flashed successfully - you will have all needed assets pre installed
- Done
-
+
@@ -89,8 +90,7 @@ after that on web updater page - press `Connect` button
- Update will start
- And wait, if all flashed successfully - you will have all needed assets pre installed
- Done
-
-
+
@@ -110,8 +110,8 @@ after that on web updater page - press `Connect` button
`update/f7-update-(CURRENT VERSION)/update.fuf`
- Update will start, wait for all stages
- Done
+
-
From 7b21dd7082fddf58542e1a06ebcd1a0ad711e845 Mon Sep 17 00:00:00 2001
From: ushastoe <40743392+krolchonok@users.noreply.github.com>
Date: Fri, 28 Apr 2023 01:41:03 +0300
Subject: [PATCH 03/23] Update HowToInstall.md
---
documentation/HowToInstall.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/documentation/HowToInstall.md b/documentation/HowToInstall.md
index 9b762ea112..d4dcc3bbcf 100644
--- a/documentation/HowToInstall.md
+++ b/documentation/HowToInstall.md
@@ -110,7 +110,8 @@ after that on web updater page - press `Connect` button
`update/f7-update-(CURRENT VERSION)/update.fuf`
- Update will start, wait for all stages
- Done
-
+
+
From c0de75367f7b4209585648a2506aaeec165c0b38 Mon Sep 17 00:00:00 2001
From: ushastoe <40743392+krolchonok@users.noreply.github.com>
Date: Fri, 28 Apr 2023 01:43:27 +0300
Subject: [PATCH 04/23] Update HowToInstall.md
---
documentation/HowToInstall.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/documentation/HowToInstall.md b/documentation/HowToInstall.md
index d4dcc3bbcf..656d4cc4bf 100644
--- a/documentation/HowToInstall.md
+++ b/documentation/HowToInstall.md
@@ -110,7 +110,7 @@ after that on web updater page - press `Connect` button
`update/f7-update-(CURRENT VERSION)/update.fuf`
- Update will start, wait for all stages
- Done
-
+
From 96375e8244a1e90bf6359e040677425dbc36968d Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 28 Apr 2023 14:00:40 +0300
Subject: [PATCH 05/23] Version instead of branch
---
firmware/targets/f7/ble_glue/dev_info_service.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/firmware/targets/f7/ble_glue/dev_info_service.c b/firmware/targets/f7/ble_glue/dev_info_service.c
index 8bdb2eea84..d24058632f 100644
--- a/firmware/targets/f7/ble_glue/dev_info_service.c
+++ b/firmware/targets/f7/ble_glue/dev_info_service.c
@@ -33,7 +33,7 @@ void dev_info_svc_start() {
dev_info_svc->version_string = furi_string_alloc_printf(
"%s %s %s %s",
version_get_githash(NULL),
- version_get_gitbranch(NULL),
+ version_get_version(NULL),
version_get_gitbranchnum(NULL),
version_get_builddate(NULL));
snprintf(
From e87256e01f3e289c6eb60badd4ae88e190369da5 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 28 Apr 2023 14:04:16 +0300
Subject: [PATCH 06/23] Update TOTP
---
.../services/config/token_info_iterator.c | 16 ++++++--------
.../external/totp/services/hmac/hmac_common.h | 1 -
.../external/totp/services/hmac/hmac_sha256.c | 1 +
.../external/totp/services/hmac/sha1.c | 8 +++----
.../external/totp/services/hmac/sha256.c | 7 ++-----
.../external/totp/services/hmac/sha512.c | 7 ++-----
.../totp/services/hmac/sha_pad_buffer.c | 11 ++++++++++
.../totp/services/hmac/sha_pad_buffer.h | 4 ++++
applications/external/totp/types/token_info.c | 21 +++++++++++++++++++
applications/external/totp/types/token_info.h | 12 +++++++++--
10 files changed, 60 insertions(+), 28 deletions(-)
create mode 100644 applications/external/totp/services/hmac/sha_pad_buffer.c
create mode 100644 applications/external/totp/services/hmac/sha_pad_buffer.h
diff --git a/applications/external/totp/services/config/token_info_iterator.c b/applications/external/totp/services/config/token_info_iterator.c
index 9b7dd5550c..f8cd3c64e5 100644
--- a/applications/external/totp/services/config/token_info_iterator.c
+++ b/applications/external/totp/services/config/token_info_iterator.c
@@ -68,7 +68,9 @@ static bool seek_to_token(size_t token_index, TokenInfoIteratorContext* context)
direction = StreamDirectionBackward;
}
- stream_seek(stream, context->last_seek_offset, StreamOffsetFromStart);
+ if(!stream_seek(stream, context->last_seek_offset, StreamOffsetFromStart)) {
+ return false;
+ }
if(token_index_diff != 0) {
long i = 0;
@@ -89,10 +91,6 @@ static bool seek_to_token(size_t token_index, TokenInfoIteratorContext* context)
context->last_seek_offset = stream_tell(stream);
context->last_seek_index = token_index;
- } else {
- if(!stream_seek(stream, context->last_seek_offset, StreamOffsetFromStart)) {
- return false;
- }
}
return true;
@@ -495,11 +493,9 @@ bool totp_token_info_iterator_go_to(TokenInfoIteratorContext* context, size_t to
}
uint32_t temp_data32;
- if(flipper_format_read_uint32(
- context->config_file, TOTP_CONFIG_KEY_TOKEN_ALGO, &temp_data32, 1) &&
- temp_data32 <= STEAM) {
- tokenInfo->algo = (TokenHashAlgo)temp_data32;
- } else {
+ if(!flipper_format_read_uint32(
+ context->config_file, TOTP_CONFIG_KEY_TOKEN_ALGO, &temp_data32, 1) ||
+ !token_info_set_algo_from_int(tokenInfo, temp_data32)) {
tokenInfo->algo = SHA1;
}
diff --git a/applications/external/totp/services/hmac/hmac_common.h b/applications/external/totp/services/hmac/hmac_common.h
index 0cd56ed999..3499cb800b 100644
--- a/applications/external/totp/services/hmac/hmac_common.h
+++ b/applications/external/totp/services/hmac/hmac_common.h
@@ -1,5 +1,4 @@
#include
-#include "sha256.h"
#include "memxor.h"
#define IPAD 0x36
diff --git a/applications/external/totp/services/hmac/hmac_sha256.c b/applications/external/totp/services/hmac/hmac_sha256.c
index c51f24b4d7..00ac2a177c 100644
--- a/applications/external/totp/services/hmac/hmac_sha256.c
+++ b/applications/external/totp/services/hmac/hmac_sha256.c
@@ -15,6 +15,7 @@
along with this program. If not, see . */
#include "hmac_sha256.h"
+#include "sha256.h"
#define GL_HMAC_NAME 256
#define GL_HMAC_BLOCKSIZE 64
diff --git a/applications/external/totp/services/hmac/sha1.c b/applications/external/totp/services/hmac/sha1.c
index ecf22fc972..29f22e3c30 100644
--- a/applications/external/totp/services/hmac/sha1.c
+++ b/applications/external/totp/services/hmac/sha1.c
@@ -27,6 +27,8 @@
#include
#include
+#include "sha_pad_buffer.h"
+
#ifdef WORDS_BIGENDIAN
#define SWAP(n) (n)
#else
@@ -34,10 +36,6 @@
#define SWAP(n) swap_uint32(n)
#endif
-/* This array contains the bytes used to pad the buffer to the next
- 64-byte boundary. (RFC 1321, 3.1: Step 1) */
-static const unsigned char fillbuf[64] = {0x80, 0 /* , 0, 0, ... */};
-
/* Take a pointer to a 160 bit block of data (five 32 bit ints) and
initialize it to the start constants of the SHA1 algorithm. This
must be called before using hash in the call to sha1_hash. */
@@ -87,7 +85,7 @@ void* sha1_finish_ctx(struct sha1_ctx* ctx, void* resbuf) {
ctx->buffer[size - 2] = SWAP((ctx->total[1] << 3) | (ctx->total[0] >> 29));
ctx->buffer[size - 1] = SWAP(ctx->total[0] << 3);
- memcpy(&((char*)ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes);
+ sha_pad_buffer(&((uint8_t*)ctx->buffer)[bytes], (size - 2) * 4 - bytes);
/* Process last bytes. */
sha1_process_block(ctx->buffer, size * 4, ctx);
diff --git a/applications/external/totp/services/hmac/sha256.c b/applications/external/totp/services/hmac/sha256.c
index 89ca67c2be..09ba272e74 100644
--- a/applications/external/totp/services/hmac/sha256.c
+++ b/applications/external/totp/services/hmac/sha256.c
@@ -25,6 +25,7 @@
#include
#include
+#include "sha_pad_buffer.h"
#ifdef WORDS_BIGENDIAN
#define SWAP(n) (n)
@@ -33,10 +34,6 @@
#define SWAP(n) swap_uint32(n)
#endif
-/* This array contains the bytes used to pad the buffer to the next
- 64-byte boundary. */
-static const unsigned char fillbuf[64] = {0x80, 0 /* , 0, 0, ... */};
-
/*
Takes a pointer to a 256 bit block of data (eight 32 bit ints) and
initializes it to the start constants of the SHA256 algorithm. This
@@ -91,7 +88,7 @@ static void sha256_conclude_ctx(struct sha256_ctx* ctx) {
set_uint32((char*)&ctx->buffer[size - 2], SWAP((ctx->total[1] << 3) | (ctx->total[0] >> 29)));
set_uint32((char*)&ctx->buffer[size - 1], SWAP(ctx->total[0] << 3));
- memcpy(&((char*)ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes);
+ sha_pad_buffer(&((uint8_t*)ctx->buffer)[bytes], (size - 2) * 4 - bytes);
/* Process last bytes. */
sha256_process_block(ctx->buffer, size * 4, ctx);
diff --git a/applications/external/totp/services/hmac/sha512.c b/applications/external/totp/services/hmac/sha512.c
index b56dd0f2eb..ffe2864fbd 100644
--- a/applications/external/totp/services/hmac/sha512.c
+++ b/applications/external/totp/services/hmac/sha512.c
@@ -27,13 +27,10 @@
#include
#include "byteswap.h"
+#include "sha_pad_buffer.h"
#define SWAP(n) swap_uint64(n)
-/* This array contains the bytes used to pad the buffer to the next
- 128-byte boundary. */
-static const unsigned char fillbuf[128] = {0x80, 0 /* , 0, 0, ... */};
-
/*
Takes a pointer to a 512 bit block of data (eight 64 bit ints) and
initializes it to the start constants of the SHA512 algorithm. This
@@ -90,7 +87,7 @@ static void sha512_conclude_ctx(struct sha512_ctx* ctx) {
SWAP(u64or(u64shl(ctx->total[1], 3), u64shr(ctx->total[0], 61))));
set_uint64((char*)&ctx->buffer[size - 1], SWAP(u64shl(ctx->total[0], 3)));
- memcpy(&((char*)ctx->buffer)[bytes], fillbuf, (size - 2) * 8 - bytes);
+ sha_pad_buffer(&((uint8_t*)ctx->buffer)[bytes], (size - 2) * 8 - bytes);
/* Process last bytes. */
sha512_process_block(ctx->buffer, size * 8, ctx);
diff --git a/applications/external/totp/services/hmac/sha_pad_buffer.c b/applications/external/totp/services/hmac/sha_pad_buffer.c
new file mode 100644
index 0000000000..badedbcc7d
--- /dev/null
+++ b/applications/external/totp/services/hmac/sha_pad_buffer.c
@@ -0,0 +1,11 @@
+#include "sha_pad_buffer.h"
+#include
+
+void sha_pad_buffer(uint8_t* buffer, size_t size) {
+ if(size > 0) {
+ buffer[0] = 0x80;
+ if(size > 1) {
+ memset(&buffer[1], 0, size - 1);
+ }
+ }
+}
\ No newline at end of file
diff --git a/applications/external/totp/services/hmac/sha_pad_buffer.h b/applications/external/totp/services/hmac/sha_pad_buffer.h
new file mode 100644
index 0000000000..7dba40fa96
--- /dev/null
+++ b/applications/external/totp/services/hmac/sha_pad_buffer.h
@@ -0,0 +1,4 @@
+#include
+#include
+
+void sha_pad_buffer(uint8_t* buffer, size_t size);
\ No newline at end of file
diff --git a/applications/external/totp/types/token_info.c b/applications/external/totp/types/token_info.c
index 2f108033be..6810d02110 100644
--- a/applications/external/totp/types/token_info.c
+++ b/applications/external/totp/types/token_info.c
@@ -117,6 +117,27 @@ bool token_info_set_algo_from_str(TokenInfo* token_info, const FuriString* str)
return false;
}
+bool token_info_set_algo_from_int(TokenInfo* token_info, uint8_t algo_code) {
+ switch(algo_code) {
+ case SHA1:
+ token_info->algo = SHA1;
+ break;
+ case SHA256:
+ token_info->algo = SHA256;
+ break;
+ case SHA512:
+ token_info->algo = SHA512;
+ break;
+ case STEAM:
+ token_info->algo = STEAM;
+ break;
+ default:
+ return false;
+ }
+
+ return true;
+}
+
char* token_info_get_algo_as_cstr(const TokenInfo* token_info) {
switch(token_info->algo) {
case SHA1:
diff --git a/applications/external/totp/types/token_info.h b/applications/external/totp/types/token_info.h
index 138ad32b12..0d73dd0615 100644
--- a/applications/external/totp/types/token_info.h
+++ b/applications/external/totp/types/token_info.h
@@ -168,7 +168,7 @@ void token_info_free(TokenInfo* token_info);
/**
* @brief Encrypts & sets plain token secret to the given instance of \c TokenInfo
* @param token_info instance where secret should be updated
- * @param base32_token_secret plain token secret in Base32 format
+ * @param plain_token_secret plain token secret
* @param token_secret_length plain token secret length
* @param plain_token_secret_encoding plain token secret encoding
* @param iv initialization vecor (IV) to be used for encryption
@@ -201,10 +201,18 @@ bool token_info_set_duration_from_int(TokenInfo* token_info, uint8_t duration);
* @brief Sets token hashing algorithm from \c str value
* @param token_info instance whichs token hashing algorithm should be updated
* @param str desired token algorithm
- * @return \c true if token hahsing algorithm has been updated; \c false otherwise
+ * @return \c true if token hashing algorithm has been updated; \c false otherwise
*/
bool token_info_set_algo_from_str(TokenInfo* token_info, const FuriString* str);
+/**
+ * @brief Sets token hashing algorithm from \c algo_code code
+ * @param token_info instance whichs token hashing algorithm should be updated
+ * @param algo_code desired token algorithm code
+ * @return \c true if token hashing algorithm has been updated; \c false otherwise
+ */
+bool token_info_set_algo_from_int(TokenInfo* token_info, uint8_t algo_code);
+
/**
* @brief Gets token hahsing algorithm name as C-string
* @param token_info instance which token hahsing algorithm name should be returned
From 5085a17bcb6fbe74fc8d874ef371aedc45d71d2f Mon Sep 17 00:00:00 2001
From: ushastoe
Date: Sat, 29 Apr 2023 18:16:53 +0300
Subject: [PATCH 07/23] HID app refactor
---
.../external/hid_app/assets/OutCircles.png | Bin 0 -> 2469 bytes
.../hid_app/assets/Pause_icon_9x9.png | Bin 4559 -> 1743 bytes
.../hid_app/assets/Pin_back_arrow_10x10.png | Bin 0 -> 4575 bytes
.../hid_app/assets/Pressed_Button_19x19.png | Bin 0 -> 1790 bytes
.../external/hid_app/assets/S_DOWN.png | Bin 0 -> 1893 bytes
.../external/hid_app/assets/S_LEFT.png | Bin 0 -> 1906 bytes
.../external/hid_app/assets/S_RIGHT.png | Bin 0 -> 1902 bytes
applications/external/hid_app/assets/S_UP.png | Bin 0 -> 1886 bytes
.../external/hid_app/assets/Voldwn_6x6.png | Bin 3593 -> 4556 bytes
.../external/hid_app/assets/Volup_8x6.png | Bin 3595 -> 4564 bytes
.../external/hid_app/views/hid_media.c | 51 +++++++++++-------
.../external/hid_app/views/hid_mouse.c | 26 ++++-----
.../external/hid_app/views/hid_tiktok.c | 42 ++++++++-------
.../external/hid_app/views/hid_ytshorts.c | 33 +++++++-----
14 files changed, 86 insertions(+), 66 deletions(-)
create mode 100644 applications/external/hid_app/assets/OutCircles.png
create mode 100644 applications/external/hid_app/assets/Pin_back_arrow_10x10.png
create mode 100644 applications/external/hid_app/assets/Pressed_Button_19x19.png
create mode 100644 applications/external/hid_app/assets/S_DOWN.png
create mode 100644 applications/external/hid_app/assets/S_LEFT.png
create mode 100644 applications/external/hid_app/assets/S_RIGHT.png
create mode 100644 applications/external/hid_app/assets/S_UP.png
diff --git a/applications/external/hid_app/assets/OutCircles.png b/applications/external/hid_app/assets/OutCircles.png
new file mode 100644
index 0000000000000000000000000000000000000000..f34d2687a6b1c03b312899572ce3dc6c2fb7af13
GIT binary patch
literal 2469
zcmcIm32+lt7*6Xzu>~1H$_+b8NG&vlD9qT+?j~JHvLU;rX|*a)
zs8AWFWu$-{au?(nK~W9`idGl|vC5${fH*Bh1Um@jC`WypCIu9bVaCjC_U-0--~YY;
z|Ni$fJ3DJ+m-s&M8jYrlEz>d%+(&?m>=X;WSFikiIk-I?$b3cCXcD@sSBz%S;$9j}
z94tDViqk%Z;Uu4yFbEgq-OM=4h)6K-
zWP+4~o+?jba2!5C}jZa*i-+|E7;{iy
z6)EVDByY4*+0lp)L1}R)d4lNYr9wGHRTP;ZSXf0c!Juj+f>8*eb6_|q8AH;k7|CE*
z8`KVrz_SYb53tdJVQPs<-F;w*7u`jV1GU>3n_pH~KPT8MCK!m)iXzYOdW>dy%7xGb
z>qc}2%7D0Vy&Dl&(q$kyo~ML1U0}XN;tJGEsPo%=%S#;KXwN1?=}3-rQ5-_hm>bbk
zlpdj7f&rl@N=K8Fo7ItIc$I+d<)8>!hxOjes;c4vBgPqd4%3qeM;ToR##1z6Bv=kH
zP;MjPa=Qo&*TK-;xMs;K1?>_KvJ3cmj&Vyt9}D~=`dE*E2K*k?&43-m%@k!&x}r#b
zU9&$sYMoeIPzM2K=vL_XB%x{z5qxcQT#TTEV-3JHYj9xK&JoG
zT%{}<_zv~u~Z-y?vX
z6NR6AF^}is2iD==ef1=Dc<^FSb-!$L82V51-8FBt0Wv^qs@9YvH66}++N+x$?F_>R
z%t%?xdYzffz;UZN!%C3DjTns^F{1&)N2G;gdPOiZJZd9B9~~`>yl0<}P6mgEI&43-
zz(f1NC-_0lg5X%|-nVX+MiZN2vt&5(ryYHD@0NW~r=P~$X{{v9UJ
zdf=towjG;u{Pm3o>7m!thi*)$?)>%1^j6&0!?R;?-?M*ATQTqFhTa`*eRl1AN>_F+
zhE1?-=v8JWvz89&vZ!0x1#O1|302ABk?#AKl-+v&06cZgsxSN1^eF#+&sfv;qQzz<
znHt+~PII6`-P}qhXEHM1wzgA!O9eIXo#%5e*vfy~kz^Y@bkYaY2i7E=?e^JAxub8D
zY%;Tz&XXNac|V*~J}I6jrZokYjNY=aS4wRoeQa>ogEO5MQ!h1V`p$gZ^~CKh>xtd5
ziNPUPW;o#UDI+&rABkip5^*tj!_hPEZV+wzbH&&U^pa=Hl>QTh^w6I>500v@z0_Ej
zI;*;6!K&EmmZhtpthvp(HtYCi)@IEX=GT8wku$J(>#)K7L$}4$8z1$&IpgwL
z^Lv}U*LpiIp%u#uD^84ESJqHrxtUw}4oI0O_OR;l3sWd-MV>MdBcL;m5JV#(iu|X&A6Jzl|RhB?A;}_+@tDm{t;n}&l*S8-}
z{k)|9o7MrN&Yga44D{82+r#TRUranZF@JsMrmlJ7$o_ra>QpxYS-Y@$_3~vU-yU!(
zNrz&$TG6XzdBw%I$a52GoBp~p@k)6u(;8R&$%fv@*_6ZTA1RwP%d%;B-t@l#cgkqJ
literal 0
HcmV?d00001
diff --git a/applications/external/hid_app/assets/Pause_icon_9x9.png b/applications/external/hid_app/assets/Pause_icon_9x9.png
index d72d712bbaa47429793bddbab0096de8d95045b4..fe16dc03e2629da128e37a7b9e1ccb11b4c92b78 100644
GIT binary patch
delta 682
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
diff --git a/applications/external/hid_app/assets/Pin_back_arrow_10x10.png b/applications/external/hid_app/assets/Pin_back_arrow_10x10.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7510fd5dc0084fe0f9b6fdeabf969ed3cfd6466
GIT binary patch
literal 4575
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
literal 0
HcmV?d00001
diff --git a/applications/external/hid_app/assets/S_LEFT.png b/applications/external/hid_app/assets/S_LEFT.png
new file mode 100644
index 0000000000000000000000000000000000000000..13c9f51b4ee428f92a995efb2bb961c76f7dc247
GIT binary patch
literal 1906
zcmcIlONbmr819IM7&n_k4$)j}ItL9}(^cI){bDD(voo{qKxSPwgINzks;jDJ+MVg@
zbocDcE(ks_5Qv}=1w|C`D7g3lbt6Pn#GHIU4iUUY52APw)Pq_*uU%!c?!|$getq@*
zUw!}ARTmZ)9yoOH*g;8>4pryNOX7T39CshMMf|_-N$17s_Gtd$M3U|}k{$b`mtVP4
zlJ>tI)R)uc+9{Xtb`DeSv0Sem3A7|lP4^;9R#+-~tPz9-<>$*+6gi*;(Meia6;+0McO*{gYY|hISi(CoVU<-DrpHIc
zq9#vy(&RVMHh%pNg_Mj7MxD6Tw}%pywOCtlCjyK5`XaX!Go13c&UtIpsl`!6Su=7-
zzV}QJQr=BYWQv9ZSQ)3Rpop&N02)BE>kzt{;~M6DPz>ibKMx<$@wa<${2^3|q*|TNn^eqX7B_0uE+6z{I1FBGWP%>gy8Y%bavFC$jN_
z+)_>i$Jk95X^c=4+JJeM2Otq_n0g*Sp3XF%>b{S?5!-`tAU+-3+RmD(qJmMtnMsiW
zu#GHXl;Hq}Il?upQOkxpAyn{e)h+QBk87L?cXdUk#PxaH#v(sK8#kC5g^euDf?dpF
zK1f9C)`s85X?AXS)e7W(=v+*)tQQoLHJMRm_&C_Xy}jui&~}?lknYm_0W9Hu+Ql&|
zHiXmv87}o^;uE~OyY#&^{(qD{w3Re**kEGiRF!NpYPQ4-nxg)@Ut9eiWu_?7oOLr9
z+Axb7V?$2v98n{$6Wuci&>ZLk(=bfnc+3KZVdNd%@Nr((2P#^@7S|}4)*Q5ra>>k>
z^ddr)Qn8}xvo>^)4Q&gexoso+GZ_d{cURs=Zd+zYHi)%5yBzNt;%2<>uuxbQi(Td7
zPjpJ`NZo3=Sht_Kwp5(_Se|(F_rG4djxV4W9=iP5ryo?GID4)7?X6ww-I>XmcQzVt
zyjuC@aqlB-v+B=0Vq7$@fBh_2x$WxtKi<1~wDacE&z(AY&r=(}{`vOizDvz3Uw!!7
zjg3$6OP^2Qb?(6TvzuQ|p7>(_rK0)bcj@y#9y|Qlk;=p`Hzt0_cExICq5RhD*(d)7
DzvyO%
literal 0
HcmV?d00001
diff --git a/applications/external/hid_app/assets/S_RIGHT.png b/applications/external/hid_app/assets/S_RIGHT.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0ba2afd1aefe680ef730165fab4c73892d67709
GIT binary patch
literal 1902
zcmcIlONbmr7;Z(DWOWf=APd1x=i(zZUHzEut|pT>J2UGJY_FTmglzN>tE;PLnw{=y
zyL)$LS49Xx2@>%j9()`k7{r6%B>|PqMK5{~!3TIXiiqe%4CWwK&-Bc$vRU`yKtJcJ
z@BixizpgsJxbWE2nFOH2JQ=4e4Ua;zU?vO+V_rR^Z9NWXn_RT2ZQBAqHb(1~lb
z6U=QS^u)$Oi)^eATnKW
zJf@A(!YA&S+{dx3lwdxm5zujVhlb%8oo0nl@C|6Vrpmm(lip0C70jLAjYC&i#x~*D|K+T452z7W6Je=XZfteTh>wAGZ
zj@^vX3`c}E>lKNMDg}XOYo6gNu8Dw7u>}y-Ens<&0*n;uB7QbaI?%<(*BM#Ooyf-z
zbL%m}ImT|Q@Q
zO`utZ2~0yb05UKFL?dpQdJqv;k;JXKHP&T`!#wV;CW#)geU^ln=O+kpo62$2&eP1<
z`7Gvwl(%lZ_&!e1r;EF8APz!jW0GgRB9Xkw)RT(W!4B^2P3Mrd*P)zrm*x*)Df6=)
zPH45wo&L{o$u|?9;GhgX
zu4z?8Y1FC>RhzLOQY>hhP?_B}axjyjAbEG?1LU@4c4PxzyYt)euE8J1`woq`WeML^
zl9S)|`Hqw}>(!QZ;fGhNlaC(US6}`0`Sz3d9=vqv*(aXsAvST>`Np}AU0+fkzWevX
zFMjjx2d8h$e|_Lu$7-I9_J8`-$uB3azVgx^*ALwH-JchJdF>*)F8}n`=9z1ooA3Sn
z*8Iec=!rusBo2rlA)$&3ESyk<+5_T%Km~3H4&2I#BEbc?mT}@_7qngWLL|q3Z{GLj
zea|zmwHBT~bny5=Nszj6H1pW^gDJbyNoqz50#kA2eH?;ew+
z``!=Q%h|H`f=hU)V#+&A9fq+$OVY`iVT{QN%j6F022n-%{l@2t9MFogWO>kwYpfT{
zZzSx@#zLEHtPqDPGpFQ}Lst-lEW`3J>_@3PtSBR1S6t_hHANmlvXzQb%?rxQUQ4d=
zgvpKy0f7+8Wk=P^Ix))rv$6pVLxZ-amw;}&&~T9{7e7UmOQ`QI*5`_1;;y3fvMhEr
zZ7>+915@QmSJNHG(V(Fj1`r64u16Ujf+#&PVW_i|Bte`7Jd$%p+~KQPMG;cRa|q)p
zZIl*13CFY{jx}9{`J5&|&)XduhEsH!HP%FxLhp{mX?s0p+9FH&YC>3JjYZjsNwK)c
zGoJSNU9?SK|3e`q(}MA8(jVDFiN^XY6x^x6>LY!zTT2+uc+%#)Kj~C!Qc*ULs>@F<
z1rg7?F@V)^#wv>Fnh78RhTVqHg(VlEXQ1gqIEH#62oz^{Z(vRXe|;}d&vTnm
zn&F7BX1$^aQECuSmonSYZ3+P``wSQaQGj*IfNwe2LIe^UnIm0de4Ufk+=+brIJcA&
z!7+8yrM_GA_CxQ5MaDO{%u8IoA4zUc!)G>f2
zB7l_;1|8kPfUpjR4)J{hV@2MoTjPD6c$^A%g<48npC=&}`3XYYWm+6{^E3-~F^l;i
z6|Gw@zK=8PmEx)&$fMA?nB-ZnC?sz(qe}5O*ulNM=^WDzdQ6b+()=+j<$gB639EL6
z)BhPR?QY^zytcday*2)SlwR0MdN}Gbv2tokJ{c`vV#ZC;{@t&weorz}6=}}9nHDz8
z;_lRtQ#(f#Stc<%B2|V1eNaNE1e^{l1B8&}n8?SLX^vI&gDtK}Fw1k$M)g|Bs+mIx&3d(MU;gs@FOEt_4&2-N>CT<>@ZpDEx@=s3>-NW&_Pq!`m0nlRe|7D<#)WS;
z&wuvB)nBWFcOL&GyZ+ZlS2RQU=ITZN=J4weZoGF4x*hA*ADj2z^TW9xXVMvR?izUR
dLThDn|C>wR&!;bbcqQKfn~jC~C$lfV`Zrq^TDbrK
literal 0
HcmV?d00001
diff --git a/applications/external/hid_app/assets/Voldwn_6x6.png b/applications/external/hid_app/assets/Voldwn_6x6.png
index d7a82a2df8262667a9a03419f437ff9b350e645f..ce487b546812e471bfaf380f3849f954e6c757ac 100644
GIT binary patch
delta 1123
zcmbtTO=uHA6rSKu+hki0wNyl8*;c9OW@mr0e>T!I2~D7>u|`F_bhERYEF{@=ciUPI
zZ51ztg2;NX(z^#iD0-5DMNeYEgI+v|C&g1iyoeAdrm40HDjwdx+4sJA?|bvjEF4-5t8TqR10U(^UlF7U`J~B*Z
z(@Bw4M3LsAEC88>6#&ZB%Jqp154FJC2(EJAgCLsVHCje0I0MP3!
zKRz>v6MOTcg>=1M$IEk1U(I6I;bbm)07SYQ76Nyd4`9^&U@5#fphO|9LkLMpiLw%_
zbCP+2W@Qy}s=z-Sjf6rSm71q|etOCe)*^=kiRc48k0P&B8#$!M
zsj}}oD#JLFZY65FB?jq?Q8B6*<}qxPWm;ILZ2PuXwu2{;-mcbF
z`c0PSB_x})E@=v_7=lJCMHHhAN#+$))FoM$f=5JrUxP(1r=E7Ll2y|x!733uPa<74
zZMUlVamuP{C4+HlC5qe{RZZFz+r`uy^Zgvp;v3=Grd7d-Uv5UQLEMTryJalTx80dj
zJTSwdM=Gmq{t+_^`gtd-S31k-yGQX*^LvlitB?m58
zHDphFCy%v?>t(H0GEkgiDCQsd|BW)O7Qf~HALKFjXmjKpba2S0?xN^Q_{8+SWro;(PWD#)E8nEcIY`
G;`%p^?M_($
delta 269
zcmX@3+$m$x8Q|y6%O%Cdz`(%k>ERLtq}f22gBeI(7m}}HVBm7jbaoE#baqxKD9TUE
z%t>WnsJOM!&xA|2!BSNas7$iNHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD
z0|T?-ZW>Ty2*wnMhfPZdWL2OmPRHz3PuKo=K2Qa`i92328LD!W>&_QnJ0dj1BPl)UP|Nnu^
z&_kE&fRwDKi(^Q|t)v7XNMT@fb2DIEB9SN(BCv=>;Q#|;4TIpasE#Q>g$$mqelF{r
G5}E+EnMbPt
diff --git a/applications/external/hid_app/assets/Volup_8x6.png b/applications/external/hid_app/assets/Volup_8x6.png
index 4b7ec66d65178e808c672576150f5773b04c31a4..ee9045f7fde3e4c5e7104bdee4919d7694e34d7c 100644
GIT binary patch
delta 1123
zcmb7D&ubGw6rNz!Hc4BdLZuX0HXtp!*_qAe*Vw2@8k#^;W37sK>2zn3EF{@=ciUPI
z{UKh8g2*1U(!W7077rpQ;;jb{ir`5P9z+lXZz9BrX{xP)_3(DyzWLsJ-^};sM*r);
z*m7ZPq|@8y1psvBvcuzi?clb*eGmVB&fIAP+DgfM5`eW^zVBo&0N$LQP8aO)k(7|j
zq$4OEiAYKi0gzo@i>cmA(n#zj&l0rkcpiYOM*vv74!}1aTKovWGz8$&Bmnp>0KMkw
z<1<5iV_#u(B2%x|xqI&Ut9ib3nAwXq0KT4vdBDBZLmaj4u6S<_#Dh@MAcR6R9z;>3
zDbeCFL4k@Q!C|ih{#&tiq!(gduEHGjZOadU0+CG(6E@9>Gdv8Vy$a!cC(G5GfOO%EODt5Vv-tDOek!MYzm4RM8d!Yy+(~$
z`}kn1xK<{$5~B%G7Uf;@Ke(_9VOkyjO8@t%_<#C?eC(Q8JLt>5l#sWHu+-#FF@hLfwFgM=*^?A?|g0Tpl_ffrE)mPWyXf@
IrzWrc08aHw1^@s6
delta 274
zcmcbj+%03#8Q|y6%O%Cdz`(%k>ERLtq&a|?je{9Tp1iGpl7WHCIn&uWz|+}Tp`a)~
zEi)&TfuZ8oMn4lS-3CilL7+0p64!{5;QX|b^2DN42FH~Aq*MjZ+{ElzqZ8JJlaTW+4n
z&B!>}h}U59Q(g&n7bi0d0|V#D`utLp@-$N^k%G
diff --git a/applications/external/hid_app/views/hid_media.c b/applications/external/hid_app/views/hid_media.c
index 468529d56a..0028ac596d 100644
--- a/applications/external/hid_app/views/hid_media.c
+++ b/applications/external/hid_app/views/hid_media.c
@@ -21,6 +21,7 @@ typedef struct {
bool down_pressed;
bool ok_pressed;
bool connected;
+ bool back_pressed;
HidTransport transport;
} HidMediaModel;
@@ -55,61 +56,72 @@ static void hid_media_draw_callback(Canvas* canvas, void* context) {
canvas_set_font(canvas, FontSecondary);
// Keypad circles
- canvas_draw_icon(canvas, 76, 8, &I_Circles_47x47);
+ canvas_draw_icon(canvas, 58, 3, &I_OutCircles);
// Up
if(model->up_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 93, 9, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 68, 6, &I_S_UP);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 96, 12, &I_Volup_8x6);
+ canvas_draw_icon(canvas, 79, 9, &I_Volup_8x6);
canvas_set_color(canvas, ColorBlack);
// Down
if(model->down_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 93, 41, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 68, 36, &I_S_DOWN);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 96, 45, &I_Voldwn_6x6);
+ canvas_draw_icon(canvas, 80, 41, &I_Voldwn_6x6);
canvas_set_color(canvas, ColorBlack);
// Left
if(model->left_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 77, 25, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 61, 13, &I_S_LEFT);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- hid_media_draw_arrow(canvas, 82, 31, CanvasDirectionRightToLeft);
- hid_media_draw_arrow(canvas, 86, 31, CanvasDirectionRightToLeft);
+ hid_media_draw_arrow(canvas, 65, 28, CanvasDirectionRightToLeft);
+ hid_media_draw_arrow(canvas, 70, 28, CanvasDirectionRightToLeft);
canvas_set_color(canvas, ColorBlack);
// Right
if(model->right_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 109, 25, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 91, 13, &I_S_RIGHT);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- hid_media_draw_arrow(canvas, 112, 31, CanvasDirectionLeftToRight);
- hid_media_draw_arrow(canvas, 116, 31, CanvasDirectionLeftToRight);
+ hid_media_draw_arrow(canvas, 96, 28, CanvasDirectionLeftToRight);
+ hid_media_draw_arrow(canvas, 101, 28, CanvasDirectionLeftToRight);
canvas_set_color(canvas, ColorBlack);
// Ok
if(model->ok_pressed) {
- canvas_draw_icon(canvas, 93, 25, &I_Pressed_Button_13x13);
+ canvas_set_bitmap_mode(canvas, 1);
+ canvas_draw_icon(canvas, 74, 19, &I_Pressed_Button_19x19);
+ canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- hid_media_draw_arrow(canvas, 96, 31, CanvasDirectionLeftToRight);
- canvas_draw_line(canvas, 100, 29, 100, 33);
- canvas_draw_line(canvas, 102, 29, 102, 33);
+ hid_media_draw_arrow(canvas, 80, 28, CanvasDirectionLeftToRight);
+ canvas_draw_line(canvas, 84, 26, 84, 30);
+ canvas_draw_line(canvas, 86, 26, 86, 30);
canvas_set_color(canvas, ColorBlack);
// Exit
+ if(model->back_pressed) {
+ canvas_set_bitmap_mode(canvas, 1);
+ canvas_draw_icon(canvas, 107, 33, &I_Pressed_Button_19x19);
+ canvas_set_bitmap_mode(canvas, 0);
+ canvas_set_color(canvas, ColorWhite);
+ }
+ canvas_draw_icon(canvas, 111, 38, &I_Pin_back_arrow_10x10);
+ canvas_set_color(canvas, ColorBlack);
+
canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8);
canvas_set_font(canvas, FontSecondary);
elements_multiline_text_aligned(canvas, 13, 62, AlignLeft, AlignBottom, "Hold to exit");
@@ -135,6 +147,8 @@ static void hid_media_process_press(HidMedia* hid_media, InputEvent* event) {
} else if(event->key == InputKeyOk) {
model->ok_pressed = true;
hid_hal_consumer_key_press(hid_media->hid, HID_CONSUMER_PLAY_PAUSE);
+ } else if(event->key == InputKeyBack) {
+ model->back_pressed = true;
}
},
true);
@@ -160,6 +174,8 @@ static void hid_media_process_release(HidMedia* hid_media, InputEvent* event) {
} else if(event->key == InputKeyOk) {
model->ok_pressed = false;
hid_hal_consumer_key_release(hid_media->hid, HID_CONSUMER_PLAY_PAUSE);
+ } else if(event->key == InputKeyBack) {
+ model->back_pressed = false;
}
},
true);
@@ -176,12 +192,7 @@ static bool hid_media_input_callback(InputEvent* event, void* context) {
} else if(event->type == InputTypeRelease) {
hid_media_process_release(hid_media, event);
consumed = true;
- } else if(event->type == InputTypeShort) {
- if(event->key == InputKeyBack) {
- hid_hal_consumer_key_release_all(hid_media->hid);
- }
}
-
return consumed;
}
diff --git a/applications/external/hid_app/views/hid_mouse.c b/applications/external/hid_app/views/hid_mouse.c
index ca299c4632..75df53dd1f 100644
--- a/applications/external/hid_app/views/hid_mouse.c
+++ b/applications/external/hid_app/views/hid_mouse.c
@@ -49,66 +49,66 @@ static void hid_mouse_draw_callback(Canvas* canvas, void* context) {
}
// Keypad circles
- canvas_draw_icon(canvas, 64, 8, &I_Circles_47x47);
+ canvas_draw_icon(canvas, 58, 3, &I_OutCircles);
// Up
if(model->up_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 81, 9, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 68, 6, &I_S_UP);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 84, 10, &I_Pin_arrow_up_7x9);
+ canvas_draw_icon(canvas, 80, 8, &I_Pin_arrow_up_7x9);
canvas_set_color(canvas, ColorBlack);
// Down
if(model->down_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 81, 41, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 68, 36, &I_S_DOWN);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 84, 43, &I_Pin_arrow_down_7x9);
+ canvas_draw_icon(canvas, 80, 40, &I_Pin_arrow_down_7x9);
canvas_set_color(canvas, ColorBlack);
// Left
if(model->left_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 65, 25, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 61, 13, &I_S_LEFT);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 67, 28, &I_Pin_arrow_left_9x7);
+ canvas_draw_icon(canvas, 63, 25, &I_Pin_arrow_left_9x7);
canvas_set_color(canvas, ColorBlack);
// Right
if(model->right_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 97, 25, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 91, 13, &I_S_RIGHT);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 99, 28, &I_Pin_arrow_right_9x7);
+ canvas_draw_icon(canvas, 95, 25, &I_Pin_arrow_right_9x7);
canvas_set_color(canvas, ColorBlack);
// Ok
if(model->left_mouse_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 81, 25, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 74, 19, &I_Pressed_Button_19x19);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 83, 27, &I_Left_mouse_icon_9x9);
+ canvas_draw_icon(canvas, 79, 24, &I_Left_mouse_icon_9x9);
canvas_set_color(canvas, ColorBlack);
// Back
if(model->right_mouse_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 108, 48, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 107, 33, &I_Pressed_Button_19x19);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 110, 50, &I_Right_mouse_icon_9x9);
+ canvas_draw_icon(canvas, 112, 38, &I_Right_mouse_icon_9x9);
canvas_set_color(canvas, ColorBlack);
}
diff --git a/applications/external/hid_app/views/hid_tiktok.c b/applications/external/hid_app/views/hid_tiktok.c
index 9b15d812b0..bfa0dbc899 100644
--- a/applications/external/hid_app/views/hid_tiktok.c
+++ b/applications/external/hid_app/views/hid_tiktok.c
@@ -41,64 +41,68 @@ static void hid_tiktok_draw_callback(Canvas* canvas, void* context) {
canvas_set_font(canvas, FontSecondary);
// Keypad circles
- canvas_draw_icon(canvas, 66, 8, &I_Circles_47x47);
+ canvas_draw_icon(canvas, 58, 3, &I_OutCircles);
// Pause
if(model->back_mouse_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 106, 46, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 107, 33, &I_Pressed_Button_19x19);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 108, 48, &I_Pause_icon_9x9);
+ canvas_draw_icon(canvas, 113, 37, &I_Pause_icon_9x9);
canvas_set_color(canvas, ColorBlack);
// Up
if(model->up_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 83, 9, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 68, 6, &I_S_UP);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 86, 11, &I_Arr_up_7x9);
+ canvas_draw_icon(canvas, 80, 8, &I_Arr_up_7x9);
canvas_set_color(canvas, ColorBlack);
// Down
if(model->down_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 83, 41, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 68, 36, &I_S_DOWN);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 86, 44, &I_Arr_dwn_7x9);
+ canvas_draw_icon(canvas, 80, 40, &I_Arr_dwn_7x9);
canvas_set_color(canvas, ColorBlack);
// Left
if(model->left_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 67, 25, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 61, 13, &I_S_LEFT);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 71, 29, &I_Voldwn_6x6);
+ canvas_draw_icon(canvas, 64, 25, &I_Voldwn_6x6);
canvas_set_color(canvas, ColorBlack);
// Right
if(model->right_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 99, 25, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 91, 13, &I_S_RIGHT);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 101, 29, &I_Volup_8x6);
+ canvas_draw_icon(canvas, 95, 25, &I_Volup_8x6);
canvas_set_color(canvas, ColorBlack);
// Ok
if(model->ok_pressed) {
- canvas_draw_icon(canvas, 81, 23, &I_Like_pressed_17x17);
- } else {
- canvas_draw_icon(canvas, 84, 27, &I_Like_def_11x9);
+ canvas_set_bitmap_mode(canvas, 1);
+ canvas_draw_icon(canvas, 74, 19, &I_Pressed_Button_19x19);
+ canvas_set_bitmap_mode(canvas, 0);
+ canvas_set_color(canvas, ColorWhite);
}
+ canvas_draw_icon(canvas, 78, 25, &I_Like_def_11x9);
+ canvas_set_color(canvas, ColorBlack);
+
// Exit
canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8);
canvas_set_font(canvas, FontSecondary);
@@ -187,17 +191,17 @@ static bool hid_tiktok_input_callback(InputEvent* event, void* context) {
consumed = true;
} else if(event->key == InputKeyDown) {
// Swipe to new video
- hid_hal_mouse_scroll(hid_tiktok->hid, 19);
+ hid_hal_mouse_scroll(hid_tiktok->hid, -19);
consumed = true;
} else if(event->key == InputKeyUp) {
// Swipe to previous video
- hid_hal_mouse_scroll(hid_tiktok->hid, -19);
+ hid_hal_mouse_scroll(hid_tiktok->hid, 19);
consumed = true;
} else if(event->key == InputKeyBack) {
// Pause
- hid_hal_mouse_press(hid_tiktok->hid, HID_MOUSE_BTN_RIGHT);
- furi_delay_ms(25);
- hid_hal_mouse_release(hid_tiktok->hid, HID_MOUSE_BTN_RIGHT);
+ hid_hal_mouse_press(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
+ furi_delay_ms(50);
+ hid_hal_mouse_release(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
consumed = true;
}
} else if(event->type == InputTypeLong) {
diff --git a/applications/external/hid_app/views/hid_ytshorts.c b/applications/external/hid_app/views/hid_ytshorts.c
index 44ad02ff05..9be2f853c1 100644
--- a/applications/external/hid_app/views/hid_ytshorts.c
+++ b/applications/external/hid_app/views/hid_ytshorts.c
@@ -41,70 +41,75 @@ static void hid_ytshorts_draw_callback(Canvas* canvas, void* context) {
canvas_set_font(canvas, FontSecondary);
// Keypad circles
- canvas_draw_icon(canvas, 66, 8, &I_Circles_47x47);
+ canvas_draw_icon(canvas, 58, 3, &I_OutCircles);
// Pause
if(model->back_mouse_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 106, 46, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 107, 33, &I_Pressed_Button_19x19);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 108, 48, &I_Pause_icon_9x9);
+ canvas_draw_icon(canvas, 113, 37, &I_Pause_icon_9x9);
canvas_set_color(canvas, ColorBlack);
// Up
if(model->up_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 83, 9, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 68, 6, &I_S_UP);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 86, 11, &I_Arr_up_7x9);
+ canvas_draw_icon(canvas, 80, 8, &I_Arr_up_7x9);
canvas_set_color(canvas, ColorBlack);
// Down
if(model->down_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 83, 41, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 68, 36, &I_S_DOWN);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 86, 44, &I_Arr_dwn_7x9);
+ canvas_draw_icon(canvas, 80, 40, &I_Arr_dwn_7x9);
canvas_set_color(canvas, ColorBlack);
// Left
if(model->left_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 67, 25, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 61, 13, &I_S_LEFT);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 71, 29, &I_Voldwn_6x6);
+ canvas_draw_icon(canvas, 64, 25, &I_Voldwn_6x6);
canvas_set_color(canvas, ColorBlack);
// Right
if(model->right_pressed) {
canvas_set_bitmap_mode(canvas, 1);
- canvas_draw_icon(canvas, 99, 25, &I_Pressed_Button_13x13);
+ canvas_draw_icon(canvas, 91, 13, &I_S_RIGHT);
canvas_set_bitmap_mode(canvas, 0);
canvas_set_color(canvas, ColorWhite);
}
- canvas_draw_icon(canvas, 101, 29, &I_Volup_8x6);
+ canvas_draw_icon(canvas, 95, 25, &I_Volup_8x6);
canvas_set_color(canvas, ColorBlack);
// Ok
if(model->ok_pressed) {
- canvas_draw_icon(canvas, 81, 23, &I_Like_pressed_17x17);
- } else {
- canvas_draw_icon(canvas, 84, 27, &I_Like_def_11x9);
+ canvas_set_bitmap_mode(canvas, 1);
+ canvas_draw_icon(canvas, 74, 19, &I_Pressed_Button_19x19);
+ canvas_set_bitmap_mode(canvas, 0);
+ canvas_set_color(canvas, ColorWhite);
}
+ canvas_draw_icon(canvas, 78, 25, &I_Like_def_11x9);
+ canvas_set_color(canvas, ColorBlack);
+
// Exit
canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8);
canvas_set_font(canvas, FontSecondary);
elements_multiline_text_aligned(canvas, 13, 62, AlignLeft, AlignBottom, "Hold to exit");
}
+
static void hid_ytshorts_reset_cursor(HidYTShorts* hid_ytshorts) {
// Set cursor to the phone's left up corner
// Delays to guarantee one packet per connection interval
From 947dd1b75444696def1cd0f558d3dd05179e5301 Mon Sep 17 00:00:00 2001
From: ushastoe
Date: Sat, 29 Apr 2023 18:20:54 +0300
Subject: [PATCH 08/23] Change UP&DOWN swipe
---
applications/external/hid_app/views/hid_tiktok.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/applications/external/hid_app/views/hid_tiktok.c b/applications/external/hid_app/views/hid_tiktok.c
index bfa0dbc899..4dfbde4eb2 100644
--- a/applications/external/hid_app/views/hid_tiktok.c
+++ b/applications/external/hid_app/views/hid_tiktok.c
@@ -190,13 +190,13 @@ static bool hid_tiktok_input_callback(InputEvent* event, void* context) {
hid_hal_mouse_release(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
consumed = true;
} else if(event->key == InputKeyDown) {
- // Swipe to new video
- hid_hal_mouse_scroll(hid_tiktok->hid, -19);
- consumed = true;
- } else if(event->key == InputKeyUp) {
// Swipe to previous video
hid_hal_mouse_scroll(hid_tiktok->hid, 19);
consumed = true;
+ } else if(event->key == InputKeyUp) {
+ // Swipe to new video
+ hid_hal_mouse_scroll(hid_tiktok->hid, -19);
+ consumed = true;
} else if(event->key == InputKeyBack) {
// Pause
hid_hal_mouse_press(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);
From b86d155e8e67a866afe37eed44bfd4e1607e8011 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sat, 29 Apr 2023 21:41:09 +0300
Subject: [PATCH 09/23] Remove ko-fi
---
.github/FUNDING.yml | 1 -
CHANGELOG.md | 1 -
ReadMe.md | 1 -
3 files changed, 3 deletions(-)
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 6a4a770bf9..9187b07480 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1,3 @@
-ko_fi: masterx
custom:
[
"https://boosty.to/mmxdev",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f613f6edab..8dfbf46cf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,7 +31,6 @@
## Please support development of the project
* **Boosty** (patreon alternative): https://boosty.to/mmxdev
-* Ko-Fi: https://ko-fi.com/masterx
* cloudtips (only RU payments accepted): https://pay.cloudtips.ru/p/7b3e9d65
* YooMoney (only RU payments accepted): https://yoomoney.ru/fundraise/XA49mgQLPA0.221209
* USDT(TRC20): `TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`
diff --git a/ReadMe.md b/ReadMe.md
index 1d42e52a3f..7ba70bc338 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -118,7 +118,6 @@ The amount of work done on this project is huge and we need your support, no mat
Also, regarding our releases, every build has and always will be free and open-source. There will be no paywall releases or closed-source apps within the firmware. As long as I am working on this project it will never happen.
You can support us by using links or addresses below:
* **Boosty** (patreon alternative): https://boosty.to/mmxdev
-* Ko-Fi: https://ko-fi.com/masterx
* cloudtips (only RU payments accepted): https://pay.cloudtips.ru/p/7b3e9d65
* YooMoney (only RU payments accepted): https://yoomoney.ru/fundraise/XA49mgQLPA0.221209
* USDT(TRC20): `TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`
From 512fe8aeada2d38194518e44765e1404d00b5f27 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sun, 30 Apr 2023 14:59:38 +0300
Subject: [PATCH 10/23] Fix readme
---
ReadMe.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/ReadMe.md b/ReadMe.md
index 7ba70bc338..1611bed679 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -161,6 +161,7 @@ You can support us by using links or addresses below:
- **UART Terminal** [(by cool4uma)](https://github.com/cool4uma/UART_Terminal/tree/main)
- **ProtoView** [(by antirez)](https://github.com/antirez/protoview)
- **SWD Probe** [(by g3gg0)](https://github.com/g3gg0/flipper-swd_probe)
+- IR Scope [(by kallanreed)](https://github.com/DarkFlippers/unleashed-firmware/pull/407)
Games:
- DOOM (fixed) [(by p4nic4ttack)](https://github.com/p4nic4ttack/doom-flipper-zero/)
From a9e47454d5bdf3d08bf77561691e239dacd89660 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Mon, 1 May 2023 16:17:47 +0300
Subject: [PATCH 11/23] Fix SWD Probe plugin GPIO pins state
Reset pins after exit
---
applications/external/swd_probe/swd_probe_app.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/applications/external/swd_probe/swd_probe_app.c b/applications/external/swd_probe/swd_probe_app.c
index 02cbf8a87e..e8846b9e2d 100644
--- a/applications/external/swd_probe/swd_probe_app.c
+++ b/applications/external/swd_probe/swd_probe_app.c
@@ -3166,6 +3166,11 @@ int32_t swd_probe_app_main(void* p) {
furi_message_queue_free(app->event_queue);
furi_mutex_free(app->gui_mutex);
furi_mutex_free(app->swd_mutex);
+
+ // Reset GPIO pins to default state
+ for(int io = 0; io < 8; io++) {
+ furi_hal_gpio_init(gpios[io], GpioModeAnalog, GpioPullNo, GpioSpeedLow);
+ }
free(app);
furi_record_close(RECORD_GUI);
From 3b40696c9efa713c5460800b8d1403502a4a25e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9B=D0=B5=D0=BD=D1=8C=20=3A=29?=
<88856726+leo-need-more-coffee@users.noreply.github.com>
Date: Mon, 1 May 2023 20:37:25 +0300
Subject: [PATCH 12/23] Add files via upload
---
.../external/flipperzero-bomberduck/LICENSE | 22 +
.../external/flipperzero-bomberduck/README.md | 2 +
.../flipperzero-bomberduck/application.fam | 15 +
.../flipperzero-bomberduck/assets/bomb0.png | Bin 0 -> 4536 bytes
.../flipperzero-bomberduck/assets/bomb1.png | Bin 0 -> 4529 bytes
.../flipperzero-bomberduck/assets/bomb2.png | Bin 0 -> 4531 bytes
.../flipperzero-bomberduck/assets/box.png | Bin 0 -> 4329 bytes
.../flipperzero-bomberduck/assets/end.png | Bin 0 -> 4739 bytes
.../flipperzero-bomberduck/assets/enemy1.png | Bin 0 -> 4757 bytes
.../assets/enemyleft.png | Bin 0 -> 4761 bytes
.../assets/enemyright.png | Bin 0 -> 4536 bytes
.../flipperzero-bomberduck/assets/explore.png | Bin 0 -> 4540 bytes
.../assets/playerleft.png | Bin 0 -> 4311 bytes
.../assets/playerright.png | Bin 0 -> 4307 bytes
.../assets/unbreakbox.png | Bin 0 -> 4763 bytes
.../external/flipperzero-bomberduck/bomb.png | Bin 0 -> 4534 bytes
.../flipperzero-bomberduck/bomberduck.c | 645 ++++++++++++++++++
17 files changed, 684 insertions(+)
create mode 100644 applications/external/flipperzero-bomberduck/LICENSE
create mode 100644 applications/external/flipperzero-bomberduck/README.md
create mode 100644 applications/external/flipperzero-bomberduck/application.fam
create mode 100644 applications/external/flipperzero-bomberduck/assets/bomb0.png
create mode 100644 applications/external/flipperzero-bomberduck/assets/bomb1.png
create mode 100644 applications/external/flipperzero-bomberduck/assets/bomb2.png
create mode 100644 applications/external/flipperzero-bomberduck/assets/box.png
create mode 100644 applications/external/flipperzero-bomberduck/assets/end.png
create mode 100644 applications/external/flipperzero-bomberduck/assets/enemy1.png
create mode 100644 applications/external/flipperzero-bomberduck/assets/enemyleft.png
create mode 100644 applications/external/flipperzero-bomberduck/assets/enemyright.png
create mode 100644 applications/external/flipperzero-bomberduck/assets/explore.png
create mode 100644 applications/external/flipperzero-bomberduck/assets/playerleft.png
create mode 100644 applications/external/flipperzero-bomberduck/assets/playerright.png
create mode 100644 applications/external/flipperzero-bomberduck/assets/unbreakbox.png
create mode 100644 applications/external/flipperzero-bomberduck/bomb.png
create mode 100644 applications/external/flipperzero-bomberduck/bomberduck.c
diff --git a/applications/external/flipperzero-bomberduck/LICENSE b/applications/external/flipperzero-bomberduck/LICENSE
new file mode 100644
index 0000000000..bce361a99c
--- /dev/null
+++ b/applications/external/flipperzero-bomberduck/LICENSE
@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) [year] [fullname]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/applications/external/flipperzero-bomberduck/README.md b/applications/external/flipperzero-bomberduck/README.md
new file mode 100644
index 0000000000..2d133145aa
--- /dev/null
+++ b/applications/external/flipperzero-bomberduck/README.md
@@ -0,0 +1,2 @@
+# flipperzero-bomberduck
+Bomberman clone on flipper zero!
diff --git a/applications/external/flipperzero-bomberduck/application.fam b/applications/external/flipperzero-bomberduck/application.fam
new file mode 100644
index 0000000000..afcd5a6ee1
--- /dev/null
+++ b/applications/external/flipperzero-bomberduck/application.fam
@@ -0,0 +1,15 @@
+App(
+ appid="bomberduck",
+ name="Bomberduck",
+ apptype=FlipperAppType.EXTERNAL,
+ entry_point="bomberduck_app",
+ cdefines=["BOMBERDUCK"],
+ requires=[
+ "gui",
+ ],
+ stack_size=1 * 1024,
+ order=90,
+ fap_icon="bomb.png",
+ fap_category="Games",
+ fap_icon_assets="assets",
+)
diff --git a/applications/external/flipperzero-bomberduck/assets/bomb0.png b/applications/external/flipperzero-bomberduck/assets/bomb0.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fdc3a3c12c7ede770e1c99c2003c777b03f4d75
GIT binary patch
literal 4536
zcmeHKYj6|S6<%y!HW&j1Oo@SwNCLLA+NY$|R^nmFU;#3+tr`c~z&`HETT5CYtu5IJ
znE)k#DRI*@1C1$^5T@xs878Hv(-e#gv`h*^utTUBhjB~-37JAnNeB}jy}R;rl9`UD
z<)1Yp>F&AT`R+O2Irq-qExw{f8R^r~5d_Kb6uL{`zdlYModSPTeC5~R-}PF5xmLo*
z(MVL4l^{U1ng~EaLXi<9adBI5+qM(v*n7XN!
z8V(A9salG3vEWq)igso#5Xb;gQUCQc;F
zHl-hajl?w1R1tbak+dRm#Zgp
znD5TDFF6a3&(A)&s&#QeuBm!_@hRW0pWIycY1w|?Pt*65Rh)1BxFvIs$JNr=Ij3<-
z_TBOWTqFDWwT|4;>t~_|%|&(QlFkRe$lp3O^Tltvu3x%*eLDL7lBIu0A?LT|$+;7<
z=(fq^*LBDX?`d9zI*S=Gf$2EV#^6q-Z8nes`Gbe
z>Y8hIv#0CcT>Na2<0ma6w#7=2vkEQ_+Am@+1G;4qo@>a?!M*0|4W
z?`Bcv{X74}R_@EKy!3Jt@ypij+Z&5wXWSq5
zcl@O#k6su#)qbV;g^_Jt8y+;@2><@>iN=OWb*a(T&yMDdx%FYnkN1bw
zGi!IwMU-o~HL2OzDYHhr`}DsP@xU|cgI&s3w^L{Mqo4n)^w50-8Mjh_tyu0|%86>o
z%uA{O%!yD0_9%il<|QJ$SP3*#00AZJG~IZo$%HDB)3n^;CA<+As89-PqoB05$S>Ab
zigw8~Z*ICH!9ju$(0DWv3Wj4`!f7&iIXKqMxCu2NTBXxe?)9NAH40G1%$NzRAfZ%K
zrn%{;BPz*UiF;u;1$=UvDl{#^;dneAH^*tS8V%s2-EPMT3a2OxBCuFZSmP5|I5tbC
zNOHJAOpGcKO;N+B&dCdEmF6^=;5^zBUnt`B_R@!A-6}vm@B|;hNi%_mLU@0Vm{w2?
zNxB32PLG%$?r6LO#MG*&2nwn}Sewcq76!AE423Z^n-#M&7B~`ENt7+TOF
z%VPjoWJ(r!t0>b3l_YWt)o6%^wI4Xbg6u&PftxIys}4g@egJVR^kzA%Wom
zbKzW3z-wyMuc|?(Ne>CtJ$t9Ua63u7#=Ch9KvIIDIfCJ6!cUMKVdE%!9sw==@T#Q9
zHUAB*ZywZ{51CBi0%mSl_e3i!XI*xM5{F)&33t{;m%MRnlcDti*p?;M5FByI3~hQ~eLd){|z
z2IGC0pYC>hm`kAO&?1A8H;+Tm(fQ3^K4=PV`Vk4%l%WMT8i
zU6+p|2Sy^F9<5lqb<_El58BHnhwrG5w6+vqZ1P6;XZ(eJBr|7J!+Vem@e~xf59Y64
F{~v;POwj-U
literal 0
HcmV?d00001
diff --git a/applications/external/flipperzero-bomberduck/assets/bomb1.png b/applications/external/flipperzero-bomberduck/assets/bomb1.png
new file mode 100644
index 0000000000000000000000000000000000000000..11d05b9b7c445452253792c5a51ad6448cca8aee
GIT binary patch
literal 4529
zcmeHKYj6|S6<*swEEzB`38t=zH-ZE|vf77MudM_zlEDIGgsmEfOoR7vSKeCE3hmmG
zO&&l(8cb5>#Xtjvl7wkGJcdcr)G0%W3u&1IPlBCsjCSvy`~0E_FP>t|H6jQy#aHI7fOl4^|{MfZC%F{ugZOhB<(1vZ>mp)M`9skt&V!ivdjpyd=Jdl<4+CgUF)_3gPmz-S7
zeUE&xdgGrypCtbQUqyHSbJGVa0==Q#HNSE(ow?bsJhy~+V>;eeuoi1M`N_te6@C1w
zxyygCxnz5wuSw*{zU?urHW+Izp1knw{zZ=`l)ej_uZQ+sne^e`6Y1A7bDu$ww2hL-6YzOFgNeg*
zcRc#MyX@!#dGD_7TvA$OYM8d-c;J`!KizzxYH#34FDVxXq}mN
zy?P(h>iDX+yC`!*K6=1h-fXVux%I-r&9kz9{$2mY&(2<)jefLr*>BUy2Re(zqUkx7
zuDi%@nvthI+)SQ0eu5J3Ei`=4U!R@7y6+X&``>-K>(z(aADnz?(=k%qc2`e*&u`kB
z+ZuN{PBg!<-9gs-F@&K%TbZBF3!7eW>#e1n`H6Jx&3q3ct2L(
z%c0DBcl_Q_x2LG?vlovLFLiF++FGtmGu&S@eTKK-buQ!H;IutIp7-v;=BsD#zM1wH
z{Q0H#oSHPt`NfK-CUx~cajUH_y8rsI*6nvTXUxXmxeE3JOQAM=1(sjMjuDx1oKd{Z6o
z6if@|8(m2T5=4N?qRB`&sxV2nN#|wYSTo}$REMZ_Zd0{CfO_OOKxs2=Ca}_^)Igc$
z8&OwW5Sa?^q5%r{n(Ik{eSn@n&X9gHs$^ZSSBqso8^P!BxG#&FV1;E@PE(nC>88z9L*
zK;P@31mT9pD}W-`$9YiN0HW%gkrV9tU9%flvjmN{(7`vCkhE^3Ws*
zNs*ZD1;rkPR3&j(tWmLPGkQ8B1A*>Cyra;Ax$9tv^7|RD%-3t-`MhqEwmu`syd*IC
zkmfi$&su5BNzxQX+wC^YNn7EFa|pa>W$hfzj-c{I6_t(hK%;`>W(o3$qJ`pEs|}-V
z0A3uNh;ck=#VDI-rwGE8h6akegtEoxa9F&8wktAuekd)Il45|Wg1$LswNfKrYtVPG;)SXS#(NTAzc
zE{rD*SXGV(WjX9NX(6GS=g_ntZYP0NSud*sNJ>x^hM*Y>5hO^4aKJ$^0WBl&vLK0#
z{|&8e9@Ld8d6}fZ^&53lYDZOqHL0i6V_4F+5{l}Zf?@eo3JTi*1U*j3m73yf*=PvB
z(_^4r2kp}Lv;qlBE!t@d#&HDfA<+WsXAv!!jTA+aA~*_=_R;K$EUF1M4oX5$N2nES
zPhBgtKrd9`Xmp|$XjOoMVFZm)&LBlHP&|qp5DdTlDbg0Z18^jPIqY!P&{mGbSc;=C
zo~JlMw32o!aEuQ6e@St;C;lx(7p@(PgGF`W|55f7V8l5JrAgV~`3#SHeCWI%&`dj7
zZ{u&E-EQLwka~QPG3h%l*SK6`QeaHr@$MRzYfK7^2|V6i|2Mge!(WUb3SaaR@O!W*
z{^U#WThb6Kdr(0T^BnD;mfW+T0UGa6eg4ur&QF*zcD`;u^wIl|ukC9&oAubK9~ufwSNA{`#8+DGJ+QE5!@mG~Pe@e&
literal 0
HcmV?d00001
diff --git a/applications/external/flipperzero-bomberduck/assets/bomb2.png b/applications/external/flipperzero-bomberduck/assets/bomb2.png
new file mode 100644
index 0000000000000000000000000000000000000000..38ce7c732bfa5e3586d1c9b9a754b85405cd4566
GIT binary patch
literal 4531
zcmeHKYj6|S6<$9e*oGLGfT_peML+;Mt9|ORTZxAyg9XS4TQv?$fqmSSHA3^WiZAxzpKrA(4i6NVBeq@^iL8oQJ_lVlvzgcO=MrVOMFkKSGRIn7MR
z)AG-nk#zUmbH01dcfNaP@3uhs(h1r5*$9G6@RfNh;J-1>9+wV((*xC4;NRzs!D_vN
zPoS~5Dl1`t>J2e~f}|oNNb>!sS9Lyp1|5I!#1@WW-qE0gfHd5>Z{-}`g({)!%P
z&Fqyw*}iyhV1DPvt7jJf<#OZ15A%B0)#T@#dW>FB2{Wmz+EVqawu+sH-rq1`&9jpy
zlT|<1w5X}~iC<=pA#T>_x2q1FK6xT>z4Q)U)tK>KD3S56b|4{0TC?Ku1biM(f8ns)
zeNE4}%ida4@b>zSWu--y`iZN~2A+RtYs+Ue|AFQgm(Dv8%+=D((dw2J|)~N-z
zs$b?>oma1P6^+|ch#s|;w^%E>@BXM{`?TC0U-y3T(WNh@qkmey;?;C=QAe>{G%1hn
zoI-xpf;{=h?c}+$=O}s3{H%9->v9X%_q^cx!`B}iIJEZs!{fi)c7~MqOzE!c{`vWq
zwuS@Fb1knd+f?p)qTt>!A&kCVS`oOvsoMoOt**8PHaR{sv3be)cHmW
zQ=i}$H~(#Ado6~=Gp~m;@-AZj&J1hfu{(1;cChqX#{<_Ix^6%9oB27{KTQAbk*IpU
zY2N}wxl+`SQBaURYs@?A{*g?C9#!w|S8m+Qm=TO${k-zn9R#_5tpb%;?O(x(YQ)M*
zssOCXNDN98L0k)yF5Y%C9ojkO{x
zSr#tHb|pCo5CJ-mCL`gf#wFbr6PJTy!;D){(?zd!TdMs5)T71$%2*jIft4neddjjO
z8+FAcnXB+F>4ShzZcB}>$2c5MBofvHZB^qToMc%RCn%hvFzA744N;v>Vo`0D0g=M+
z0!@r7FA_Yc5FwLTUgA9#|F;iQ$oBN2RPgr=9)Ly*3N
zzA-`z!VQgA08Ooni=ea~MDLA4a?1#G0Pd62n-*<9p>F%yXg$Q{C>`>igiYMKCjzitj|fRs7RbS
zWCXz>@-_xzNru80hr^Dsj17(irzFZY-XSpj5GY?%)A^_f3@8Y0RUnR?b~3cU5}4f~
z*f550Ix&G_Y#3o<8PXxM5=D_iAXdf|s7gLOG%Ev2f>2J965#Q~q&LRpDHOCZeaG7NBARw&WB
zMoOp=IWX;q+ezYe-plI%f)W(X5e!EYL4xE677mIDXc^+KN{Za@
z-@J{@gSt{JFH!Uv6i8X3WCufIfj^#%7Kb2@kSi!p
zlPh$d*{J!$y%ROS=mI1RBN&WggA~a@@+h*8F#O(^DB5|_LECvuq$B~Vof0u814xV(
zL`oK%EW_GT`WPVae<^WL6V&h$UAS>9_BYjq|3}+X4nxjSNKMKH&u4ht;{)e?A7?P%
zd->^;+r3-@MMoDI5x=8!jnXwD21evOs;*JGM#R8~oJZC5f1@jV@Wu$D@I@~H?}KlC
zwr(rDOJ>E&9@Y@VI?MQ`B@ZvGhsOJKpTG3J%bC-sW}yQA_qEXUExoi__oxx$nt_;a
zzd%A0ie7^nZ@;TI-=Ak(Onu(P!D$^$JAOY2A;zUQ`|e`93fbA6h0fPYDxODT?2Y63
zPrW*&>7})^$)cW1xch3(p$l^^t>3Zrh@Ae&jG38f-#JVCB8d4V+w@^|y107;Q8`s!r9<>K*$8}6g>N;sjATc4yq;7b1@BE%-
zrsJ9BKTD(2-nYN+x8L{MZ+CY0`icq`7#=X_bh-teLU#%LSKEdZJ$&kYfvfOusKy^q
zN|-njlSEz!14OBg0R$ujUZ+c3db;>8Pj}!cx8h58=&|)#uT^{c+77htKeX!Lk4s