mirror of
				https://github.com/hyperion-project/hyperion.ng.git
				synced 2025-03-01 10:33:28 +00:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into ftdi_basic
This commit is contained in:
		| @@ -72,41 +72,28 @@ | ||||
|       "propertyOrder": 7 | ||||
|     }, | ||||
|     "panelOrderTopDown": { | ||||
|       "type": "integer", | ||||
|       "type": "string", | ||||
|       "title": "edt_dev_spec_order_top_down_title", | ||||
|       "enum": [ 0, 1 ], | ||||
|       "default": 0, | ||||
|       "enum": [ "top2down", "bottom2up" ], | ||||
|       "default": "top2down", | ||||
|       "required": true, | ||||
|       "options": { | ||||
|         "enum_titles": [ "edt_conf_enum_top_down", "edt_conf_enum_bottom_up" ] | ||||
|       }, | ||||
|       "minimum": 0, | ||||
|       "maximum": 1, | ||||
|       "access": "advanced", | ||||
|       "propertyOrder": 8 | ||||
|     }, | ||||
|     "panelOrderLeftRight": { | ||||
|       "type": "integer", | ||||
|       "type": "string", | ||||
|       "title": "edt_dev_spec_order_left_right_title", | ||||
|       "enum": [ 0, 1 ], | ||||
|       "default": 0, | ||||
|       "enum": [ "left2right", "right2left" ], | ||||
|       "default": "left2right", | ||||
|       "required": true, | ||||
|       "options": { | ||||
|         "enum_titles": [ "edt_conf_enum_left_right", "edt_conf_enum_right_left" ] | ||||
|       }, | ||||
|       "minimum": 0, | ||||
|       "maximum": 1, | ||||
|       "access": "advanced", | ||||
|       "propertyOrder": 9 | ||||
|     }, | ||||
|     "panelStartPos": { | ||||
|       "type": "integer", | ||||
|       "title": "edt_dev_spec_panel_start_position", | ||||
|       "step": 1, | ||||
|       "minimum": 0, | ||||
|       "default": 0, | ||||
|       "access": "advanced", | ||||
|       "propertyOrder": 10 | ||||
|     } | ||||
|   }, | ||||
|   "additionalProperties": true | ||||
|   | ||||
| @@ -35,26 +35,45 @@ | ||||
|       }, | ||||
|       "propertyOrder": 4 | ||||
|     }, | ||||
|     "useAPIv2": { | ||||
|       "type": "boolean", | ||||
|       "format": "checkbox", | ||||
|       "title": "edt_dev_spec_useAPIv2_title", | ||||
|       "default": false, | ||||
|       "options": { | ||||
|         "hidden": true | ||||
|       }, | ||||
|       "access": "expert", | ||||
|       "propertyOrder": 5 | ||||
|     }, | ||||
|     "useEntertainmentAPI": { | ||||
|       "type": "boolean", | ||||
|       "format": "checkbox", | ||||
|       "title": "edt_dev_spec_useEntertainmentAPI_title", | ||||
|       "default": true, | ||||
|       "propertyOrder": 5 | ||||
|       "options": { | ||||
|         "hidden": true | ||||
|       }, | ||||
|       "propertyOrder": 6 | ||||
|     }, | ||||
|     "switchOffOnBlack": { | ||||
|       "type": "boolean", | ||||
|       "format": "checkbox", | ||||
|       "title": "edt_dev_spec_switchOffOnBlack_title", | ||||
|       "default": false, | ||||
|       "propertyOrder": 6 | ||||
|       "options": { | ||||
|         "dependencies": { | ||||
|           "useAPIv2": false | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 7 | ||||
|     }, | ||||
|     "restoreOriginalState": { | ||||
|       "type": "boolean", | ||||
|       "format": "checkbox", | ||||
|       "title": "edt_dev_spec_restoreOriginalState_title", | ||||
|       "default": false, | ||||
|       "propertyOrder": 7 | ||||
|       "propertyOrder": 8 | ||||
|     }, | ||||
|     "blackLevel": { | ||||
|       "type": "number", | ||||
| @@ -64,7 +83,12 @@ | ||||
|       "step": 0.01, | ||||
|       "minimum": 0.001, | ||||
|       "maximum": 1.0, | ||||
|       "propertyOrder": 8 | ||||
|       "options": { | ||||
|         "dependencies": { | ||||
|           "useAPIv2": false | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 9 | ||||
|     }, | ||||
|     "onBlackTimeToPowerOff": { | ||||
|       "type": "integer", | ||||
| @@ -76,7 +100,12 @@ | ||||
|       "maximum": 100000, | ||||
|       "default": 600, | ||||
|       "required": true, | ||||
|       "propertyOrder": 9 | ||||
|       "options": { | ||||
|         "dependencies": { | ||||
|           "useAPIv2": false | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 10 | ||||
|     }, | ||||
|     "onBlackTimeToPowerOn": { | ||||
|       "type": "integer", | ||||
| @@ -88,14 +117,24 @@ | ||||
|       "maximum": 100000, | ||||
|       "default": 300, | ||||
|       "required": true, | ||||
|       "propertyOrder": 9 | ||||
|       "options": { | ||||
|         "dependencies": { | ||||
|           "useAPIv2": false | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 11 | ||||
|     }, | ||||
|     "candyGamma": { | ||||
|       "type": "boolean", | ||||
|       "format": "checkbox", | ||||
|       "title": "edt_dev_spec_candyGamma_title", | ||||
|       "default": true, | ||||
|       "propertyOrder": 10 | ||||
|       "options": { | ||||
|         "dependencies": { | ||||
|           "useAPIv2": false | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 12 | ||||
|     }, | ||||
|     "lightIds": { | ||||
|       "type": "array", | ||||
| @@ -112,20 +151,23 @@ | ||||
|           "useEntertainmentAPI": false | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 11 | ||||
|       "propertyOrder": 13 | ||||
|     }, | ||||
|     "groupId": { | ||||
|       "type": "number", | ||||
|       "format": "stepper", | ||||
|       "step": 1, | ||||
|       "type": "string", | ||||
|       "title": "edt_dev_spec_groupId_title", | ||||
|       "default": 0, | ||||
|       "default": "", | ||||
|       "options": { | ||||
|         "dependencies": { | ||||
|           "useEntertainmentAPI": true | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 12 | ||||
|       "options": { | ||||
|         "dependencies": { | ||||
|           "useAPIv2": false | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 14 | ||||
|     }, | ||||
|     "brightnessFactor": { | ||||
|       "type": "number", | ||||
| @@ -136,7 +178,12 @@ | ||||
|       "minimum": 0.5, | ||||
|       "maximum": 10.0, | ||||
|       "access": "advanced", | ||||
|       "propertyOrder": 13 | ||||
|       "options": { | ||||
|         "dependencies": { | ||||
|           "useAPIv2": false | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 15 | ||||
|     }, | ||||
|     "handshakeTimeoutMin": { | ||||
|       "type": "number", | ||||
| @@ -154,7 +201,7 @@ | ||||
|           "useEntertainmentAPI": true | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 14 | ||||
|       "propertyOrder": 16 | ||||
|     }, | ||||
|     "handshakeTimeoutMax": { | ||||
|       "type": "number", | ||||
| @@ -172,7 +219,7 @@ | ||||
|           "useEntertainmentAPI": true | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 15 | ||||
|       "propertyOrder": 17 | ||||
|     }, | ||||
|     "verbose": { | ||||
|       "type": "boolean", | ||||
| @@ -180,7 +227,7 @@ | ||||
|       "title": "edt_dev_spec_verbose_title", | ||||
|       "default": false, | ||||
|       "access": "expert", | ||||
|       "propertyOrder": 16 | ||||
|       "propertyOrder": 18 | ||||
|     }, | ||||
|     "transitiontime": { | ||||
|       "type": "number", | ||||
| @@ -195,24 +242,29 @@ | ||||
|           "useEntertainmentAPI": false | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 17 | ||||
|       "propertyOrder": 19 | ||||
|     }, | ||||
|     "blackLightsTimeout": { | ||||
|       "type": "number", | ||||
|       "title": "edt_dev_spec_blackLightsTimeout_title", | ||||
|       "default": 5000, | ||||
|       "options": { | ||||
|         "hidden": true | ||||
|         "dependencies": { | ||||
|           "useAPIv2": false | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 18 | ||||
|       "propertyOrder": 20 | ||||
|     }, | ||||
|     "brightnessThreshold": { | ||||
|       "type": "number", | ||||
|       "title": "edt_dev_spec_brightnessThreshold_title", | ||||
|       "default": 0.0001, | ||||
|       "options": { | ||||
|         "hidden": true | ||||
|         "dependencies": { | ||||
|           "useAPIv2": false | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 19 | ||||
|       "propertyOrder": 21 | ||||
|     }, | ||||
|     "brightnessMin": { | ||||
|       "type": "number", | ||||
| @@ -223,9 +275,11 @@ | ||||
|       "maximum": 1.0, | ||||
|       "access": "advanced", | ||||
|       "options": { | ||||
|         "hidden": true | ||||
|         "dependencies": { | ||||
|           "useAPIv2": false | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 20 | ||||
|       "propertyOrder": 22 | ||||
|     }, | ||||
|     "brightnessMax": { | ||||
|       "type": "number", | ||||
| @@ -236,9 +290,11 @@ | ||||
|       "maximum": 1.0, | ||||
|       "access": "advanced", | ||||
|       "options": { | ||||
|         "hidden": true | ||||
|         "dependencies": { | ||||
|           "useAPIv2": false | ||||
|         } | ||||
|       }, | ||||
|       "propertyOrder": 21 | ||||
|       "propertyOrder": 23 | ||||
|     } | ||||
|   }, | ||||
|   "additionalProperties": true | ||||
|   | ||||
| @@ -11,11 +11,11 @@ | ||||
| 		"rateList": { | ||||
| 			"type": "string", | ||||
| 			"title":"edt_dev_spec_baudrate_title", | ||||
| 			"enum": [ "CUSTOM","9600","14400","19200","28800","33600","38400","56000","57600","76800","115200","128000","153600","230400","256000","307200","460800","921600","1000000","1500000","2000000","3000000","4000000" ], | ||||
| 			"enum": [ "CUSTOM","250000","500000","1000000" ], | ||||
| 			"options": { | ||||
| 			  "enum_titles": [ "edt_conf_enum_custom" ] | ||||
| 			}, | ||||
| 			"default": "1000000", | ||||
| 			"default": "500000", | ||||
| 			"access": "advanced", | ||||
| 			"propertyOrder" : 2 | ||||
| 		}, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user