Commit graph

2432 commits

Author SHA1 Message Date
Clara K
c0afbf659a
Update archive_browser.h 2023-02-11 15:40:11 +01:00
Clara K
a6dc16a98c
Add Internal Tab 2023-02-11 15:39:30 +01:00
MX
db012807f5
Merge branch 'fz-dev' into dev 2023-02-10 22:53:51 +03:00
MX
97087fadb9
Merge pull request #316 from notmarek/dev
Fix CTRL-SHIFT in mousejacker
2023-02-10 16:51:51 +03:00
Pierce
3eacb0c715
Fixed typo in nfc_magic_scene_wrong_card.c (#2382) 2023-02-10 21:52:53 +09:00
MX
36f1283bb3
Fix: line was hidden under image in decode raw 2023-02-10 03:58:09 +03:00
MX
1b1f58408d
SubGHz Decode Raw GUI fixes 2023-02-10 02:25:30 +03:00
MX
a098e0561e
Temp fix
BUG: Now sound works but sending signal with sound on doesn't actually send signal!!!
Need to return previous implementation with 2 channel Timer or find another way
2023-02-10 00:56:29 +03:00
MX
175287ee0a
Fix again 2023-02-09 23:56:36 +03:00
MX
c5e225656d
Throw in some copy pastas
temp solution, maybe not temp, maybe its forever
2023-02-09 23:25:00 +03:00
MX
07093d072f
Fix Debug pin 2023-02-09 23:21:36 +03:00
MX
fda38c9d04
Debug pin setting for subghz protocol development
When DEBUG is on in settings, you can turn on debug pin in radio settings now, DO NOT use it if you don't know what it is!!!!
2023-02-09 22:41:12 +03:00
MX
16a5b13be4
Max 55 signals Seems stable, setting it to 55 for now
Subghz history
2023-02-09 22:12:03 +03:00
MX
ef2c668e31
Small GUI fixes
remove static line in subghz receiver because now we have RSSI line
2023-02-09 18:01:52 +03:00
MX
539c4e2dd0
Fixes & imporvements
Use our custom icon for Bin RAW
2023-02-09 17:49:28 +03:00
MX
b9351649ed
Merge branch 'fz-dev' into dev 2023-02-09 17:48:50 +03:00
MX
be33e099be
Fix read raw GUI
Now showing internal or external module usage properly
2023-02-09 17:22:19 +03:00
MX
ba36f4672c
Throw away Kostily & Velosipedy
Ne bag a ficha, bolshe ne nuzhna
2023-02-09 17:21:40 +03:00
Petr Portnov | PROgrm_JARvis
4265057ee8
feat: add missing const qualifiers (#2233)
* feat: make `ViewPort` getters const
* feat: make tx-buffers const
* feat: make `canvas_get_buffer_size` const
* feat: make `canvas` methods const
* feat: make `icon_animation` methods const
* feat: make `scene_manager` methods const
* feat: make `loader` method const
* feat: make `canvas_get_font_params` const

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-02-09 13:58:01 +09:00
Skorpionm
163be139eb
SubGhz: add protocol BinRAW (binarization of data quantized by the minimum correlated duration) (#2322)
* SubGhz: add protocol DataRAW (binarization of data quantized by the minimum correlated duration)
* SubGhz: fix name history
* SubGhz: add encoder Data_RAW protocol
* SubGhz: decreasing the size of the LevelDuration structure
* SubGhz: history, added check that there is free RAM
* SubGhz: checking for free memory, support to pass without gap
* SubGhz: add running average to average the result, auto cut noise at the end of a burst
* SubGhz: support for repeating sequences
* SubGhz: fix secplus_v2 decoder
* SubGhz: bin_RAW fix add history
* SubGhz: add debug
* SubGhz: debug refactoring
* FURI_LOG: add FURI_LOG_RAW_x formatted string output like printf
* SubGhz: fix new FURI_LOG metod
* FURI_LOG: fix unit test
* SubGhz: add enable/disable BinRAW protocol decoding
* SubGhz: fix PVS
* SubGhz: forcibly turn off the speaker when exiting SubGhz
* SubGhz: adaptive adjustment to the noise level

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-02-09 13:48:06 +09:00
Patrick Cunningham
71871949ec
Picopass: show elite key used from dictionary (#2119)
* show elite key used from dictionary
* remove space so it fits on screen

Co-authored-by: あく <alleteam@gmail.com>
2023-02-09 12:47:16 +09:00
MX
eaffe0ec17
Fix small bugs 2023-02-08 21:45:23 +03:00
MX
3890c7f9fa
Merge branch 'fz-dev' into dev 2023-02-08 21:26:56 +03:00
hedger
a005087636
fbt: building fap_dist for compact gh build; accessor: fixed for latest ibutton changes (#2377)
* fbt: building fap_dist as default target; accessor: fixed for latest ibutton changes
* fbt: not building fap_dist as default target; github: doing fap_dist for compact builds

Co-authored-by: あく <alleteam@gmail.com>
2023-02-09 03:16:05 +09:00
Eric Betts
8f2f2d810a
Move CSN space to revent overflow (#2232)
Co-authored-by: あく <alleteam@gmail.com>
2023-02-09 03:06:42 +09:00
MX
d02c586b92
Merge branch 'fz-dev' into dev 2023-02-08 21:05:17 +03:00
MX
ed78c4ca04
Fixes 2023-02-08 20:49:06 +03:00
Skorpionm
db1a8f8014
[FL-3099] SubGhz: add protocol KingGates Stylo4k (#2368)
* [FL-3099] SubGhz: add protocol KingGates Stylo4k
* SubGhz: add unit test file
* f7: api: reverted symbols

Co-authored-by: hedger <hedger@nanode.su>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-02-09 02:47:39 +09:00
itsweekly
39841bd5a9
Universal Projector Remote (#2343)
Co-authored-by: Georgii Surkov <georgii.surkov@outlook.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-02-09 02:28:34 +09:00
MX
2006bd1c95
Add linear delta 3 support to bruteforcer 2023-02-08 20:21:15 +03:00
Skorpionm
bf4d00a7d1
[FL-3100] SubGhz: add protocol Nice One (#2358)
* SubGhz: add protocol Nice One
* SubGhz: fix annotation
* SubGhz: add unit test

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-02-09 02:20:28 +09:00
MX
bbc1ba62fc
Merge branch 'fz-dev' into dev 2023-02-08 20:12:10 +03:00
Skorpionm
31259d5304
[FL-3091] SubGhz: add protocol Alutech at-4n (#2352)
* GubGhz: add protocol Alutech at-4n
* SubGhz: fix syntax
* SubGhz: fix subghz_protocol_decoder_alutech_at_4n_get_hash_data
* SubGhz: add unit test alutech at-4n
* SubGhz: add name key

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-02-09 01:59:49 +09:00
Skorpionm
0afc4a8982
[FL-3092] SubGhz: add DOOYA protocol (#2178)
* SubGhz: add DOOYA protocol
* SubGhz: add unit_test DOOYA protocol
* SubGhz: fix protocol Dooya

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-02-09 01:37:24 +09:00
MX
c8cf3e41a7
Fix that sound switcher was not present in read raw 2023-02-08 18:48:28 +03:00
Brandon Weeks
8288a08eb3
SubGhz: add protocol "Linear Delta-3" (#2239)
* SubGhz: add protocol "Linear Delta-3"
* SubGhz: fix Leniar Delta 3
* BadUSB: mask pvs studio warning for valid code

Co-authored-by: SkorP <skorpionm@yandex.ru>
Co-authored-by: あく <alleteam@gmail.com>
Co-authored-by: Skorpionm <85568270+Skorpionm@users.noreply.github.com>
2023-02-09 00:26:45 +09:00
MX
b1f581239b
BadUSB: Keyboard Layouts (#2256)
* BadUSB: Keyboard Layouts
* Apply requested changes pt1
* Add layout file check when we loading config

Co-authored-by: Nikolay Minaylov <nm29719@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-02-09 00:01:00 +09:00
MX
0dccbe28bb
Merge branch 'fz-dev' into dev 2023-02-08 17:15:17 +03:00
Skorpionm
99253a0e28
[FL-3093, FL-3087] SubGhz: Fix Raw write, add short duration filter setting (#2300)
* SubGhz: Fix recording RAW files, sometimes could not start at a high level
* SubGhz:  subghz_worker, add short duration filter setting
* SubGhz: capture raw timings in cli. Furi: clear pending interrupts on ISR set/reset
* SubGhz: fix start  duration in furi_hal_subghz_start_async_rx
* [FL-3093] SubGhz: hopping issue in some regions
* [FL-3087] SubGhz: fix delete-ok issue
* SubGhz: remove copypasta from rx_raw cli command

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-02-08 22:20:42 +09:00
MX
30081b79c4
Mirror my changes to badusb layouts from PR 2023-02-08 16:10:47 +03:00
MX
cdfd9891b7
Fix debug accessor app 2023-02-08 12:57:23 +03:00
LTVA1
23ecc186c2
Custom font set function (#2261)
* custom font set function
* update API symbols
* add example of custom font usage
* delete u8g2 dependency in example custom font
* rename to canvas_set_custom_u8g2_font
* now change the name in ALL places

Co-authored-by: あく <alleteam@gmail.com>
Co-authored-by: hedger <hedger@users.noreply.github.com>
2023-02-08 18:26:17 +09:00
MX
81316255f9
Fix after merge issues pt1 2023-02-08 12:22:11 +03:00
MX
6c768f2019
Merge branch 'fz-dev' into dev 2023-02-08 12:09:57 +03:00
Liam Hays
111c7557b3
Fix minor UI inconsistencies and bugs (#2361)
* Changed blue LED to cyan in NFC Magic and Picopass apps.
* Fix capitalization of ATQA and UID in NFC Add Manually wizard.
* Fix reselection of "Saved" menu item in NFC and RFID apps.
* Fix double back press after deleting a file in the SubGhz browser.
* Make NFC app behave like other apps: return to the file browser after deleting a file.
* Rename NfcSceneSetAtqua to NfcSceneSetAtqa.
* Save selected menu items in NFC Magic and Picopass apps in a way that always works.
* Restore previous selection in Universal Remotes menu.
* Other way to do universal remote menu saving, and NFC Extra Actions saves last selection.

Co-authored-by: あく <alleteam@gmail.com>
2023-02-08 17:08:50 +09:00
Georgii Surkov
7a3a1aaf0d
[FL-3057] Allow use of any suitable pin for 1-Wire devices (#2350)
* Add 1-wire thermometer example app stub
* Working 1-wire thermometer app
* Refactor app to use threads
* Clean up code, add comments
* Add CRC checking
* Increase update period
* Fix error in fbt
* Revert the old update period
* Use settable pin in onewire_host
* Use settable pin for onewire_slave
* Clear EXTI flag after callback, make private methods static in onewire_slave
* Do not hardcode GPIO pin number
* Remove iButton hal from furi_hal_rfid
* Remove most of furi_hal_ibutton
* Add some of furi_hal_ibutton back
* Slightly neater code
* Fix formatting
* Fix PVS-studio warnings
* Update CODEOWNERS
* Add furi_hal_gpio_get_ext_pin_number
* Create README.md
* FuriHal: move furi_hal_gpio_get_ext_pin_number to resources

---------

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-02-08 14:40:44 +09:00
Sergey Gavrilov
e3d473bf42
[FL-2435] SD over SPI improvements (#2204)
* get rid of BSP layer
* sector_cache: init in any case
* new sd-spi driver: init
* Delete stm32_adafruit_sd.c.old
* Delete spi_sd_hal.c.old
* Storage: faster api lock primitive
* Threads: priority control
* Flags: correct error code
* Spi: dma mode
* SD-card: use DMA for big blocks of SPI data
* Fix wrong SD_TOKEN_START_DATA_MULTIPLE_BLOCK_WRITE value
* do not memset cache if it is NULL
* remove top-level timeouts
* sd hal: disable debug
* Furi HAL: DMA
* Furi HAL RFID: use furi_hal_dma
* Furi HAL DMA: tests
* Furi HAL DMA: docs
* rollback "Furi HAL RFID: use furi_hal_dma"
* 4 channels taken from DMA manager for core HAL.
* Furi HAL DMA: live fast, die young
* RPC tests: increase message buffer
* SPI HAL: use second DMA instance
* sd hal: new CID getter
* SPI hal: use non-DMA version if kernel is not running
* IR hal: generalize DMA definition
* storage: add CID data to sd info
* RFID hal: generalize DMA definition
* SUBGHZ hal: generalize DMA definition. Core hal moved to DMA2.
* Storage: small optimizations, removal of extra mutex
* Storage: redundant macro
* SD hal: more timeouts
* SPI hal: DMA init
* Target: make furi_hal_spi_dma_init symbol private
* Update F18 api symbols

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-02-08 13:41:22 +09:00
hedger
224d0aefe4
[FL-2733] multitarget support for fbt (#2209)
* First part of multitarget porting
* Delete firmware/targets/f7/Inc directory
* Delete firmware/targets/f7/Src directory
* gpio: cli fixes; about: using version from HAL
* sdk: path fixes
* gui: include fixes
* applications: more include fixes
* gpio: ported to new apis
* hal: introduced furi_hal_target_hw.h; libs: added one_wire
* hal: f18 target
* github: also build f18 by default
* typo fix
* fbt: removed extra checks on app list
* api: explicitly bundling select mlib headers with sdk
* hal: f18: changed INPUT_DEBOUNCE_TICKS to match f7
* cleaned up commented out code
* docs: added info on hw targets
* docs: targets: formatting fixes
* f18: fixed link error
* f18: fixed API version to match f7
* docs: hardware: minor wording fixes
* faploader: added fw target check
* docs: typo fixes
* github: not building komi target by default
* fbt: support for `targets` field for built-in apps
* github: reworked build flow to exclude app_set; fbt: removed komi-specific appset; added additional target buildset check
* github: fixed build; nfc: fixed pvs warnings
* attempt to fix target id
* f7, f18: removed certain HAL function from public API
* apps: debug: enabled bt_debug_app for f18
* Targets: backport input pins configuration routine from F7 to F18

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-02-08 01:33:05 +09:00
MX
0ee04fb968
Merge branch 'fz-dev' into dev 2023-02-07 18:36:02 +03:00
Marek Veselý
3df5a99968
Fix CTRL-SHIFT in mousejacker 2023-02-07 15:56:02 +01:00
Round-Pi
1ff5843ee6
battery info temperature shown in C or F based on settings (#2360)
* battery Info temperature displays C or F
* PowerSettings: add locale module to dependencies

Co-authored-by: あく <alleteam@gmail.com>
2023-02-07 12:05:52 +09:00
MX
f116e8165f
Merge branch 'fz-dev' into dev 2023-02-06 22:46:17 +03:00
nas
79d45c97f9
AleX83Xpert/add f keys to keyboard layout (#2362)
* Assets: png images for F1..F12 keys: Will be used for HID keyboard layout
* HID KEYBOARD F1..F12 keys were added
  - a new row with functional keys was added
  - logic for displaying the keyboard layout was improved
* HidApp: hid functional keys by default

Co-authored-by: あく <alleteam@gmail.com>
2023-02-07 00:24:05 +09:00
Max Andreev
9f279ac872
[FL-2744] SPI Mem Manager C port (#1860)
Co-authored-by: あく <alleteam@gmail.com>
2023-02-06 23:03:29 +09:00
MX
72f250195c
Playing games now affect Flipper's level
All games now will increase flipper's level when you start them or win in some of them

Games with endless play like tetris or flappy bird has no winning logic so they will increase level only when you start them
2023-02-05 15:39:10 +03:00
Cathy Nguyen
683b5cdc82 battery info temperature shown in inp/metric units 2023-02-04 16:17:18 -05:00
MX
bbe55aa9d6
Change example custom font app type to DEBUG
so it will not be compiled in release builds
2023-02-04 15:54:18 +03:00
MX
559c4567cb
Rename: Radio settings -> Radio Settings 2023-02-03 17:43:17 +03:00
MX
8c50225da4
Fix issue with external module settings
It was possible to set it to external module without module connected, and as it saves its state in memory, all other plugins that uses subghz will not work, now we checking for module when you changing that setting
2023-02-03 17:20:10 +03:00
MX
bfbcce030c
Fix GUI issues
Fix secplus v1 text too
2023-02-03 15:39:02 +03:00
Victor
5458157924 Added external CC1101 support 2023-02-02 22:47:50 +03:00
MX
7edf90c2e5
Merge branch 'fz-dev' into dev 2023-02-02 18:28:52 +03:00
AloneLiberty
46fb86265c
NFC: fix creating MF Classic tags from "Add Manually" menu (BCC calulation and ATQA/SAK writing) (#2342)
* NFC: fix creating MF Classic cards from "Add Manually" menu (BCC calculation and AQTA/SAK writing)
* NFC: Fix BCC/SAK/ATQA in unit_tests and SAK in nfc_generate_mf_classic

Co-authored-by: gornekich <n.gorbadey@gmail.com>
2023-02-02 22:18:39 +07:00
MX
3c52dca0c2
Fix mouse jiggler merge issue 2023-02-02 14:31:03 +03:00
MX
ed4b2b3362
Merge remote-tracking branch 'LTVA1/patch-custom-font' into dev 2023-02-02 14:27:17 +03:00
MX
b05cba931b
Update UniTemp
https://github.com/quen0n/unitemp-flipperzero/tree/master
2023-02-02 14:01:23 +03:00
MX
1d46df70a9
Update ProtoView
https://github.com/antirez/protoview
2023-02-02 13:54:14 +03:00
Emanuele Conti
cee11464de Merge branch 'mouse_jiggler_interval_selction_added' of https://github.com/DocKuro/unleashed-firmware into mouse_jiggler_interval_selction_added 2023-02-02 10:33:54 +00:00
Emanuele Conti
a617ce1813 used FuriString instead of string_t 2023-02-02 10:32:07 +00:00
MX
05641378d9
Fixed 2023-02-02 13:20:58 +03:00
MX
fbe7209817
Use FuriString instead of string_t 2023-02-02 13:16:00 +03:00
MX
c630e351fc
Merge branch 'dev' into mouse_jiggler_interval_selction_added 2023-02-02 12:56:43 +03:00
MX
26b5b7e406
Merge pull request #305 from teeebor/feature/solitaire-and-blackjack-flipper-score
Solitaire and Blackjack now affect Flipper's level
2023-02-02 12:55:00 +03:00
MX
16f8f2c2df
Merge branch 'fz-dev' into dev 2023-02-02 11:54:20 +03:00
hedger
fcd3799aee
Merge branch 'dev' into patch-custom-font 2023-01-31 15:05:53 +07:00
LTVA1
dfd46f5539 fix formatting 2023-01-30 15:11:32 +03:00
Michal Suchánek
d9be815889
Print card CID in storage info (#2227) 2023-01-30 16:14:30 +07:00
あく
bf2ab1f4d5
Merge branch 'dev' into patch-custom-font 2023-01-30 15:30:54 +07:00
Noam Drong
5db7fdf985
Add support for GUI-CTRL in bad_usb (#2315)
Co-authored-by: あく <alleteam@gmail.com>
2023-01-30 15:03:10 +07:00
Tibor Tálosi
cd29fb8568 solitaire and blackjack now affect flippers level 2023-01-29 20:08:42 +01:00
Skorpionm
e12958d408
[FL-3082] WS: add protocol LaCrosse-TX (TFA Dostmann) (#2292)
* WS:  add protocol LaCrosse-TX  (TFA Dostmann)
* WS: fix syntax
* WS: fix MSG_TYPE
* WS: fix PVS

Co-authored-by: あく <alleteam@gmail.com>
2023-01-29 18:08:26 +07:00
Emily Trau
24a23e5dc7
debug apps: made runnable as .faps; sdk: resolved additional APIs in use by faps (#2333)
* sdk: resolve additional APIs in use by faps
* debug tools: fixed battery_test, bt_debug, display_test, rpc_debug

Co-authored-by: hedger <hedger@nanode.su>
Co-authored-by: hedger <hedger@users.noreply.github.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-01-27 16:41:55 +07:00
Giacomo Ferretti
eee5c35400
NFC: add MIFARE MINI support (#2307)
* NFC: add MIFARE MINI support
* Move new value to end of enum
* nfc: added missing unit test

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-01-27 12:51:47 +07:00
Emanuele Conti
a5d92d7a08 Used array lenght to hide right arrow 2023-01-26 15:00:34 +00:00
Emanuele Conti
884a751ae7 Fixed max array size check 2023-01-26 14:55:15 +00:00
Emanuele Conti
411855ce81 Added movement interval in mouse_jiggler USB & BLE 2023-01-26 14:31:54 +00:00
LTVA1
f4cb458391 now change the name in ALL places 2023-01-25 08:52:51 +03:00
LTVA1
34ff250eea rename to canvas_set_custom_u8g2_font 2023-01-25 08:18:32 +03:00
Sergey Gavrilov
709fa633ff
ELF-loader: wait for notification to complete on app exit (#2335) 2023-01-25 12:15:01 +07:00
MX
898b29b921
Fix SubGHz GUI receiver bug
When keyboard is locked and popup appears it now shows bottom text correctly
2023-01-21 10:45:10 +03:00
MX
f3939a715a
Update Protoview
https://github.com/antirez/protoview
2023-01-20 07:11:00 +03:00
MX
3174d29dfa
Update protoview 2023-01-19 20:28:02 +03:00
MX
5853e0bdd9
Block usage of hopping with detect raw at same time
Enough, it will not be enabled back, do not ask for it, its efficiency is almost 0, if you didn’t know it looses signals and all that you can capture is a micro part of end of the signal

Detect raw also will be removed in a future (and replaced with more correct solution)
2023-01-19 16:27:07 +03:00
MX
59bcad0cfc
Remove protoview binaries 2023-01-19 01:19:21 +03:00
MX
c303b44f3f
Disable debug messages in protoview 2023-01-18 23:24:35 +03:00
MX
5a9da13d84
Update UniTemp and run fbt format 2023-01-18 22:25:39 +03:00
MX
0650178946
Fixed and improved WAV Player by LTVA1
https://github.com/LTVA1/wav_player
2023-01-18 21:17:53 +03:00
MX
6aad6840f6
Add protoview
https://github.com/antirez/protoview
2023-01-18 20:18:19 +03:00
MX
7aaecd9278
Add text viewer 2023-01-18 20:05:01 +03:00
MX
b52674607a
Add UART Terminal app
by cool4uma

https://github.com/cool4uma/UART_Terminal/tree/main
2023-01-18 19:55:46 +03:00
MX
adfac7affb
Update TOTP
https://github.com/akopachov/flipper-zero_authenticator
2023-01-18 19:52:33 +03:00
MX
7a211e0018
Update UniTemp
https://github.com/quen0n/unitemp-flipperzero/tree/dev
2023-01-18 19:51:10 +03:00
MX
fb39d6e679
Format code 2023-01-18 19:19:49 +03:00
MX
27826f95ca
Merge branch 'dev' into somfy_encoder_new 2023-01-18 19:01:22 +03:00
MX
959ea4d8c1
Merge branch 'dev' into batt-ui 2023-01-18 18:40:15 +03:00
MX
7f09f5f616
Merge pull request #273 from darmiel/feat/playlist
feat[infrared]: allow disabling automatic signal decoding
2023-01-18 18:29:30 +03:00
MX
dce2271330
Merge pull request #288 from Smileycathy1128/master
Oh boy 12AM!
2023-01-18 18:28:04 +03:00
MX
c708a301f5
Merge branch 'fz-dev' into dev 2023-01-18 18:26:49 +03:00
MX
927fcca081
Revert "Merge pull request #252 from X-Stuff/dev-advanced-config"
This reverts commit ed5b2da9ad.
2023-01-18 18:18:17 +03:00
MX
db16b3ef1d
Revert infrared hotfix 2023-01-18 18:15:30 +03:00
assasinfil
379807423f
Debug prints cleanup 2023-01-18 16:21:42 +03:00
assasinfil
8c94e3e78d
Remove bad folder 2023-01-18 15:15:02 +03:00
Cathy Nguyen
374452796c fix 00AM: Flipper may be Zero, but midnight isn't 2023-01-17 23:41:13 -05:00
hedger
a0814aab31
[FL-3081] fbt: removed DEBUG_TOOLS & FAP_EXAMPLES flags (#2291)
* fbt: deprecated DEBUG_TOOLS & FAP_EXAMPLES flags
* fixes for PVS warnings
* scripts: fbt: fixed leaking PYTHONHOME
2023-01-17 18:07:47 +03:00
assasinfil
414a13131a
Fix v2? 2023-01-17 13:41:41 +03:00
TQMatvey
f41c06ab74 somfy telis: not done yet
Co-authored-by: assasinfil <nfa57643@gmail.com>
2023-01-16 22:10:16 +07:00
assasinfil
ddc5540eeb
Clean 2023-01-16 15:50:45 +03:00
TQMatvey
729a1b5788 somfy_telis: encoder is almost done
Co-authored-by: assasinfil <nfa57643@gmail.com>
2023-01-16 19:41:16 +07:00
gid9798
073fb3861a
Add the ability to turn pages in infrared (#2271)
Co-authored-by: あく <alleteam@gmail.com>
2023-01-13 17:11:12 +03:00
Fasjeit
78139c5936 drawing own battery (Bar %) charging display 2023-01-12 11:35:42 +03:00
Nikolay Minaylov
ad9d746a27
BadUSB backspace/delete fix (#2288)
Co-authored-by: hedger <hedger@users.noreply.github.com>
2023-01-11 16:58:51 +03:00
Giacomo Ferretti
20621da8ac
Fix typos in source code (#2285)
* Fix typo in TextInput module

* Fix typo in Widget comment

* Fix typo in comment

Co-authored-by: hedger <hedger@users.noreply.github.com>
2023-01-11 16:41:57 +03:00
LTVA1
44830593c1 delete u8g2 dependency in example custom font 2023-01-11 12:15:08 +03:00
あく
8d2143add5
Fix various issues reported on github (#2280)
* Desktop: Fix use after free in slideshow view
* Gui: long press toggles first letter case too
* Desktop: remove debug logging
2023-01-10 03:15:03 +09:00
Fasjeit
4dc2a7f212 New battery display (Bar %) 2023-01-09 17:50:38 +03:00
LTVA1
3bac76f75e Merge branch 'patch-custom-font' of https://github.com/LTVA1/flipperzero-firmware-wPlugins into patch-custom-font 2023-01-08 20:13:09 +03:00
LTVA1
8488f4406e add example of custom font usage 2023-01-08 20:12:27 +03:00
Daniel
4ec5dbcee8
feat: allow disabling automatic signal decoding 2023-01-08 02:05:17 +01:00
LTVA1
74c46a515c
Merge branch 'dev' into patch-custom-font 2023-01-07 22:11:56 +03:00
MX
797ddc0755
Update Unitemp
and remove old temp sensor app, unitemp now supports all sensors from that app
2023-01-07 20:05:37 +03:00
MX
bc99538ca8
Update UniTemp
https://github.com/quen0n/unitemp-flipperzero
2023-01-07 18:42:38 +03:00
MX
c3b8d3cef4
Testing 2 repeats in infrared 2023-01-07 04:56:45 +03:00
MX
3fa11aa4a0
Update UniTemp
https://github.com/quen0n/unitemp-flipperzero/tree/dev
2023-01-07 02:08:15 +03:00
MX
ddf4f268ea
Update TOTP
https://github.com/akopachov/flipper-zero_authenticator
2023-01-07 02:07:26 +03:00
MX
a94c553c5a
Merge branch 'fz-dev' into dev 2023-01-07 01:59:20 +03:00
Maksim Derbasov
2c450bd835
Show region information in sub-GHz app (#2249)
* Show region info in sub-GHz app
* SubGhz: reset widget on region info scene exit
* Format sources

Co-authored-by: あく <alleteam@gmail.com>
2023-01-07 04:28:28 +09:00
LTVA1
1cdccbae23
formatting 2023-01-06 21:52:17 +03:00
LTVA1
109c34398f
custom font set function 2023-01-06 21:43:43 +03:00
yan0f
9740dd8c75
Fix typos in source code (#2258) 2023-01-07 01:06:50 +09:00
あく
41c43f4805
Various improvements: Toolbox, Updater and Unit Tests. (#2250)
* Toolbox: add seek to character stream method. UpdateUtils: reverse manifest iterator. UnitTests: more unit tests.
* Target: bump API version. Updater: delete empty folders from manifest before resource deployment.
* UnitTests: use manifest from unit_tests folder instead of global one
* Make PVS happy
* sector cache: allocate always
* Better PVS config for manifest.c
* PVS: Move exception outside of condition
* PVS: remove confusing condition

Co-authored-by: SG <who.just.the.doctor@gmail.com>
2023-01-06 16:31:17 +10:00
MX
7d4d2e19a9
Infrared: Fix not enough signal repeats in brute 2023-01-06 02:23:03 +03:00
MX
f7dfe77aaf
Apply source code formatting
./fbt format
2023-01-03 19:07:58 +03:00
MX
4571dd25a3
Merge branch 'dev' into dev-advanced-config 2023-01-03 18:48:33 +03:00
MX
28345b2fbd
Update TOTP
https://github.com/akopachov/flipper-zero_authenticator
2023-01-03 18:41:22 +03:00
MX
82f8ad4540
Add 350Mhz to default range
Actually this frequency is used by some part of home devices like ceiling fans
2023-01-03 18:40:03 +03:00
Dimitry
df88a805a0 Removing AM* preset if launching regular read mode 2023-01-02 23:54:04 +02:00
MX
ba429f6c88
Merge branch 'dev' into dev-advanced-config 2023-01-01 23:16:55 +03:00
MX
189117326b
Update UniTemp
https://github.com/quen0n/unitemp-flipperzero/tree/dev
2023-01-01 23:14:32 +03:00
MX
91c159e823
Update TOTP
https://github.com/akopachov/flipper-zero_authenticator
2022-12-31 14:42:24 +03:00
Tibor Tálosi
27cc057573 solitaire:
fixed card placement to not allow placing ♠3 on top row when there was no card there.
2022-12-31 11:47:23 +01:00
Dimitry
27bfe861d9 cc1101 modem configurable preset introduced.
Available to configure: datarate, bandwidth and manchester decoding flag

log ability added to unit_test app (it's very helpful when writing a unit_tests)
2022-12-31 02:10:21 +02:00
MX
a51a6914f4
Barcode Generator: Save last barcode 2022-12-31 02:51:50 +03:00
MX
00b4903576
Add Delete key to usb keyboard 2022-12-31 01:30:57 +03:00
MX
a35b536120
Fix arkanoid bug 2022-12-30 23:31:21 +03:00
MX
6b30dc5114
Update unitemp 2022-12-30 20:01:12 +03:00
MX
3821570d74
Merge pull request #249 from gid9798/fix_morse_code
Fixes for morse code plugin
2022-12-30 17:44:07 +03:00
MX
6eb6297ab7
Merge branch 'fz-dev' into dev 2022-12-30 16:34:20 +03:00
gid9798
ebac25a057 plugin morse code:
fixed memory leak
fixed noise after exiting the app
fixed displaying characters after a long input
2022-12-30 13:53:08 +03:00
Avery
06cf1bb868
Gui: change data ownership model in submenu, own text by default (#2217)
* GUI: Refactor submenu to internally use FuriStrings
* NFC: Rework DESFIRE dynamic info submenu
* GUI: don't mutate label when drawing submenu
* Get rid of submenu_add_item_cstr
* increase api version
* Get rid of submenu_set_header_cstr
* rollback api version
* Documentation
* RFID: use new submenu api

Co-authored-by: Sergey Gavrilov <who.just.the.doctor@gmail.com>
2022-12-30 12:44:07 +09:00
MX
e8e000d17b
Merge branch 'fz-dev' into dev 2022-12-29 18:08:51 +03:00
あく
b11b9f1b38
Gui: Direct Draw API (#2215)
* Furi: allow on-fly thread priority change. Gui: Direct Draw API. DirectDraw debug app.
* Gui: drop input in direct draw
* Furi: handle priority change for starting threads
* DirectDraw: rollback to FreeRTOS primitives for priority change
2022-12-29 21:35:26 +10:00
MX
4e3506ab2e
Show OTP flipper region on debug and about screens
but keep region zero for ble and usb hardware info report
2022-12-29 01:43:24 +03:00
MX
984528d366
Remove wrong scene state set 2022-12-29 00:34:27 +03:00
MX
66d31b3a0e
Merge branch 'fz-dev' into dev 2022-12-28 21:01:36 +03:00
Astra
d58b9f3fe8
Fix MFC bruteforce progress bar (#2203)
Co-authored-by: あく <alleteam@gmail.com>
2022-12-29 00:09:33 +09:00
Tiernan
90573fbeed
Picopass read bug fixes: (#2201)
* fix checking user elite keys
* include calculated Kd when saving cards

Co-authored-by: あく <alleteam@gmail.com>
2022-12-28 22:04:58 +09:00
MX
69879c3693
Merge pull request #243 from huuck/dev
Added ESCAPE key
2022-12-27 17:10:34 +03:00
MX
529a20b9d2
Add holtek HT12X in brute 2022-12-27 17:06:52 +03:00
Gabriel Cirlig
43be797926
Merge branch 'DarkFlippers:dev' into dev 2022-12-27 08:19:28 -05:00
huuck
4840196b88 addded escape key 2022-12-27 08:13:17 -05:00
MX
473f9c0e44
Merge branch 'fz-dev' into dev 2022-12-27 16:06:27 +03:00
Astra
ded7e727d0
[FL-3060] New MFC Bruteforce animation (#2190)
* Change the wording in the headers
* Add support for text in the progress bar
* New MFC key bruteforce screen
* Typo fix
* nfc: rename Flipper Dict to System Dict
* elements: fix types
* Display the correct key attack sector

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-12-27 18:14:03 +09:00
Nikolay Minaylov
08eb666f7b
[FL-3000] File browser: Empty folder label (#2188)
Co-authored-by: あく <alleteam@gmail.com>
2022-12-27 17:39:04 +09:00
Skorpionm
1390f10a6f
[FL-3068] SubGhz: add Holtek_ht12x protocol (#2187)
* SubGhz: add Holtek_ht12x protocol
* SubGhz: add unit_test holtek_ht12x
* SubGhz: correct string formatting

Co-authored-by: あく <alleteam@gmail.com>
2022-12-27 17:29:21 +09:00
Nikolay Minaylov
f43b76efc2
[FL-3021] USB/BLE HID Remote icon fix (#2179)
Co-authored-by: あく <alleteam@gmail.com>
2022-12-27 17:03:56 +09:00
MX
4f05c1816b
Update TOTP 2022-12-26 23:31:38 +03:00
MX
1243dad8fd
Fix POCSAG Pager UI bug
same as subghz and weather station bug with invisible element selected
2022-12-26 23:21:10 +03:00
MX
ac400abede
Update UniTemp 2022-12-26 23:15:10 +03:00
MX
a7fc43d1ac
Update wifi marauder 2022-12-26 23:12:45 +03:00
MX
aecdb8fdcd
Merge branch 'fz-dev' into dev 2022-12-26 23:02:31 +03:00
Sergey Gavrilov
9192520c70
Modules: locking view model (#2189)
* Popup, dialog_ex: locking model
* Desktop: do not use the model where it is not needed

Co-authored-by: あく <alleteam@gmail.com>
2022-12-27 04:46:05 +09:00
MX
6d368c3e3a
Merge branch 'fz-dev' into dev 2022-12-26 22:42:21 +03:00
Georgii Surkov
8582670a34
[FL-2811] Fix PVS-Studio warnings (#2142)
Co-authored-by: あく <alleteam@gmail.com>
Co-authored-by: gornekich <n.gorbadey@gmail.com>
2022-12-26 21:13:30 +09:00
MX
749a2f5977
Merge pull request #233 from eugene-kirzhanov/dev
Add 2048 game
2022-12-25 01:53:02 +03:00
MX
1481036abe
Merge pull request #234 from gid9798/barcode_ean13
add EAN-13 support
2022-12-25 01:33:40 +03:00
Sergey Gavrilov
c2cb14834d
[FL-3062] Fix unit tests (#2180)
* SubGHZ unit test: fail if async_tx is not started
* Memgr unit test: fix for multithreaded enviroment
* Unit tests: fix failed_tests count
* Unit tests: remove debug code
* Double update test: increase flipper detection time

Co-authored-by: あく <alleteam@gmail.com>
2022-12-24 23:13:21 +09:00
MX
02369c8394
Merge branch 'fz-dev' into dev 2022-12-24 02:25:58 +03:00
あく
b0970953b9
[FL-3067] WeatherStation: fix incorrect history index increment (#2186) 2022-12-23 22:46:35 +09:00
gid9798
4d9ecbacae Barcode generator: add EAN-13 support 2022-12-23 12:25:20 +03:00
Skorpionm
566e80abf6
[FL-3063] SubGhz: fix start navigation (#2183) 2022-12-23 17:31:14 +09:00
Eugene Kirzhanov
a8541d5191 Games: Add 2048 game 2022-12-22 21:36:50 +03:00
MX
0bfaaa0fe1
SubGHz: Add manually +2 new remotes
Allow manual creation of Nice Flor S, Nice Smilo
2022-12-21 15:11:12 +03:00
MX
488211b4d7
Update Unitemp
https://github.com/quen0n/unitemp-flipperzero/tree/dev
2022-12-21 14:23:26 +03:00
MX
09f80d0086
fbt format 2022-12-21 13:00:27 +03:00
MX
aba70c33f1
Merge branch 'dev' into t5577 2022-12-21 12:35:43 +03:00
MX
f3553deb16
Merge branch 'fz-dev' into dev 2022-12-21 12:32:21 +03:00
あく
5856746fc9
iButton: fixed notification on successful read (#2169) 2022-12-21 12:07:14 +03:00
TQMatvey
6d8ecec051 lfrfid: clear_t5577: major code cleanup 2022-12-21 15:00:52 +07:00
TQMatvey
060a48cdfc lfrfid: clear_t5577: move icon and text lower 2022-12-21 12:21:17 +07:00
TQMatvey
91eed4209d lfrfid: clear_t5577: change notification color and cleanup 2022-12-21 12:11:58 +07:00
TQMatvey
787eafd7b8 lfrfid: clear_t5577: code cleanup, add notifications
Co-authored-by: grvpvl <Tobirg@users.noreply.github.com>
2022-12-21 11:34:54 +07:00
TQMatvey
10b55bcbd2 lfrfid: t5577_clear: remove unneeded comment 2022-12-21 07:09:39 +07:00
TQMatvey
19e230823b lfrdfid: t5577_clear: make animation smoother 2022-12-21 07:07:07 +07:00
TQMatvey
d1418bf7f6
Merge branch 'DarkFlippers:dev' into dev 2022-12-21 06:44:25 +07:00
Nikolay Minaylov
e0d716647c
[FL-3053] Archive browser delete fix (#2163) 2022-12-20 23:46:05 +09:00
Kowalski Dragon
a9c2b4d6a0
Desktop: dummy mode improvements. Fixes: correct scrolling text, correct AM/PM in Clock. (#2160)
* Show passport instead of app if SD/app is missing 
* Desktop: cleanup dummy mode code and add more apps
* Gui: fix incorrect trimming in scrollable text

Signed-off-by: Kowalski Dragon (kowalski7cc) <kowalski7cc@users.noreply.github.com>
Co-authored-by: あく <alleteam@gmail.com>
2022-12-20 22:57:58 +09:00
MX
7e049d185f
Merge branch 'fz-dev' into dev 2022-12-20 16:19:43 +03:00
TQMatvey
376fa071a1
Merge branch 'DarkFlippers:dev' into dev 2022-12-20 19:46:58 +07:00
TQMatvey
c7de198d1a lfrfid: Add scene to clean T5577 Passwords
Co-authored-by: grvpvl <Tobirg@users.noreply.github.com>
2022-12-20 19:40:25 +07:00
gornekich
4cee550cc6
[FL-2809] Rework BLE key storage (#2154)
* bt: disconnect first on profile change
* bt keys: rework bt keys
* saved struct: add payload size getter to API
* bt: rework bt with new key storage API
* bt: add keys storage operation to bt API
* hid: save bt keys on sd card
* bt: add unit tests for key storage
* bt: working profile switch
* bt: cleanup
* bt hid: change keys storage path

Co-authored-by: あく <alleteam@gmail.com>
2022-12-20 21:32:24 +09:00
あく
e7107e39f7
Gui: scrollable long file names in FileBrowser and Archive Browser (#2159)
* Gui: scrollable long file names in FileBrowser
* Archive: scroll long file names
* Gui: elements code cleanup
2022-12-20 20:11:52 +09:00
Kowalski Dragon
2bdc34274f
Clock v1 (#1750) 2022-12-20 06:43:32 +09:00
MX
842ba616ee
Merge branch 'fz-dev' into dev 2022-12-19 23:34:35 +03:00
MX
9e2c3eb96d
Testing marauder +5 volt 2022-12-19 23:33:11 +03:00
Astra
fa87216a1e
[FL-2970] Untangle NFC_APP_FOLDER from nfc_device (#2124)
* Untangle NFC_APP_FOLDER from nfc_device
* Make the folder an internal part of the nfc device struct
* Move the NFC folder definition to the nfc allocator
* Move the NFC folder definition to the allocator in the nfc magic FAP
* Replace furi_string_printf with furi_string_set for folder allocation and handle the cases when folder has no slashes
* Build and allocation fixes

Co-authored-by: あく <alleteam@gmail.com>
2022-12-20 04:57:48 +09:00
MX
921b47ac50
Merge branch 'fz-dev' into dev 2022-12-19 22:24:52 +03:00
Skorpionm
a81a5ca57c
[FL-3052] WS: add choice fahrenheit/celsius (#2149)
* WS: add choice fahrenheit/celsius
* WS: fix syntax

Co-authored-by: あく <alleteam@gmail.com>
2022-12-20 04:22:57 +09:00
MX
577334a394
Fix sound issues in multiple apps 2022-12-19 21:55:06 +03:00
MX
d5624cd842
Merge branch 'dev' into unitemp 2022-12-19 20:24:14 +03:00
MX
ca72a4f225
Drop AM2320 and DHT Monitor plugins 2022-12-19 20:21:40 +03:00
Victor
453666192c DHT monitor remove 2022-12-19 20:16:33 +03:00
Victor
cbc9720738 New plugin: Unitemp 2022-12-19 20:16:02 +03:00
MX
cefff35661
Move submenu_set_selected_item 2022-12-19 20:07:07 +03:00
MX
8a09ac2569
Update SubGhz Bruteforcer 2022-12-19 18:45:27 +03:00
MX
94e7bb7fe3
Add mouse jiggler to USB Keyboard&Mouse App 2022-12-19 17:56:13 +03:00
MX
da32d252db
Clock - use system locale settings 2022-12-19 17:54:59 +03:00
MX
084cdc6ad0
Merge branch 'fz-dev' into dev 2022-12-19 16:57:00 +03:00
あく
94453d9100
[FL-3046] Notification: fix recursive speaker acquire #2147 2022-12-19 20:57:44 +09:00
Nikolay Minaylov
f10e82c64d
[FL-3024] Locale settings (#2137)
* Locale settings
* Time/date format fix
* Locale: add docs, enums for HAL, cleanup.

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-12-19 18:38:20 +09:00
MX
0238da8ac9
Update SubGHz Bruteforcer 2022-12-19 00:53:08 +03:00
MX
96a97f1bfb
Merge branch 'fz-dev' into dev 2022-12-17 07:25:49 +03:00
Skorpionm
2dea6969fe
[FL-3040] Audio support for SubGhz (#2131)
* Furi_hal_speaker: multiple resource usage
* Furi_hal_speaker: fix multiple resource usage
* Furi_hal_speaker: fix music_player_worker
* Furi_hal_speaker: fix mutex release queue handling
* SubGhz: add furi_hal_subghz_set_debug_pin
* SubGhz: add sound SubGhz Read, SubGhz Read RAW
* furi_hal_speaker: add __attribute__((warn_unused_result)) for furi_hal_speaker_acquire()
* Furi_hal_speaker: fix review comments
* SubGhz: cleanup naming and locking timings
* SubGhz,FuriHal: fix speaker deinit logic and subghz speaker release sequence
* FuriHal: crash on speaker acquire/release from IRQ
* Furi, FuriHal: FURI_WARN_UNUSED and documentation update
* Bump api symbols version: fix broken speaker

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-12-17 07:20:10 +09:00
MX
a0488624b5
Merge branch 'dev' into scene_set_faac 2022-12-16 01:31:26 +03:00
MX
021ba9dc1a
Merge branch 'fz-dev' into dev 2022-12-16 00:16:47 +03:00
Skorpionm
b5e7bb3334
[FL-3043] SubGhz: add SMC5326, UNILARM protocol (#2138)
* SubGhz: add SMC5326 protocol
* SubGhz: add unit_test smc5326 protocol

Co-authored-by: あく <alleteam@gmail.com>
2022-12-16 05:25:43 +09:00
gid9798
f43fd7a351 Removing duplicate code in subghz scnes. 2022-12-15 17:31:54 +03:00
MX
03153b4d02
Merge branch 'fz-dev' into dev 2022-12-14 16:54:13 +03:00
Skorpionm
327df4a813
[FL-3034] WS: fix protocol and add new (#2116)
* WS: fix Nexus-TH potocol
* WS: add Oregon_v1 protocol
* WS: add AmbientWeather-TX8300   protocol

Co-authored-by: あく <alleteam@gmail.com>
2022-12-14 17:27:55 +09:00
usiegl00
1c12613863
Prevent hacking related backgrounds from being displayed in dummy mode. (#2107)
* Prevent hacking related backgrounds from being displayed in dummy mode.
* Add function call to animation manager to set dummy mode.
* Reboot retains dummy mode background.

Co-authored-by: あく <alleteam@gmail.com>
2022-12-12 21:46:41 +09:00
Kassim
d541f142c8
Add Mouse Jiggler to HID Remote (#2113)
* feat: add Mouse Jiggler to HID Remote
* move processing to use furi_timer instead of draw loop
* HidApp: refine mouse jiggler, move timer work into enter/exit callbacks

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-12-12 18:47:22 +09:00
MX
87fb852bcf
Weather Station: Fix display of temps lower than -9 (#2120)
Co-authored-by: あく <alleteam@gmail.com>
2022-12-12 04:29:58 +09:00
MX
76e8b00dc8
WS: Fix displaying temps lower than -9 2022-12-11 03:04:12 +03:00
MX
bb3dd48447
Merge branch 'fz-dev' into dev 2022-12-11 00:44:27 +03:00
MX
17ea9315e0
Fix incompatibility with OFW in subghz part + improve speed
SubGHz app launch times improved, also setting_user file no longer added by firmware, this update will remove this file, be sure to backup!
Now this file is actually should be created by user and will be not removed every update!
2022-12-11 00:42:26 +03:00
MX
63b40992ef
Fix naming was different from OFW 2022-12-11 00:09:38 +03:00
Georgii Surkov
2954ec6d97
[FL-3025] IR button overflow fix (#2115)
* Allow for more than 255 button_menu items
* Allow more than 255 items in submenu
* Fix button_menu_reset

Co-authored-by: あく <alleteam@gmail.com>
2022-12-11 03:05:52 +09:00
MX
31a9a3f5f3
SubGHz: Improve signal text visibility in history (#2111)
Co-authored-by: あく <alleteam@gmail.com>
2022-12-11 02:31:07 +09:00
MX
2fcff37f88
Add POCSAG Receiver plugin 2022-12-10 20:08:17 +03:00
MX
35a4eef3fc
Merge branch 'fz-dev' into dev 2022-12-10 19:30:20 +03:00
MX
01e24f6837
WS: Show received signal age (#2087)
* Feat: Show received signal age: by @LY2NEO with some fixes from me
* WS: Signal age display GUI fixes and improvements
* WeatherStation: refactor variable names
* WS: GUI fixes and improvements: add icons by @Karator and apply UI changes
* Weather Station: proper event flow for view redraw.

Co-authored-by: あく <alleteam@gmail.com>
2022-12-11 00:30:03 +09:00