Skip to content

Commit 1d801c3

Browse files
xMasterXxMasterX
committed
Merge branch 'dev' into release
2 parents 8afdb5b + 08a2e51 commit 1d801c3

File tree

6 files changed

+38
-7
lines changed

6 files changed

+38
-7
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
### New changes
22
* Plugins: Fix minesweeper freeze bugs, do some refactoring
33
* Plugins: Update WAV Player, 16 bit support by @LTVA1
4+
* Infrared: Update universal remote assets (by @amec0e | PR #394)
45
* OFW PR: Fixed writing gen1a magic tags with invalid BCC [(PR 2511 by AloneLiberty)](https://github.com/AloneLiberty/flipperzero-firmware/tree/nfc-magic-write-fix)
56
* OFW: BadUSB: Script interpreter refactoring
67
* OFW: SubGhz: fix Incorrect comparison in subghz_setting_get_hopper_frequency

‎assets/resources/infrared/assets/ac.ir

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Filetype: IR library file
22
Version: 1
3-
# Last Updated 07th Mar, 2023
4-
# Last Checked 07th Mar, 2023
3+
# Last Updated 21st Mar, 2023
4+
# Last Checked 21st Mar, 2023
55
#
66
name: POWER
77
type: raw
@@ -1680,3 +1680,9 @@ type: raw
16801680
frequency: 38000
16811681
duty_cycle: 0.330000
16821682
data: 454 413 453 412 454 412 454 412 454 413 453 25102 3490 1707 483 1249 484 383 483 383 482 383 509 1222 483 383 482 384 481 385 480 385 480 1250 482 386 479 1252 479 1254 477 414 451 1281 450 1282 449 1283 449 1283 449 1284 448 417 448 417 449 1284 448 417 449 417 449 418 448 417 449 417 449 417 449 417 449 417 449 417 449 417 449 1284 448 418 448 1284 448 418 448 418 448 418 448 1284 448 1284 448 418 448 418 448 417 448 418 448 1284 448 417 449 417 448 418 448 417 449 417 449 417 449 418 448 417 449 418 448 418 448 418 448 1284 448 1284 448 1284 449 417 449 418 448 1284 448 1284 448 1284 448 35505 3485 1712 449 1283 449 417 449 417 449 417 449 1284 448 417 449 417 449 417 449 417 449 1284 448 417 449 1284 448 1284 448 417 449 1284 448 1284 448 1284 448 1283 449 1284 448 417 449 417 449 1284 448 417 449 417 449 417 449 417 449 417 449 417 449 417 449 417 449 418 448 418 448 417 449 1284 448 417 449 417 449 417 449 417 449 1284 448 417 448 418 448 418 448 417 448 418 448 418 448 418 448 418 448 418 448 418 448 418 448 418 448 418 448 1284 448 418 448 418 448 418 448 418 448 418 448 1284 448 418 448 418 448 1285 447 1285 447 418 448 35504 3486 1712 449 1283 449 417 449 417 448 417 449 1284 448 417 449 417 449 417 449 417 448 1284 448 417 449 1284 448 1284 448 417 449 1283 449 1284 448 1284 448 1284 448 1284 449 417 449 417 449 1284 448 417 449 417 449 418 448 417 449 417 449 417 449 418 448 417 449 417 449 418 448 418 448 418 448 417 448 418 448 418 448 418 448 418 448 418 448 418 448 418 448 418 448 1284 448 1284 448 1284 448 418 448 418 448 418 448 1284 448 418 448 418 448 1284 448 1284 448 418 448 418 448 418 448 418 448 418 448 418 448 418 448 418 448 418 448 418 448 418 448 418 448 418 448 418 448 1285 447 1285 447 418 448 1285 447 1285 447 1285 447 1285 447 1285 447 419 447 418 448 419 447 418 448 418 448 418 448 419 447 419 447 418 448 418 448 419 447 419 447 419 447 1285 447 1285 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 1286 446 1285 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 419 447 1286 446 420 446 420 446 420 446 420 446 419 447 1286 446 1286 446 419 447 420 446 420 446 420 446 420 446 420 446 420 446 1286 446 420 446 420 446 420 446 420 446 420 446 420 446 420 446 420 446 420 446 1286 446 420 446 420 446 420 446 1287 445 1287 445 1287 445
1683+
#
1684+
name: POWER
1685+
type: raw
1686+
frequency: 38000
1687+
duty_cycle: 0.330000
1688+
data: 1373 348 1310 376 463 1190 1318 400 1286 401 439 1244 442 1244 1288 400 465 1218 468 1218 468 1219 467 7970 1307 404 1281 405 435 1252 1281 406 1280 406 434 1252 434 1252 1281 406 434 1253 434 1252 434 1252 434 8000 1280 406 1281 406 434 1252 1281 406 1280 406 434 1252 434 1252 1281 406 434 1253 433 1253 433 1253 434 8000 1280 406 1280 406 434 1253 1280 406 1280 406 434 1253 433 1253 1280 406 434 1253 433 1253 433 1253 433 8001 1279 406 1280 406 434 1253 1280 407 1279 407 433 1253 434 1253 1280 407 433 1253 433 1253 433 1253 433 8001 1279 407 1279 407 433 1253 1280 407 1280 407 433 1253 433 1253 1280 407 433 1253 433 1253 434 1253 433

‎assets/resources/infrared/assets/audio.ir

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Filetype: IR library file
22
Version: 1
3-
# Last Updated 07th Mar, 2023
4-
# Last Checked 07th Mar, 2023
3+
# Last Updated 21st Mar, 2023
4+
# Last Checked 21st Mar, 2023
55
#
66
name: POWER
77
type: parsed
@@ -2098,3 +2098,27 @@ type: parsed
20982098
protocol: NEC
20992099
address: 00 00 00 00
21002100
command: 04 00 00 00
2101+
#
2102+
name: POWER
2103+
type: parsed
2104+
protocol: NEC
2105+
address: FD 00 00 00
2106+
command: E2 00 00 00
2107+
#
2108+
name: MUTE
2109+
type: parsed
2110+
protocol: NEC
2111+
address: FD 00 00 00
2112+
command: E1 00 00 00
2113+
#
2114+
name: VOL+
2115+
type: parsed
2116+
protocol: NEC
2117+
address: FD 00 00 00
2118+
command: E7 00 00 00
2119+
#
2120+
name: VOL-
2121+
type: parsed
2122+
protocol: NEC
2123+
address: FD 00 00 00
2124+
command: B9 00 00 00

‎assets/resources/infrared/assets/fans.ir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Filetype: IR library file
22
Version: 1
33
# Last Updated 15th Feb, 2023
4-
# Last Checked 07th Mar, 2023
4+
# Last Checked 21st Mar, 2023
55
#
66
name: POWER
77
type: raw

‎assets/resources/infrared/assets/projectors.ir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Filetype: IR library file
22
Version: 1
33
# Last Updated 07th Mar, 2023
4-
# Last Checked 07th Mar, 2023
4+
# Last Checked 21st Mar, 2023
55
#
66
# ON
77
name: POWER

‎assets/resources/infrared/assets/tv.ir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Filetype: IR library file
22
Version: 1
33
# Last Updated 07th Mar, 2023
4-
# Last Checked 07th Mar, 2023
4+
# Last Checked 21st Mar, 2023
55
#
66
name: POWER
77
type: parsed

0 commit comments

Comments
 (0)