Merge remote-tracking branch 'OFW/dev' into dev

assets/dolphin/external/L1_Procrastinating_128x64/meta.txt

@@ -0,0 +1,23 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 26
+Active frames: 23
+Frames order: 0 1 2 3 4 5 6 7 8 9 10 9 11 12 13 12 14 15 16 15 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 37 38 37 38 37 39 40
+Active cycles: 1
+Frame rate: 2
+Duration: 3600
+Active cooldown: 7
+
+Bubble slots: 1
+
+Slot: 0
+X: 2
+Y: 36
+Text: I'll just get\nback to work
+AlignH: Right
+AlignV: Center
+StartFrame: 42
+EndFrame: 47

assets/dolphin/external/manifest.txt

@@ -188,7 +188,7 @@ Min butthurt: 0
 Max butthurt: 12
 Min level: 3
 Max level: 3
-Weight: 4
+Weight: 3
 
 Name: L1_Akira_128x64
 Min butthurt: 0
@@ -202,6 +202,13 @@ Min butthurt: 0
 Max butthurt: 12
 Min level: 3
 Max level: 3
+Weight: 4
+
+Name: L1_Procrastinating_128x64
+Min butthurt: 0
+Max butthurt: 8
+Min level: 1
+Max level: 3
 Weight: 6
 
 Name: L3_Fireplace_128x64

lib/lfrfid/tools/t5577.c

@@ -14,9 +14,6 @@
 #define T5577_OPCODE_PAGE_1 0b11
 #define T5577_OPCODE_RESET  0b00
 
-#define T5577_BLOCKS_IN_PAGE_0 8
-#define T5577_BLOCKS_IN_PAGE_1 4
-
 static void t5577_start(void) {
     furi_hal_rfid_tim_read_start(125000, 0.5);
 

lib/lfrfid/tools/t5577.h

@@ -7,6 +7,8 @@ extern "C" {
 #endif
 
 #define LFRFID_T5577_BLOCK_COUNT 8
+#define T5577_BLOCKS_IN_PAGE_0   8
+#define T5577_BLOCKS_IN_PAGE_1   4
 
 // T5577 block 0 definitions, thanks proxmark3!
 #define LFRFID_T5577_POR_DELAY             0x00000001