SubGhz: bugfix 0.60.0 (#1317)
* SubGhz: fix adding one when renaming a file * SubGhz: fix wrong folder after unsave * SubGhz: fix syntax * Github: update codeowners * Github: fix path selector in codeowners for docker-compose * Github: add lib owners Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
		
							parent
							
								
									fb4d4011f4
								
							
						
					
					
						commit
						adffe20bcb
					
				
							
								
								
									
										132
									
								
								.github/CODEOWNERS
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										132
									
								
								.github/CODEOWNERS
									
									
									
									
										vendored
									
									
								
							| @ -1,63 +1,91 @@ | |||||||
| # Who owns all the fish by default | # Who owns all the fish by default | ||||||
|  | * @skotopes @DrZlo13 @hedger | ||||||
| 
 | 
 | ||||||
| * @skotopes @DrZlo13 | # Apps | ||||||
|  | /applications/about/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/accessor/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/archive/ @skotopes @DrZlo13 @hedger @nminaylov | ||||||
|  | /applications/bad_usb/ @skotopes @DrZlo13 @hedger @nminaylov | ||||||
|  | /applications/bt/ @skotopes @DrZlo13 @hedger @gornekich | ||||||
|  | /applications/cli/ @skotopes @DrZlo13 @hedger @nminaylov | ||||||
|  | /applications/crypto/ @skotopes @DrZlo13 @hedger @nminaylov | ||||||
|  | /applications/debug_tools/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/desktop/ @skotopes @DrZlo13 @hedger @nminaylov | ||||||
|  | /applications/dialogs/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/dolphin/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/gpio/ @skotopes @DrZlo13 @hedger @nminaylov | ||||||
|  | /applications/gui/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/ibutton/ @skotopes @DrZlo13 @hedger @gsurkov | ||||||
|  | /applications/infrared/ @skotopes @DrZlo13 @hedger @gsurkov | ||||||
|  | /applications/infrared_monitor/ @skotopes @DrZlo13 @hedger @gsurkov | ||||||
|  | /applications/input/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/lfrfid/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/lfrfid_debug/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/loader/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/music_player/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/nfc/ @skotopes @DrZlo13 @hedger @gornekich | ||||||
|  | /applications/notification/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/power/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/rpc/ @skotopes @DrZlo13 @hedger @nminaylov | ||||||
|  | /applications/snake_game/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/storage/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/storage_settings/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/subghz/ @skotopes @DrZlo13 @hedger @Skorpionm | ||||||
|  | /applications/system/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/u2f/ @skotopes @DrZlo13 @hedger @nminaylov | ||||||
|  | /applications/unit_tests/ @skotopes @DrZlo13 @hedger | ||||||
|  | /applications/updater/ @skotopes @DrZlo13 @hedger | ||||||
| 
 | 
 | ||||||
| # Applications | # Assets | ||||||
| applications/** @skotopes @DrZlo13 | /assets/ @skotopes @DrZlo13 @hedger | ||||||
| applications/accessor/** @skotopes @DrZlo13 |  | ||||||
| applications/loader/** @skotopes @DrZlo13 @gornekich |  | ||||||
| applications/bt/** @skotopes @DrZlo13 |  | ||||||
| applications/cli/** @skotopes @DrZlo13 |  | ||||||
| applications/dolphin/** @skotopes @DrZlo13 |  | ||||||
| applications/gpio-tester/** @skotopes @DrZlo13 |  | ||||||
| applications/gui/** @skotopes @DrZlo13 |  | ||||||
| applications/gui-test/** @skotopes @DrZlo13 |  | ||||||
| applications/ibutton/** @skotopes @DrZlo13 |  | ||||||
| applications/input/** @skotopes @DrZlo13 |  | ||||||
| applications/infrared/** @skotopes @DrZlo13 |  | ||||||
| applications/lf-rfid/** @skotopes @DrZlo13 |  | ||||||
| applications/menu/** @skotopes @DrZlo13 |  | ||||||
| applications/music-player/** @skotopes @DrZlo13 |  | ||||||
| applications/nfc/** @skotopes @DrZlo13 @gornekich |  | ||||||
| applications/power/** @skotopes @DrZlo13 |  | ||||||
| applications/sd-card-test/** @skotopes @DrZlo13 |  | ||||||
| applications/sd-filesystem/** @skotopes @DrZlo13 |  | ||||||
| applications/subghz/** @skotopes @DrZlo13 |  | ||||||
| applications/template/** @skotopes @DrZlo13 |  | ||||||
| applications/tests/** @skotopes @DrZlo13 |  | ||||||
| applications/updater/** @skotopes @DrZlo13 @hedger |  | ||||||
| 
 | 
 | ||||||
| # Assets and asset generator | # Furi Core | ||||||
| assets/** @skotopes @DrZlo13 | /core/ @skotopes @DrZlo13 @hedger | ||||||
| 
 | 
 | ||||||
| # Bootloader | # Debug tools and plugins | ||||||
| bootloader/** @skotopes @DrZlo13 | /debug/ @skotopes @DrZlo13 @hedger | ||||||
| 
 | 
 | ||||||
| # Core, HAL and applocation loader | # Docker | ||||||
| core/** @skotopes @DrZlo13 | /docker/ @skotopes @DrZlo13 @hedger @aprosvetova | ||||||
|  | /docker-compose.yml @skotopes @DrZlo13 @hedger @aprosvetova | ||||||
| 
 | 
 | ||||||
| # Debug tools | # Documentation | ||||||
| debug/** @skotopes @DrZlo13 | /documentation/ @skotopes @DrZlo13 @hedger @aprosvetova | ||||||
| 
 | 
 | ||||||
| # Firmware | # Firmware targets | ||||||
| firmware/** @skotopes @DrZlo13 | /firmware/ @skotopes @DrZlo13 @hedger | ||||||
| 
 | 
 | ||||||
| # Lib | # Lib | ||||||
| lib/app-template/** @skotopes @DrZlo13 | /lib/FreeRTOS-Kernel/ @skotopes @DrZlo13 @hedger | ||||||
| lib/callback-connector/** @skotopes @DrZlo13 | /lib/FreeRTOS-glue/ @skotopes @DrZlo13 @hedger | ||||||
| lib/common-api/** @skotopes @DrZlo13 | /lib/ST25RFAL002/ @skotopes @DrZlo13 @hedger @gornekich | ||||||
| lib/cyfral/** @skotopes @DrZlo13 | /lib/STM32CubeWB/ @skotopes @DrZlo13 @hedger @gornekich | ||||||
| lib/drivers/** @skotopes @DrZlo13 @gornekich | /lib/app-scened-template/ @skotopes @DrZlo13 @hedger | ||||||
| lib/fatfs/** @skotopes @DrZlo13 | /lib/callback-connector/ @skotopes @DrZlo13 @hedger | ||||||
| lib/fnv1a-hash/** @skotopes @DrZlo13 | /lib/digital_signal/ @skotopes @DrZlo13 @hedger @gornekich | ||||||
| lib/littlefs/** @skotopes @DrZlo13 | /lib/drivers/ @skotopes @DrZlo13 @hedger | ||||||
| lib/mlib/** @skotopes @DrZlo13 | /lib/fatfs/ @skotopes @DrZlo13 @hedger | ||||||
| lib/onewire/** @skotopes @DrZlo13 | /lib/flipper_format/ @skotopes @DrZlo13 @hedger | ||||||
| lib/qrcode/** @skotopes @DrZlo13 | /lib/fnv1a-hash/ @skotopes @DrZlo13 @hedger | ||||||
| lib/ST25RFAL002/** @skotopes @DrZlo13 @gornekich | /lib/heatshrink/ @skotopes @DrZlo13 @hedger | ||||||
| lib/STM32CubeWB/** @skotopes @DrZlo13 | /lib/infrared/ @skotopes @DrZlo13 @hedger @gsurkov | ||||||
| lib/u8g2/** @skotopes @DrZlo13 | /lib/libusb_stm32/ @skotopes @DrZlo13 @hedger @nminaylov | ||||||
| lib/version/** @skotopes @DrZlo13 | /lib/littlefs/ @skotopes @DrZlo13 @hedger | ||||||
|  | /lib/lfs_config.h @skotopes @DrZlo13 @hedger | ||||||
|  | /lib/micro-ecc/ @skotopes @DrZlo13 @hedger @nminaylov | ||||||
|  | /lib/microtar/ @skotopes @DrZlo13 @hedger | ||||||
|  | /lib/mlib/ @skotopes @DrZlo13 @hedger | ||||||
|  | /lib/nanopb/ @skotopes @DrZlo13 @hedger | ||||||
|  | /lib/nfc_protocols/ @skotopes @DrZlo13 @hedger @gornekich | ||||||
|  | /lib/one_wire/ @skotopes @DrZlo13 @hedger | ||||||
|  | /lib/qrcode/ @skotopes @DrZlo13 @hedger | ||||||
|  | /lib/subghz/ @skotopes @DrZlo13 @hedger @Skorpionm | ||||||
|  | /lib/toolbox/ @skotopes @DrZlo13 @hedger | ||||||
|  | /lib/u8g2/ @skotopes @DrZlo13 @hedger | ||||||
|  | /lib/update_util/ @skotopes @DrZlo13 @hedger | ||||||
| 
 | 
 | ||||||
| # Make | # Make tools | ||||||
| make/** @skotopes @DrZlo13 | /make/ @skotopes @DrZlo13 @hedger @aprosvetova | ||||||
|  | 
 | ||||||
|  | # Helper scripts | ||||||
|  | /scripts/ @skotopes @DrZlo13 @hedger | ||||||
|  | |||||||
| @ -200,8 +200,6 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) { | |||||||
|                 } |                 } | ||||||
|                 if((subghz->txrx->txrx_state == SubGhzTxRxStateIDLE) || |                 if((subghz->txrx->txrx_state == SubGhzTxRxStateIDLE) || | ||||||
|                    (subghz->txrx->txrx_state == SubGhzTxRxStateSleep)) { |                    (subghz->txrx->txrx_state == SubGhzTxRxStateSleep)) { | ||||||
|                     //ToDo FIX
 |  | ||||||
| 
 |  | ||||||
|                     if(!subghz_tx_start(subghz, subghz->txrx->fff_data)) { |                     if(!subghz_tx_start(subghz, subghz->txrx->fff_data)) { | ||||||
|                         scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowOnlyRx); |                         scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowOnlyRx); | ||||||
|                     } else { |                     } else { | ||||||
|  | |||||||
| @ -39,12 +39,12 @@ void subghz_scene_save_name_on_enter(void* context) { | |||||||
|         path_extract_filename(subghz->file_path, file_name, true); |         path_extract_filename(subghz->file_path, file_name, true); | ||||||
|         if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) != |         if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) != | ||||||
|            SubGhzCustomEventManagerNoSet) { |            SubGhzCustomEventManagerNoSet) { | ||||||
|             subghz_get_next_name_file(subghz, SUBGHZ_MAX_LEN_NAME); |  | ||||||
|             path_extract_filename(subghz->file_path, file_name, true); |  | ||||||
|             if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) == |             if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) == | ||||||
|                SubGhzCustomEventManagerSetRAW) { |                SubGhzCustomEventManagerSetRAW) { | ||||||
|                 dev_name_empty = true; |                 dev_name_empty = true; | ||||||
|  |                 subghz_get_next_name_file(subghz, SUBGHZ_MAX_LEN_NAME); | ||||||
|             } |             } | ||||||
|  |             path_extract_filename(subghz->file_path, file_name, true); | ||||||
|         } |         } | ||||||
|         string_set(subghz->file_path, dir_name); |         string_set(subghz->file_path, dir_name); | ||||||
|     } |     } | ||||||
| @ -72,7 +72,11 @@ void subghz_scene_save_name_on_enter(void* context) { | |||||||
| bool subghz_scene_save_name_on_event(void* context, SceneManagerEvent event) { | bool subghz_scene_save_name_on_event(void* context, SceneManagerEvent event) { | ||||||
|     SubGhz* subghz = context; |     SubGhz* subghz = context; | ||||||
|     if(event.type == SceneManagerEventTypeBack) { |     if(event.type == SceneManagerEventTypeBack) { | ||||||
|  |         if(!strcmp(subghz->file_name_tmp, "") || | ||||||
|  |            scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) != | ||||||
|  |                SubGhzCustomEventManagerNoSet) { | ||||||
|             string_set(subghz->file_path, subghz->file_path_tmp); |             string_set(subghz->file_path, subghz->file_path_tmp); | ||||||
|  |         } | ||||||
|         scene_manager_previous_scene(subghz->scene_manager); |         scene_manager_previous_scene(subghz->scene_manager); | ||||||
|         return true; |         return true; | ||||||
|     } else if(event.type == SceneManagerEventTypeCustom) { |     } else if(event.type == SceneManagerEventTypeCustom) { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Skorpionm
						Skorpionm