renamed scene__defaultKeys to scene__default
This commit is contained in:
		
							parent
							
								
									4488b1e589
								
							
						
					
					
						commit
						f0374fde99
					
				
					 7 changed files with 6 additions and 6 deletions
				
			
		|  | @ -4,7 +4,7 @@ | ||||||
| #include "applicationInternal/gui/guiMemoryOptimizer.h" | #include "applicationInternal/gui/guiMemoryOptimizer.h" | ||||||
| // for changing to scene Selection gui
 | // for changing to scene Selection gui
 | ||||||
| #include "applicationInternal/commandHandler.h" | #include "applicationInternal/commandHandler.h" | ||||||
| #include "scenes/scene__defaultKeys.h" | #include "scenes/scene__default.h" | ||||||
| 
 | 
 | ||||||
| lv_color_t color_primary = lv_color_hex(0x303030); // gray
 | lv_color_t color_primary = lv_color_hex(0x303030); // gray
 | ||||||
| lv_obj_t* MemoryUsageLabel = NULL; | lv_obj_t* MemoryUsageLabel = NULL; | ||||||
|  |  | ||||||
|  | @ -6,7 +6,7 @@ | ||||||
| #include "guiRegistry.h" | #include "guiRegistry.h" | ||||||
| #include "applicationInternal/gui/guiBase.h" | #include "applicationInternal/gui/guiBase.h" | ||||||
| #include "applicationInternal/hardware/hardwarePresenter.h" | #include "applicationInternal/hardware/hardwarePresenter.h" | ||||||
| #include "scenes/scene__defaultKeys.h" | #include "scenes/scene__default.h" | ||||||
| 
 | 
 | ||||||
| // ------------------------------------------------------------------------------------
 | // ------------------------------------------------------------------------------------
 | ||||||
| // this is a map of the registered_guis that can be accessed by name
 | // this is a map of the registered_guis that can be accessed by name
 | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| #include "applicationInternal/scenes/sceneRegistry.h" | #include "applicationInternal/scenes/sceneRegistry.h" | ||||||
| #include "applicationInternal/hardware/hardwarePresenter.h" | #include "applicationInternal/hardware/hardwarePresenter.h" | ||||||
| #include "applicationInternal/commandHandler.h" | #include "applicationInternal/commandHandler.h" | ||||||
| #include "scenes/scene__defaultKeys.h" | #include "scenes/scene__default.h" | ||||||
| 
 | 
 | ||||||
| void handleScene(uint16_t command, commandData commandData, std::string additionalPayload = "") { | void handleScene(uint16_t command, commandData commandData, std::string additionalPayload = "") { | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| #include "applicationInternal/scenes/sceneRegistry.h" | #include "applicationInternal/scenes/sceneRegistry.h" | ||||||
| #include "applicationInternal/hardware/hardwarePresenter.h" | #include "applicationInternal/hardware/hardwarePresenter.h" | ||||||
| // scenes
 | // scenes
 | ||||||
| #include "scenes/scene__defaultKeys.h" | #include "scenes/scene__default.h" | ||||||
| 
 | 
 | ||||||
| // If useSceneGUIlist == true, then a scene is active and we are not in the main_gui_list (with the scene selector as first gui).
 | // If useSceneGUIlist == true, then a scene is active and we are not in the main_gui_list (with the scene selector as first gui).
 | ||||||
| //   In that case, we try to use the scene specific gui list, if the scene defined one.
 | //   In that case, we try to use the scene specific gui list, if the scene defined one.
 | ||||||
|  |  | ||||||
|  | @ -25,7 +25,7 @@ | ||||||
| #include "applicationInternal/keys.h" | #include "applicationInternal/keys.h" | ||||||
| #include "applicationInternal/gui/guiStatusUpdate.h" | #include "applicationInternal/gui/guiStatusUpdate.h" | ||||||
| // register scenes
 | // register scenes
 | ||||||
| #include "scenes/scene__defaultKeys.h" | #include "scenes/scene__default.h" | ||||||
| #include "scenes/scene_allOff.h" | #include "scenes/scene_allOff.h" | ||||||
| #include "scenes/scene_TV.h" | #include "scenes/scene_TV.h" | ||||||
| #include "scenes/scene_fireTV.h" | #include "scenes/scene_fireTV.h" | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ | ||||||
| // devices
 | // devices
 | ||||||
| #include "devices/AVreceiver/device_yamahaAmp/device_yamahaAmp.h" | #include "devices/AVreceiver/device_yamahaAmp/device_yamahaAmp.h" | ||||||
| // scenes
 | // scenes
 | ||||||
| #include "scene__defaultKeys.h" | #include "scene__default.h" | ||||||
| #include "scenes/scene_allOff.h" | #include "scenes/scene_allOff.h" | ||||||
| #include "scenes/scene_TV.h" | #include "scenes/scene_TV.h" | ||||||
| #include "scenes/scene_fireTV.h" | #include "scenes/scene_fireTV.h" | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue