savant-echo 0.1.9 → 0.1.91
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/src/Savant copy.rb +1177 -0
- data/bin/src/Savant.rb +82 -28
- data/bin/src/glade/Savant.glade +9 -3
- metadata +4 -3
data/bin/src/Savant.rb
CHANGED
@@ -795,20 +795,24 @@ class Savant
|
|
795
795
|
##### Action argument windows #####
|
796
796
|
##### #####
|
797
797
|
|
798
|
-
#For each On parameter field that is possible, check if user entered value, percent,
|
798
|
+
#For each On parameter field that is possible, check if user entered value, percent, number, or volume and push into arg/val array.
|
799
799
|
def buttonAcceptOn__clicked(*argv)
|
800
800
|
get_glade_variables()
|
801
801
|
if @requestOnValue1 == 'percent'
|
802
802
|
@requestOnValue1 = '${intensity.percent}'
|
803
803
|
elsif @requestOnValue1 == 'number'
|
804
|
-
@requestOnValue1 = '${intensity.
|
804
|
+
@requestOnValue1 = '${intensity.math(X*.39)}'
|
805
|
+
elsif @requestOnValue1 == 'volume'
|
806
|
+
@requestOnValue1 = '${intensity.math(X*.39/2)}'
|
805
807
|
end
|
806
808
|
requestOnValues = [@requestOnArg1, @requestOnValue1]
|
807
809
|
unless @requestOnArg2.nil?
|
808
810
|
if @requestOnValue2 == 'percent'
|
809
811
|
@requestOnValue2 = '${intensity.percent}'
|
810
812
|
elsif @requestOnValue2 == 'number'
|
811
|
-
@requestOnValue2 = '${intensity.
|
813
|
+
@requestOnValue2 = '${intensity.math(X*.39)}'
|
814
|
+
elsif @requestOnValue2 == 'volume'
|
815
|
+
@requestOnValue2 = '${intensity.math(X*.39/2)}'
|
812
816
|
end
|
813
817
|
requestOnValues.push(@requestOnArg2)
|
814
818
|
requestOnValues.push(@requestOnValue2)
|
@@ -817,7 +821,9 @@ class Savant
|
|
817
821
|
if @requestOnValue3 == 'percent'
|
818
822
|
@requestOnValue3 = '${intensity.percent}'
|
819
823
|
elsif @requestOnValue3 == 'number'
|
820
|
-
@requestOnValue3 = '${intensity.
|
824
|
+
@requestOnValue3 = '${intensity.math(X*.39)}'
|
825
|
+
elsif @requestOnValue3 == 'volume'
|
826
|
+
@requestOnValue3 = '${intensity.math(X*.39/2)}'
|
821
827
|
end
|
822
828
|
requestOnValues.push(@requestOnArg3)
|
823
829
|
requestOnValues.push(@requestOnValue3)
|
@@ -826,7 +832,9 @@ class Savant
|
|
826
832
|
if @requestOnValue4 == 'percent'
|
827
833
|
@requestOnValue4 = '${intensity.percent}'
|
828
834
|
elsif @requestOnValue4 == 'number'
|
829
|
-
@requestOnValue4 = '${intensity.
|
835
|
+
@requestOnValue4 = '${intensity.math(X*.39)}'
|
836
|
+
elsif @requestOnValue4 == 'volume'
|
837
|
+
@requestOnValue4 = '${intensity.math(X*.39/2)}'
|
830
838
|
end
|
831
839
|
requestOnValues.push(@requestOnArg4)
|
832
840
|
requestOnValues.push(@requestOnValue4)
|
@@ -835,7 +843,9 @@ class Savant
|
|
835
843
|
if @requestOnValue5 == 'percent'
|
836
844
|
@requestOnValue5 = '${intensity.percent}'
|
837
845
|
elsif @requestOnValue5 == 'number'
|
838
|
-
@requestOnValue5 = '${intensity.
|
846
|
+
@requestOnValue5 = '${intensity.math(X*.39)}'
|
847
|
+
elsif @requestOnValue5 == 'volume'
|
848
|
+
@requestOnValue5 = '${intensity.math(X*.39/2)}'
|
839
849
|
end
|
840
850
|
requestOnValues.push(@requestOnArg5)
|
841
851
|
requestOnValues.push(@requestOnValue5)
|
@@ -844,7 +854,9 @@ class Savant
|
|
844
854
|
if @requestOnValue6 == 'percent'
|
845
855
|
@requestOnValue6 = '${intensity.percent}'
|
846
856
|
elsif @requestOnValue6 == 'number'
|
847
|
-
@requestOnValue6 = '${intensity.
|
857
|
+
@requestOnValue6 = '${intensity.math(X*.39)}'
|
858
|
+
elsif @requestOnValue6 == 'volume'
|
859
|
+
@requestOnValue6 = '${intensity.math(X*.39/2)}'
|
848
860
|
end
|
849
861
|
requestOnValues.push(@requestOnArg6)
|
850
862
|
requestOnValues.push(@requestOnValue6)
|
@@ -853,7 +865,9 @@ class Savant
|
|
853
865
|
if @requestOnValue7 == 'percent'
|
854
866
|
@requestOnValue7 = '${intensity.percent}'
|
855
867
|
elsif @requestOnValue7 == 'number'
|
856
|
-
@requestOnValue7 = '${intensity.
|
868
|
+
@requestOnValue7 = '${intensity.math(X*.39)}'
|
869
|
+
elsif @requestOnValue7 == 'volume'
|
870
|
+
@requestOnValue7 = '${intensity.math(X*.39/2)}'
|
857
871
|
end
|
858
872
|
requestOnValues.push(@requestOnArg7)
|
859
873
|
requestOnValues.push(@requestOnValue7)
|
@@ -862,7 +876,9 @@ class Savant
|
|
862
876
|
if @requestOnValue8 == 'percent'
|
863
877
|
@requestOnValue8 = '${intensity.percent}'
|
864
878
|
elsif @requestOnValue8 == 'number'
|
865
|
-
@requestOnValue8 = '${intensity.
|
879
|
+
@requestOnValue8 = '${intensity.math(X*.39)}'
|
880
|
+
elsif @requestOnValue8 == 'volume'
|
881
|
+
@requestOnValue8 = '${intensity.math(X*.39/2)}'
|
866
882
|
end
|
867
883
|
requestOnValues.push(@requestOnArg8)
|
868
884
|
requestOnValues.push(@requestOnValue8)
|
@@ -871,7 +887,9 @@ class Savant
|
|
871
887
|
if @requestOnValue9 == 'percent'
|
872
888
|
@requestOnValue9 = '${intensity.percent}'
|
873
889
|
elsif @requestOnValue9 == 'number'
|
874
|
-
@requestOnValue9 = '${intensity.
|
890
|
+
@requestOnValue9 = '${intensity.math(X*.39)}'
|
891
|
+
elsif @requestOnValue9 == 'volume'
|
892
|
+
@requestOnValue9 = '${intensity.math(X*.39/2)}'
|
875
893
|
end
|
876
894
|
requestOnValues.push(@requestOnArg9)
|
877
895
|
requestOnValues.push(@requestOnValue9)
|
@@ -902,14 +920,18 @@ class Savant
|
|
902
920
|
if @requestOffValue1 == 'percent'
|
903
921
|
@requestOffValue1 = '${intensity.percent}'
|
904
922
|
elsif @requestOffValue1 == 'number'
|
905
|
-
@requestOffValue1 = '${intensity.
|
923
|
+
@requestOffValue1 = '${intensity.math(X*.39)}'
|
924
|
+
elsif @requestOffValue1 == 'volume'
|
925
|
+
@requestOffValue1 = '${intensity.math(X*.39/2)}'
|
906
926
|
end
|
907
927
|
requestOffValues = [@requestOffArg1, @requestOffValue1]
|
908
928
|
unless @requestOffArg2.nil?
|
909
929
|
if @requestOffValue2 == 'percent'
|
910
930
|
@requestOffValue2 = '${intensity.percent}'
|
911
931
|
elsif @requestOffValue2 == 'number'
|
912
|
-
@requestOffValue2 = '${intensity.
|
932
|
+
@requestOffValue2 = '${intensity.math(X*.39)}'
|
933
|
+
elsif @requestOffValue2 == 'volume'
|
934
|
+
@requestOffValue2 = '${intensity.math(X*.39/2)}'
|
913
935
|
end
|
914
936
|
requestOffValues.push(@requestOffArg2)
|
915
937
|
requestOffValues.push(@requestOffValue2)
|
@@ -918,7 +940,9 @@ class Savant
|
|
918
940
|
if @requestOffValue3 == 'percent'
|
919
941
|
@requestOffValue3 = '${intensity.percent}'
|
920
942
|
elsif @requestOffValue3 == 'number'
|
921
|
-
@requestOffValue3 = '${intensity.
|
943
|
+
@requestOffValue3 = '${intensity.math(X*.39)}'
|
944
|
+
elsif @requestOffValue3 == 'volume'
|
945
|
+
@requestOffValue3 = '${intensity.math(X*.39/2)}'
|
922
946
|
end
|
923
947
|
requestOffValues.push(@requestOffArg3)
|
924
948
|
requestOffValues.push(@requestOffValue3)
|
@@ -927,7 +951,9 @@ class Savant
|
|
927
951
|
if @requestOffValue4 == 'percent'
|
928
952
|
@requestOffValue4 = '${intensity.percent}'
|
929
953
|
elsif @requestOffValue4 == 'number'
|
930
|
-
@requestOffValue4 = '${intensity.
|
954
|
+
@requestOffValue4 = '${intensity.math(X*.39)}'
|
955
|
+
elsif @requestOffValue4 == 'volume'
|
956
|
+
@requestOffValue4 = '${intensity.math(X*.39/2)}'
|
931
957
|
end
|
932
958
|
requestOffValues.push(@requestOffArg4)
|
933
959
|
requestOffValues.push(@requestOffValue4)
|
@@ -936,7 +962,9 @@ class Savant
|
|
936
962
|
if @requestOffValue5 == 'percent'
|
937
963
|
@requestOffValue5 = '${intensity.percent}'
|
938
964
|
elsif @requestOffValue5 == 'number'
|
939
|
-
@requestOffValue5 = '${intensity.
|
965
|
+
@requestOffValue5 = '${intensity.math(X*.39)}'
|
966
|
+
elsif @requestOffValue5 == 'volume'
|
967
|
+
@requestOffValue5 = '${intensity.math(X*.39/2)}'
|
940
968
|
end
|
941
969
|
requestOffValues.push(@requestOffArg5)
|
942
970
|
requestOffValues.push(@requestOffValue5)
|
@@ -945,7 +973,9 @@ class Savant
|
|
945
973
|
if @requestOffValue6 == 'percent'
|
946
974
|
@requestOffValue6 = '${intensity.percent}'
|
947
975
|
elsif @requestOffValue6 == 'number'
|
948
|
-
@requestOffValue6 = '${intensity.
|
976
|
+
@requestOffValue6 = '${intensity.math(X*.39)}'
|
977
|
+
elsif @requestOffValue6 == 'volume'
|
978
|
+
@requestOffValue6 = '${intensity.math(X*.39/2)}'
|
949
979
|
end
|
950
980
|
requestOffValues.push(@requestOffArg6)
|
951
981
|
requestOffValues.push(@requestOffValue6)
|
@@ -954,7 +984,9 @@ class Savant
|
|
954
984
|
if @requestOffValue7 == 'percent'
|
955
985
|
@requestOffValue7 = '${intensity.percent}'
|
956
986
|
elsif @requestOffValue7 == 'number'
|
957
|
-
@requestOffValue7 = '${intensity.
|
987
|
+
@requestOffValue7 = '${intensity.math(X*.39)}'
|
988
|
+
elsif @requestOffValue7 == 'volume'
|
989
|
+
@requestOffValue7 = '${intensity.math(X*.39/2)}'
|
958
990
|
end
|
959
991
|
requestOffValues.push(@requestOffArg7)
|
960
992
|
requestOffValues.push(@requestOffValue7)
|
@@ -963,7 +995,9 @@ class Savant
|
|
963
995
|
if @requestOffValue8 == 'percent'
|
964
996
|
@requestOffValue8 = '${intensity.percent}'
|
965
997
|
elsif @requestOffValue8 == 'number'
|
966
|
-
@requestOffValue8 = '${intensity.
|
998
|
+
@requestOffValue8 = '${intensity.math(X*.39)}'
|
999
|
+
elsif @requestOffValue8 == 'volume'
|
1000
|
+
@requestOffValue8 = '${intensity.math(X*.39/2)}'
|
967
1001
|
end
|
968
1002
|
requestOffValues.push(@requestOffArg8)
|
969
1003
|
requestOffValues.push(@requestOffValue8)
|
@@ -972,7 +1006,9 @@ class Savant
|
|
972
1006
|
if @requestOffValue9 == 'percent'
|
973
1007
|
@requestOffValue9 = '${intensity.percent}'
|
974
1008
|
elsif @requestOffValue9 == 'number'
|
975
|
-
@requestOffValue9 = '${intensity.
|
1009
|
+
@requestOffValue9 = '${intensity.math(X*.39)}'
|
1010
|
+
elsif @requestOffValue9 == 'volume'
|
1011
|
+
@requestOffValue9 = '${intensity.math(X*.39/2)}'
|
976
1012
|
end
|
977
1013
|
requestOffValues.push(@requestOffArg9)
|
978
1014
|
requestOffValues.push(@requestOffValue9)
|
@@ -998,14 +1034,18 @@ class Savant
|
|
998
1034
|
if @requestDimValue1 == 'percent'
|
999
1035
|
@requestDimValue1 = '${intensity.percent}'
|
1000
1036
|
elsif @requestDimValue1 == 'number'
|
1001
|
-
@requestDimValue1 = '${intensity.
|
1037
|
+
@requestDimValue1 = '${intensity.math(X*.39)}'
|
1038
|
+
elsif @requestDimValue1 == 'volume'
|
1039
|
+
@requestDimValue1 = '${intensity.math(X*.39/2)}'
|
1002
1040
|
end
|
1003
1041
|
requestDimValues = [@requestDimArg1, @requestDimValue1]
|
1004
1042
|
unless @requestDimArg2.nil?
|
1005
1043
|
if @requestDimValue2 == 'percent'
|
1006
1044
|
@requestDimValue2 = '${intensity.percent}'
|
1007
1045
|
elsif @requestDimValue2 == 'number'
|
1008
|
-
@requestDimValue2 = '${intensity.
|
1046
|
+
@requestDimValue2 = '${intensity.math(X*.39)}'
|
1047
|
+
elsif @requestDimValue2 == 'volume'
|
1048
|
+
@requestDimValue2 = '${intensity.math(X*.39/2)}'
|
1009
1049
|
end
|
1010
1050
|
requestDimValues.push(@requestDimArg2)
|
1011
1051
|
requestDimValues.push(@requestDimValue2)
|
@@ -1014,7 +1054,9 @@ class Savant
|
|
1014
1054
|
if @requestDimValue3 == 'percent'
|
1015
1055
|
@requestDimValue3 = '${intensity.percent}'
|
1016
1056
|
elsif @requestDimValue3 == 'number'
|
1017
|
-
@requestDimValue3 = '${intensity.
|
1057
|
+
@requestDimValue3 = '${intensity.math(X*.39)}'
|
1058
|
+
elsif @requestDimValue3 == 'volume'
|
1059
|
+
@requestDimValue3 = '${intensity.math(X*.39/2)}'
|
1018
1060
|
end
|
1019
1061
|
requestDimValues.push(@requestDimArg3)
|
1020
1062
|
requestDimValues.push(@requestDimValue3)
|
@@ -1023,7 +1065,9 @@ class Savant
|
|
1023
1065
|
if @requestDimValue4 == 'percent'
|
1024
1066
|
@requestDimValue4 = '${intensity.percent}'
|
1025
1067
|
elsif @requestDimValue4 == 'number'
|
1026
|
-
@requestDimValue4 = '${intensity.
|
1068
|
+
@requestDimValue4 = '${intensity.math(X*.39)}'
|
1069
|
+
elsif @requestDimValue4 == 'volume'
|
1070
|
+
@requestDimValue4 = '${intensity.math(X*.39/2)}'
|
1027
1071
|
end
|
1028
1072
|
requestDimValues.push(@requestDimArg4)
|
1029
1073
|
requestDimValues.push(@requestDimValue4)
|
@@ -1032,7 +1076,9 @@ class Savant
|
|
1032
1076
|
if @requestDimValue5 == 'percent'
|
1033
1077
|
@requestDimValue5 = '${intensity.percent}'
|
1034
1078
|
elsif @requestDimValue5 == 'number'
|
1035
|
-
@requestDimValue5 = '${intensity.
|
1079
|
+
@requestDimValue5 = '${intensity.math(X*.39)}'
|
1080
|
+
elsif @requestDimValue5 == 'volume'
|
1081
|
+
@requestDimValue5 = '${intensity.math(X*.39/2)}'
|
1036
1082
|
end
|
1037
1083
|
requestDimValues.push(@requestDimArg5)
|
1038
1084
|
requestDimValues.push(@requestDimValue5)
|
@@ -1041,7 +1087,9 @@ class Savant
|
|
1041
1087
|
if @requestDimValue6 == 'percent'
|
1042
1088
|
@requestDimValue6 = '${intensity.percent}'
|
1043
1089
|
elsif @requestDimValue6 == 'number'
|
1044
|
-
@requestDimValue6 = '${intensity.
|
1090
|
+
@requestDimValue6 = '${intensity.math(X*.39)}'
|
1091
|
+
elsif @requestDimValue6 == 'volume'
|
1092
|
+
@requestDimValue6 = '${intensity.math(X*.39/2)}'
|
1045
1093
|
end
|
1046
1094
|
requestDimValues.push(@requestDimArg6)
|
1047
1095
|
requestDimValues.push(@requestDimValue6)
|
@@ -1050,7 +1098,9 @@ class Savant
|
|
1050
1098
|
if @requestDimValue7 == 'percent'
|
1051
1099
|
@requestDimValue7 = '${intensity.percent}'
|
1052
1100
|
elsif @requestDimValue7 == 'number'
|
1053
|
-
@requestDimValue7 = '${intensity.
|
1101
|
+
@requestDimValue7 = '${intensity.math(X*.39)}'
|
1102
|
+
elsif @requestDimValue7 == 'volume'
|
1103
|
+
@requestDimValue7 = '${intensity.math(X*.39/2)}'
|
1054
1104
|
end
|
1055
1105
|
requestDimValues.push(@requestDimArg7)
|
1056
1106
|
requestDimValues.push(@requestDimValue7)
|
@@ -1059,7 +1109,9 @@ class Savant
|
|
1059
1109
|
if @requestDimValue8 == 'percent'
|
1060
1110
|
@requestDimValue8 = '${intensity.percent}'
|
1061
1111
|
elsif @requestDimValue8 == 'number'
|
1062
|
-
@requestDimValue8 = '${intensity.
|
1112
|
+
@requestDimValue8 = '${intensity.math(X*.39)}'
|
1113
|
+
elsif @requestDimValue8 == 'volume'
|
1114
|
+
@requestDimValue8 = '${intensity.math(X*.39/2)}'
|
1063
1115
|
end
|
1064
1116
|
requestDimValues.push(@requestDimArg8)
|
1065
1117
|
requestDimValues.push(@requestDimValue8)
|
@@ -1068,7 +1120,9 @@ class Savant
|
|
1068
1120
|
if @requestDimValue9 == 'percent'
|
1069
1121
|
@requestDimValue9 = '${intensity.percent}'
|
1070
1122
|
elsif @requestDimValue9 == 'number'
|
1071
|
-
@requestDimValue9 = '${intensity.
|
1123
|
+
@requestDimValue9 = '${intensity.math(X*.39)}'
|
1124
|
+
elsif @requestDimValue9 == 'volume'
|
1125
|
+
@requestDimValue9 = '${intensity.math(X*.39/2)}'
|
1072
1126
|
end
|
1073
1127
|
requestDimValues.push(@requestDimArg9)
|
1074
1128
|
requestDimValues.push(@requestDimValue9)
|
data/bin/src/glade/Savant.glade
CHANGED
@@ -442,7 +442,9 @@
|
|
442
442
|
|
443
443
|
Enter "percent" to derive 0-100 value from voice command.
|
444
444
|
|
445
|
-
Enter "number" to derive
|
445
|
+
Enter "number" to derive 1-256 value from voice command.
|
446
|
+
|
447
|
+
Enter "volume" to derive 1-50 value from 1-100 voice command.</property>
|
446
448
|
<property name="use_markup">True</property>
|
447
449
|
<property name="justify">center</property>
|
448
450
|
</object>
|
@@ -1110,7 +1112,9 @@ correctly installed on host on local network.</property>
|
|
1110
1112
|
|
1111
1113
|
Enter "percent" to derive 0-100 value from voice command.
|
1112
1114
|
|
1113
|
-
Enter "number" to derive 0-256 value from voice command
|
1115
|
+
Enter "number" to derive 0-256 value from voice command.
|
1116
|
+
|
1117
|
+
Enter "volume" to derive 1-50 value from 1-100 voice command.</property>
|
1114
1118
|
<property name="use_markup">True</property>
|
1115
1119
|
<property name="justify">center</property>
|
1116
1120
|
</object>
|
@@ -1502,7 +1506,9 @@ Enter "number" to derive 0-256 value from voice command.</property>
|
|
1502
1506
|
|
1503
1507
|
Enter "percent" to derive 0-100 value from voice command.
|
1504
1508
|
|
1505
|
-
Enter "number" to derive 0-256 value from voice command
|
1509
|
+
Enter "number" to derive 0-256 value from voice command.
|
1510
|
+
|
1511
|
+
Enter "volume" to derive 1-50 value from 1-100 voice command.</property>
|
1506
1512
|
<property name="use_markup">True</property>
|
1507
1513
|
<property name="justify">center</property>
|
1508
1514
|
</object>
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: savant-echo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.91
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Corey Miller
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir:
|
10
10
|
- bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2017-01-06 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: net-scp
|
@@ -92,7 +92,7 @@ dependencies:
|
|
92
92
|
- !ruby/object:Gem::Version
|
93
93
|
version: 1.2.0
|
94
94
|
description: Savant Integration with Amazon Echo
|
95
|
-
email:
|
95
|
+
email: cmiller@premieresystems.com.com
|
96
96
|
executables:
|
97
97
|
- alexa
|
98
98
|
extensions: []
|
@@ -2906,6 +2906,7 @@ files:
|
|
2906
2906
|
- bin/packaging/vendor/ruby/2.2.0/gems/visualruby-3.0.23/src/main/glade/VR_Local_Gem_Tree.glade
|
2907
2907
|
- bin/packaging/vendor/ruby/2.2.0/gems/visualruby-3.0.23/src/main/glade/VR_Main.glade
|
2908
2908
|
- bin/packaging/vendor/ruby/2.2.0/gems/visualruby-3.0.23/src/main/glade/VR_Remote_Gem_Tree.glade
|
2909
|
+
- bin/src/Savant copy.rb
|
2909
2910
|
- bin/src/Savant.rb
|
2910
2911
|
- bin/src/glade/Savant.glade
|
2911
2912
|
homepage: http://www.yoursite.org/
|