diff --git a/html/Captures/Siglent_SDS1102CML_SDS1MEBX2R2090_6_01_01_19.bmp b/html/Captures/Siglent_SDS1102CML_SDS1MEBX2R2090_6_01_01_19.bmp index dc1e8f3..00237e4 100644 Binary files a/html/Captures/Siglent_SDS1102CML_SDS1MEBX2R2090_6_01_01_19.bmp and b/html/Captures/Siglent_SDS1102CML_SDS1MEBX2R2090_6_01_01_19.bmp differ diff --git a/html/Captures/Siglent_Technologies_SDG1032X_SDG1XCAX3R0874_1_01_01_33R1.bmp b/html/Captures/Siglent_Technologies_SDG1032X_SDG1XCAX3R0874_1_01_01_33R1.bmp index 7fe9d7b..fb315ff 100644 Binary files a/html/Captures/Siglent_Technologies_SDG1032X_SDG1XCAX3R0874_1_01_01_33R1.bmp and b/html/Captures/Siglent_Technologies_SDG1032X_SDG1XCAX3R0874_1_01_01_33R1.bmp differ diff --git a/html/Generateur/Fonctions/Burst/form_burst.php b/html/Generateur/Fonctions/Burst/form_burst.php index bb9fefe..1aaded3 100644 --- a/html/Generateur/Fonctions/Burst/form_burst.php +++ b/html/Generateur/Fonctions/Burst/form_burst.php @@ -17,7 +17,7 @@ background: #07e50a; } -
+
diff --git a/html/Generateur/Fonctions/Channel/form_channel.php b/html/Generateur/Fonctions/Channel/form_channel.php index 5690a91..bbbd509 100644 --- a/html/Generateur/Fonctions/Channel/form_channel.php +++ b/html/Generateur/Fonctions/Channel/form_channel.php @@ -1,6 +1,6 @@ -
+
diff --git a/html/Generateur/Fonctions/Mod/form_mod.php b/html/Generateur/Fonctions/Mod/form_mod.php index 599ea00..6f8b792 100644 --- a/html/Generateur/Fonctions/Mod/form_mod.php +++ b/html/Generateur/Fonctions/Mod/form_mod.php @@ -1,6 +1,6 @@ -
+
diff --git a/html/Generateur/Fonctions/Parameter/form_parameter.php b/html/Generateur/Fonctions/Parameter/form_parameter.php index 66dd870..d768aed 100644 --- a/html/Generateur/Fonctions/Parameter/form_parameter.php +++ b/html/Generateur/Fonctions/Parameter/form_parameter.php @@ -1,6 +1,6 @@ -
+
diff --git a/html/Generateur/Fonctions/Sweep/form_sweep.php b/html/Generateur/Fonctions/Sweep/form_sweep.php index 40980d5..59699d4 100644 --- a/html/Generateur/Fonctions/Sweep/form_sweep.php +++ b/html/Generateur/Fonctions/Sweep/form_sweep.php @@ -1,6 +1,6 @@ -
+
diff --git a/html/Generateur/Fonctions/Utility/form_utility.php b/html/Generateur/Fonctions/Utility/form_utility.php index 3aa21f8..f351174 100644 --- a/html/Generateur/Fonctions/Utility/form_utility.php +++ b/html/Generateur/Fonctions/Utility/form_utility.php @@ -1,6 +1,6 @@ -
+
diff --git a/html/Generateur/Fonctions/Waves/form_waves.php b/html/Generateur/Fonctions/Waves/form_waves.php index 479b695..72c2731 100644 --- a/html/Generateur/Fonctions/Waves/form_waves.php +++ b/html/Generateur/Fonctions/Waves/form_waves.php @@ -1,6 +1,6 @@ -
+
diff --git a/html/Generateur/Global/Chiffres/form_chiffres.php b/html/Generateur/Global/Chiffres/form_chiffres.php index 0002dd6..a8d1b95 100644 --- a/html/Generateur/Global/Chiffres/form_chiffres.php +++ b/html/Generateur/Global/Chiffres/form_chiffres.php @@ -1,6 +1,5 @@ - -
-
+
+
-
+
-
+
-
+

-
+
-
+
-
+

-
+
-
+
-
+

-
+
-
+
-
+
diff --git a/html/Generateur/Global/Fleches/form_fleches.php b/html/Generateur/Global/Fleches/form_fleches.php index 6a9725b..f5172d4 100644 --- a/html/Generateur/Global/Fleches/form_fleches.php +++ b/html/Generateur/Global/Fleches/form_fleches.php @@ -1,13 +1,15 @@ -
-
- - -
-
- - -
+
+
+
+ + +
+
+ + +
+
diff --git a/html/Generateur/Menus/Func1/form_func1.php b/html/Generateur/Menus/Func1/form_func1.php index 720096d..6e48181 100644 --- a/html/Generateur/Menus/Func1/form_func1.php +++ b/html/Generateur/Menus/Func1/form_func1.php @@ -1,22 +1,7 @@ - -
- + +
diff --git a/html/Generateur/Menus/Func2/form_func2.php b/html/Generateur/Menus/Func2/form_func2.php index cccc40a..bea0ff3 100644 --- a/html/Generateur/Menus/Func2/form_func2.php +++ b/html/Generateur/Menus/Func2/form_func2.php @@ -1,21 +1,6 @@ - -
- + +
- - - - - + ?> diff --git a/html/Generateur_onglets/Fonctions/Burst/cmd_burst.php b/html/Generateur_onglets/Fonctions/Burst/cmd_burst.php new file mode 100644 index 0000000..6a2cc74 --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Burst/cmd_burst.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Fonctions/Burst/form_burst.php b/html/Generateur_onglets/Fonctions/Burst/form_burst.php new file mode 100644 index 0000000..bb9fefe --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Burst/form_burst.php @@ -0,0 +1,24 @@ + + + +
+ + +
+ diff --git a/html/Generateur_onglets/Fonctions/Channel/cmd_channel.php b/html/Generateur_onglets/Fonctions/Channel/cmd_channel.php new file mode 100644 index 0000000..86615fc --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Channel/cmd_channel.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Fonctions/Channel/form_channel.php b/html/Generateur_onglets/Fonctions/Channel/form_channel.php new file mode 100644 index 0000000..5690a91 --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Channel/form_channel.php @@ -0,0 +1,7 @@ + + +
+ + +
+ diff --git a/html/Generateur_onglets/Fonctions/Mod/cmd_mod.php b/html/Generateur_onglets/Fonctions/Mod/cmd_mod.php new file mode 100644 index 0000000..5749b48 --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Mod/cmd_mod.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Fonctions/Mod/form_mod.php b/html/Generateur_onglets/Fonctions/Mod/form_mod.php new file mode 100644 index 0000000..599ea00 --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Mod/form_mod.php @@ -0,0 +1,7 @@ + + +
+ + +
+ diff --git a/html/Generateur_onglets/Fonctions/Parameter/cmd_parameter.php b/html/Generateur_onglets/Fonctions/Parameter/cmd_parameter.php new file mode 100644 index 0000000..74c81ab --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Parameter/cmd_parameter.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Fonctions/Parameter/form_parameter.php b/html/Generateur_onglets/Fonctions/Parameter/form_parameter.php new file mode 100644 index 0000000..66dd870 --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Parameter/form_parameter.php @@ -0,0 +1,7 @@ + + +
+ + +
+ diff --git a/html/Generateur_onglets/Fonctions/Sweep/cmd_sweep.php b/html/Generateur_onglets/Fonctions/Sweep/cmd_sweep.php new file mode 100644 index 0000000..da2d571 --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Sweep/cmd_sweep.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Fonctions/Sweep/form_sweep.php b/html/Generateur_onglets/Fonctions/Sweep/form_sweep.php new file mode 100644 index 0000000..40980d5 --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Sweep/form_sweep.php @@ -0,0 +1,7 @@ + + +
+ + +
+ diff --git a/html/Generateur_onglets/Fonctions/Utility/cmd_utility.php b/html/Generateur_onglets/Fonctions/Utility/cmd_utility.php new file mode 100644 index 0000000..5e5953c --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Utility/cmd_utility.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Fonctions/Utility/form_utility.php b/html/Generateur_onglets/Fonctions/Utility/form_utility.php new file mode 100644 index 0000000..3aa21f8 --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Utility/form_utility.php @@ -0,0 +1,7 @@ + + +
+ + +
+ diff --git a/html/Generateur_onglets/Fonctions/Waves/cmd_waves.php b/html/Generateur_onglets/Fonctions/Waves/cmd_waves.php new file mode 100644 index 0000000..efa4afa --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Waves/cmd_waves.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Fonctions/Waves/form_waves.php b/html/Generateur_onglets/Fonctions/Waves/form_waves.php new file mode 100644 index 0000000..479b695 --- /dev/null +++ b/html/Generateur_onglets/Fonctions/Waves/form_waves.php @@ -0,0 +1,7 @@ + + +
+ + +
+ diff --git a/html/Generateur_onglets/Global/Chiffres/cmd_chiffres.php b/html/Generateur_onglets/Global/Chiffres/cmd_chiffres.php new file mode 100644 index 0000000..3de6b85 --- /dev/null +++ b/html/Generateur_onglets/Global/Chiffres/cmd_chiffres.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Global/Chiffres/form_chiffres.php b/html/Generateur_onglets/Global/Chiffres/form_chiffres.php new file mode 100644 index 0000000..a1e6283 --- /dev/null +++ b/html/Generateur_onglets/Global/Chiffres/form_chiffres.php @@ -0,0 +1,83 @@ + + + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ diff --git a/html/Generateur_onglets/Global/Fleches/cmd_fleches.php b/html/Generateur_onglets/Global/Fleches/cmd_fleches.php new file mode 100644 index 0000000..6f35def --- /dev/null +++ b/html/Generateur_onglets/Global/Fleches/cmd_fleches.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Global/Fleches/form_fleches.php b/html/Generateur_onglets/Global/Fleches/form_fleches.php new file mode 100644 index 0000000..6a9725b --- /dev/null +++ b/html/Generateur_onglets/Global/Fleches/form_fleches.php @@ -0,0 +1,13 @@ + + +
+
+ + +
+
+ + +
+
+ diff --git a/html/Generateur_onglets/Global/Knob/btn_knob_generateur.png b/html/Generateur_onglets/Global/Knob/btn_knob_generateur.png new file mode 100644 index 0000000..c183400 Binary files /dev/null and b/html/Generateur_onglets/Global/Knob/btn_knob_generateur.png differ diff --git a/html/Generateur_onglets/Global/Knob/cmd_knob.php b/html/Generateur_onglets/Global/Knob/cmd_knob.php new file mode 100644 index 0000000..ef351e6 --- /dev/null +++ b/html/Generateur_onglets/Global/Knob/cmd_knob.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Global/Knob/form_knob.php b/html/Generateur_onglets/Global/Knob/form_knob.php new file mode 100644 index 0000000..5533f16 --- /dev/null +++ b/html/Generateur_onglets/Global/Knob/form_knob.php @@ -0,0 +1,36 @@ + + + +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ diff --git a/html/Generateur_onglets/Menus/Func1/cmd_func1.php b/html/Generateur_onglets/Menus/Func1/cmd_func1.php new file mode 100644 index 0000000..caa8e77 --- /dev/null +++ b/html/Generateur_onglets/Menus/Func1/cmd_func1.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Menus/Func1/form_func1.php b/html/Generateur_onglets/Menus/Func1/form_func1.php new file mode 100644 index 0000000..720096d --- /dev/null +++ b/html/Generateur_onglets/Menus/Func1/form_func1.php @@ -0,0 +1,28 @@ + + + +
+ + +
+ + diff --git a/html/Generateur_onglets/Menus/Func2/cmd_func2.php b/html/Generateur_onglets/Menus/Func2/cmd_func2.php new file mode 100644 index 0000000..442e34f --- /dev/null +++ b/html/Generateur_onglets/Menus/Func2/cmd_func2.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Menus/Func2/form_func2.php b/html/Generateur_onglets/Menus/Func2/form_func2.php new file mode 100644 index 0000000..cccc40a --- /dev/null +++ b/html/Generateur_onglets/Menus/Func2/form_func2.php @@ -0,0 +1,28 @@ + + +
+ + +
+ + diff --git a/html/Generateur_onglets/Menus/Func3/cmd_func3.php b/html/Generateur_onglets/Menus/Func3/cmd_func3.php new file mode 100644 index 0000000..b3f0706 --- /dev/null +++ b/html/Generateur_onglets/Menus/Func3/cmd_func3.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Menus/Func3/form_func3.php b/html/Generateur_onglets/Menus/Func3/form_func3.php new file mode 100644 index 0000000..d1cd3f8 --- /dev/null +++ b/html/Generateur_onglets/Menus/Func3/form_func3.php @@ -0,0 +1,27 @@ + + +
+ + +
+ + diff --git a/html/Generateur_onglets/Menus/Func4/cmd_func4.php b/html/Generateur_onglets/Menus/Func4/cmd_func4.php new file mode 100644 index 0000000..2469fa8 --- /dev/null +++ b/html/Generateur_onglets/Menus/Func4/cmd_func4.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Menus/Func4/form_func4.php b/html/Generateur_onglets/Menus/Func4/form_func4.php new file mode 100644 index 0000000..518778f --- /dev/null +++ b/html/Generateur_onglets/Menus/Func4/form_func4.php @@ -0,0 +1,27 @@ + + +
+ + +
+ + diff --git a/html/Generateur_onglets/Menus/Func5/cmd_func5.php b/html/Generateur_onglets/Menus/Func5/cmd_func5.php new file mode 100644 index 0000000..81e68ee --- /dev/null +++ b/html/Generateur_onglets/Menus/Func5/cmd_func5.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Menus/Func5/form_func5.php b/html/Generateur_onglets/Menus/Func5/form_func5.php new file mode 100644 index 0000000..5657193 --- /dev/null +++ b/html/Generateur_onglets/Menus/Func5/form_func5.php @@ -0,0 +1,28 @@ + + +
+ + +
+ + diff --git a/html/Generateur_onglets/Menus/Func6/cmd_func6.php b/html/Generateur_onglets/Menus/Func6/cmd_func6.php new file mode 100644 index 0000000..1891b0d --- /dev/null +++ b/html/Generateur_onglets/Menus/Func6/cmd_func6.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Menus/Func6/form_func6.php b/html/Generateur_onglets/Menus/Func6/form_func6.php new file mode 100644 index 0000000..123e04a --- /dev/null +++ b/html/Generateur_onglets/Menus/Func6/form_func6.php @@ -0,0 +1,28 @@ + + +
+ + +
+ + diff --git a/html/Generateur_onglets/Outputs/Output1/cmd_output_1.php b/html/Generateur_onglets/Outputs/Output1/cmd_output_1.php new file mode 100644 index 0000000..a943a25 --- /dev/null +++ b/html/Generateur_onglets/Outputs/Output1/cmd_output_1.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Outputs/Output1/form_output_1.php b/html/Generateur_onglets/Outputs/Output1/form_output_1.php new file mode 100644 index 0000000..70160d6 --- /dev/null +++ b/html/Generateur_onglets/Outputs/Output1/form_output_1.php @@ -0,0 +1,7 @@ + + +
+ + +
+ diff --git a/html/Generateur_onglets/Outputs/Output2/cmd_output_2.php b/html/Generateur_onglets/Outputs/Output2/cmd_output_2.php new file mode 100644 index 0000000..7034ff2 --- /dev/null +++ b/html/Generateur_onglets/Outputs/Output2/cmd_output_2.php @@ -0,0 +1,7 @@ + diff --git a/html/Generateur_onglets/Outputs/Output2/form_output_2.php b/html/Generateur_onglets/Outputs/Output2/form_output_2.php new file mode 100644 index 0000000..8c5917c --- /dev/null +++ b/html/Generateur_onglets/Outputs/Output2/form_output_2.php @@ -0,0 +1,7 @@ + + +
+ + +
+ diff --git a/html/Generateur_onglets/commandes_generateur.php b/html/Generateur_onglets/commandes_generateur.php new file mode 100644 index 0000000..96a9209 --- /dev/null +++ b/html/Generateur_onglets/commandes_generateur.php @@ -0,0 +1,22 @@ + diff --git a/html/Generateur_onglets/main_generateur.php b/html/Generateur_onglets/main_generateur.php new file mode 100644 index 0000000..05005c2 --- /dev/null +++ b/html/Generateur_onglets/main_generateur.php @@ -0,0 +1,149 @@ + + + '; + echo '
'; + /* Affichage image */ + include('./Scripts/creation_img.php'); + echo '
'; + echo '
'; + /* Commandes de l'appareil */ + echo '
'; + echo '

Panel de commande

'; + echo '
'; + echo '
'; + echo ''; + echo '
'; + foreach($files as $Fich){ + $path = $chemin.'/'.$Fich; + if(is_dir($path)){ + echo '
'; + echo '

'; + $files = array_diff(scandir($path),array('..','.')); + foreach($files as $dir){ + $path2 = $path.'/'.$dir; + if(is_dir($path2)){ + $files2 = array_diff(scandir($path2),array('..','.')); + foreach($files2 as $form){ + $path3 = $path2.'/'.$form; + if(is_file($path3) && strpos($path3,"form")!=false){ + include($path3); + echo '
'; + } + } + } + } + echo '

'; + echo '
'; + } + } + echo '
'; + echo '
'; + echo '
'; + ?> + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + + + + + diff --git a/html/Generateur_test/Fonctions/Burst/cmd_burst.php b/html/Generateur_test/Fonctions/Burst/cmd_burst.php deleted file mode 100644 index 6a2cc74..0000000 --- a/html/Generateur_test/Fonctions/Burst/cmd_burst.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Fonctions/Burst/form_burst.php b/html/Generateur_test/Fonctions/Burst/form_burst.php deleted file mode 100644 index 1aaded3..0000000 --- a/html/Generateur_test/Fonctions/Burst/form_burst.php +++ /dev/null @@ -1,24 +0,0 @@ - - - -
- - -
- diff --git a/html/Generateur_test/Fonctions/Channel/cmd_channel.php b/html/Generateur_test/Fonctions/Channel/cmd_channel.php deleted file mode 100644 index 86615fc..0000000 --- a/html/Generateur_test/Fonctions/Channel/cmd_channel.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Fonctions/Channel/form_channel.php b/html/Generateur_test/Fonctions/Channel/form_channel.php deleted file mode 100644 index bbbd509..0000000 --- a/html/Generateur_test/Fonctions/Channel/form_channel.php +++ /dev/null @@ -1,7 +0,0 @@ - - -
- - -
- diff --git a/html/Generateur_test/Fonctions/Mod/cmd_mod.php b/html/Generateur_test/Fonctions/Mod/cmd_mod.php deleted file mode 100644 index 5749b48..0000000 --- a/html/Generateur_test/Fonctions/Mod/cmd_mod.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Fonctions/Mod/form_mod.php b/html/Generateur_test/Fonctions/Mod/form_mod.php deleted file mode 100644 index 6f8b792..0000000 --- a/html/Generateur_test/Fonctions/Mod/form_mod.php +++ /dev/null @@ -1,7 +0,0 @@ - - -
- - -
- diff --git a/html/Generateur_test/Fonctions/Parameter/cmd_parameter.php b/html/Generateur_test/Fonctions/Parameter/cmd_parameter.php deleted file mode 100644 index 74c81ab..0000000 --- a/html/Generateur_test/Fonctions/Parameter/cmd_parameter.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Fonctions/Parameter/form_parameter.php b/html/Generateur_test/Fonctions/Parameter/form_parameter.php deleted file mode 100644 index d768aed..0000000 --- a/html/Generateur_test/Fonctions/Parameter/form_parameter.php +++ /dev/null @@ -1,7 +0,0 @@ - - -
- - -
- diff --git a/html/Generateur_test/Fonctions/Sweep/cmd_sweep.php b/html/Generateur_test/Fonctions/Sweep/cmd_sweep.php deleted file mode 100644 index da2d571..0000000 --- a/html/Generateur_test/Fonctions/Sweep/cmd_sweep.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Fonctions/Sweep/form_sweep.php b/html/Generateur_test/Fonctions/Sweep/form_sweep.php deleted file mode 100644 index 59699d4..0000000 --- a/html/Generateur_test/Fonctions/Sweep/form_sweep.php +++ /dev/null @@ -1,7 +0,0 @@ - - -
- - -
- diff --git a/html/Generateur_test/Fonctions/Utility/cmd_utility.php b/html/Generateur_test/Fonctions/Utility/cmd_utility.php deleted file mode 100644 index 5e5953c..0000000 --- a/html/Generateur_test/Fonctions/Utility/cmd_utility.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Fonctions/Utility/form_utility.php b/html/Generateur_test/Fonctions/Utility/form_utility.php deleted file mode 100644 index f351174..0000000 --- a/html/Generateur_test/Fonctions/Utility/form_utility.php +++ /dev/null @@ -1,7 +0,0 @@ - - -
- - -
- diff --git a/html/Generateur_test/Fonctions/Waves/cmd_waves.php b/html/Generateur_test/Fonctions/Waves/cmd_waves.php deleted file mode 100644 index efa4afa..0000000 --- a/html/Generateur_test/Fonctions/Waves/cmd_waves.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Fonctions/Waves/form_waves.php b/html/Generateur_test/Fonctions/Waves/form_waves.php deleted file mode 100644 index 72c2731..0000000 --- a/html/Generateur_test/Fonctions/Waves/form_waves.php +++ /dev/null @@ -1,7 +0,0 @@ - - -
- - -
- diff --git a/html/Generateur_test/Global/Chiffres/cmd_chiffres.php b/html/Generateur_test/Global/Chiffres/cmd_chiffres.php deleted file mode 100644 index 3de6b85..0000000 --- a/html/Generateur_test/Global/Chiffres/cmd_chiffres.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Global/Chiffres/form_chiffres.php b/html/Generateur_test/Global/Chiffres/form_chiffres.php deleted file mode 100644 index a8d1b95..0000000 --- a/html/Generateur_test/Global/Chiffres/form_chiffres.php +++ /dev/null @@ -1,83 +0,0 @@ - - - -
-
-
-
- - -
-
- - -
-
- - -
-
-
-
-
- - -
-
- - -
-
- - -
-
-
-
-
- - -
-
- - -
-
- - -
-
-
-
-
- - -
-
- - -
-
- - -
-
-
-
- diff --git a/html/Generateur_test/Global/Fleches/cmd_fleches.php b/html/Generateur_test/Global/Fleches/cmd_fleches.php deleted file mode 100644 index 6f35def..0000000 --- a/html/Generateur_test/Global/Fleches/cmd_fleches.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Global/Fleches/form_fleches.php b/html/Generateur_test/Global/Fleches/form_fleches.php deleted file mode 100644 index f5172d4..0000000 --- a/html/Generateur_test/Global/Fleches/form_fleches.php +++ /dev/null @@ -1,15 +0,0 @@ - - -
-
-
- - -
-
- - -
-
-
- diff --git a/html/Generateur_test/Global/Knob/btn_knob_generateur.png b/html/Generateur_test/Global/Knob/btn_knob_generateur.png deleted file mode 100644 index c183400..0000000 Binary files a/html/Generateur_test/Global/Knob/btn_knob_generateur.png and /dev/null differ diff --git a/html/Generateur_test/Global/Knob/cmd_knob.php b/html/Generateur_test/Global/Knob/cmd_knob.php deleted file mode 100644 index ef351e6..0000000 --- a/html/Generateur_test/Global/Knob/cmd_knob.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Global/Knob/form_knob.php b/html/Generateur_test/Global/Knob/form_knob.php deleted file mode 100644 index 5533f16..0000000 --- a/html/Generateur_test/Global/Knob/form_knob.php +++ /dev/null @@ -1,36 +0,0 @@ - - - -
-
-
- - -
-
- - -
-
- - -
-
-
- diff --git a/html/Generateur_test/Menus/Func1/cmd_func1.php b/html/Generateur_test/Menus/Func1/cmd_func1.php deleted file mode 100644 index caa8e77..0000000 --- a/html/Generateur_test/Menus/Func1/cmd_func1.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Menus/Func1/form_func1.php b/html/Generateur_test/Menus/Func1/form_func1.php deleted file mode 100644 index 0bdd904..0000000 --- a/html/Generateur_test/Menus/Func1/form_func1.php +++ /dev/null @@ -1,13 +0,0 @@ - - -
- - -
- - diff --git a/html/Generateur_test/Menus/Func2/cmd_func2.php b/html/Generateur_test/Menus/Func2/cmd_func2.php deleted file mode 100644 index 442e34f..0000000 --- a/html/Generateur_test/Menus/Func2/cmd_func2.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Menus/Func2/form_func2.php b/html/Generateur_test/Menus/Func2/form_func2.php deleted file mode 100644 index bea0ff3..0000000 --- a/html/Generateur_test/Menus/Func2/form_func2.php +++ /dev/null @@ -1,13 +0,0 @@ - -
- - -
- - diff --git a/html/Generateur_test/Menus/Func3/cmd_func3.php b/html/Generateur_test/Menus/Func3/cmd_func3.php deleted file mode 100644 index b3f0706..0000000 --- a/html/Generateur_test/Menus/Func3/cmd_func3.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Menus/Func3/form_func3.php b/html/Generateur_test/Menus/Func3/form_func3.php deleted file mode 100644 index 40dbc8f..0000000 --- a/html/Generateur_test/Menus/Func3/form_func3.php +++ /dev/null @@ -1,13 +0,0 @@ - -
- - -
- - diff --git a/html/Generateur_test/Menus/Func4/cmd_func4.php b/html/Generateur_test/Menus/Func4/cmd_func4.php deleted file mode 100644 index 2469fa8..0000000 --- a/html/Generateur_test/Menus/Func4/cmd_func4.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Menus/Func4/form_func4.php b/html/Generateur_test/Menus/Func4/form_func4.php deleted file mode 100644 index e867a75..0000000 --- a/html/Generateur_test/Menus/Func4/form_func4.php +++ /dev/null @@ -1,13 +0,0 @@ - -
- - -
- - diff --git a/html/Generateur_test/Menus/Func5/cmd_func5.php b/html/Generateur_test/Menus/Func5/cmd_func5.php deleted file mode 100644 index 81e68ee..0000000 --- a/html/Generateur_test/Menus/Func5/cmd_func5.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Menus/Func5/form_func5.php b/html/Generateur_test/Menus/Func5/form_func5.php deleted file mode 100644 index 7509df6..0000000 --- a/html/Generateur_test/Menus/Func5/form_func5.php +++ /dev/null @@ -1,13 +0,0 @@ - -
- - -
- - diff --git a/html/Generateur_test/Menus/Func6/cmd_func6.php b/html/Generateur_test/Menus/Func6/cmd_func6.php deleted file mode 100644 index 1891b0d..0000000 --- a/html/Generateur_test/Menus/Func6/cmd_func6.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Menus/Func6/form_func6.php b/html/Generateur_test/Menus/Func6/form_func6.php deleted file mode 100644 index 97b98cc..0000000 --- a/html/Generateur_test/Menus/Func6/form_func6.php +++ /dev/null @@ -1,13 +0,0 @@ - -
- - -
- - diff --git a/html/Generateur_test/Outputs/Output1/cmd_output_1.php b/html/Generateur_test/Outputs/Output1/cmd_output_1.php deleted file mode 100644 index a943a25..0000000 --- a/html/Generateur_test/Outputs/Output1/cmd_output_1.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Outputs/Output1/form_output_1.php b/html/Generateur_test/Outputs/Output1/form_output_1.php deleted file mode 100644 index 23f3c8e..0000000 --- a/html/Generateur_test/Outputs/Output1/form_output_1.php +++ /dev/null @@ -1,7 +0,0 @@ - - -
- - -
- diff --git a/html/Generateur_test/Outputs/Output2/cmd_output_2.php b/html/Generateur_test/Outputs/Output2/cmd_output_2.php deleted file mode 100644 index 7034ff2..0000000 --- a/html/Generateur_test/Outputs/Output2/cmd_output_2.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/html/Generateur_test/Outputs/Output2/form_output_2.php b/html/Generateur_test/Outputs/Output2/form_output_2.php deleted file mode 100644 index d98c7b3..0000000 --- a/html/Generateur_test/Outputs/Output2/form_output_2.php +++ /dev/null @@ -1,7 +0,0 @@ - - -
- - -
- diff --git a/html/Generateur_test/commandes_generateur.php b/html/Generateur_test/commandes_generateur.php deleted file mode 100644 index 96a9209..0000000 --- a/html/Generateur_test/commandes_generateur.php +++ /dev/null @@ -1,22 +0,0 @@ - diff --git a/html/Generateur_test/main_generateur.php b/html/Generateur_test/main_generateur.php deleted file mode 100644 index 65e7364..0000000 --- a/html/Generateur_test/main_generateur.php +++ /dev/null @@ -1,60 +0,0 @@ - - - - '; - echo '
'; - /* Affichage image */ - include('./Scripts/creation_img.php'); - echo '
'; - echo '
'; - /* Commandes de l'appareil */ - echo '
'; - echo '

Panel de commande

'; - echo '
'; - $chemin = getcwd().'/'.$Appareil[$i]['type']; - $files = array_diff(scandir($chemin),array('..','.')); - echo '
'; - foreach($files as $Fich){ - $path = $chemin.'/'.$Fich; - if(is_dir($path)){ - $files = array_diff(scandir($path),array('..','.')); - if($Fich!="Menus"){ - echo '
'; - } - foreach($files as $dir){ - $path2 = $path.'/'.$dir; - if(is_dir($path2)){ - $new_dir = array_diff(scandir($path2),array('..','.')); - foreach($new_dir as $form){ - $path3 = $path2.'/'.$form; - if(is_file($path3) && strpos($path3,"form")!=false){ - include($path3); - } - } - } - } - if($Fich!="Menus"){ - echo '
'; - } - } - } - echo '
'; - echo '
'; - echo '
'; - ?> - diff --git a/html/Oscilloscope/CH1/1_Trace/form_trace.php b/html/Oscilloscope/CH1/1_Trace/form_trace.php index 6ba27ff..db61a58 100644 --- a/html/Oscilloscope/CH1/1_Trace/form_trace.php +++ b/html/Oscilloscope/CH1/1_Trace/form_trace.php @@ -1,6 +1,6 @@ -
+
diff --git a/html/Oscilloscope/CH1/2_Attn/form_attn.php b/html/Oscilloscope/CH1/2_Attn/form_attn.php index 4e181c6..9b48a4a 100644 --- a/html/Oscilloscope/CH1/2_Attn/form_attn.php +++ b/html/Oscilloscope/CH1/2_Attn/form_attn.php @@ -1,6 +1,6 @@ -
+ diff --git a/html/Oscilloscope/CH1/4_Vdiv/form_volt_div.php b/html/Oscilloscope/CH1/4_Vdiv/form_volt_div.php index ca58d55..02227a1 100644 --- a/html/Oscilloscope/CH1/4_Vdiv/form_volt_div.php +++ b/html/Oscilloscope/CH1/4_Vdiv/form_volt_div.php @@ -1,12 +1,11 @@ - + diff --git a/html/Oscilloscope/CH1/6_Filtre/cmd_filtre.php b/html/Oscilloscope/CH1/6_Filtre/cmd_filtre.php index e5516d3..6bbbd17 100644 --- a/html/Oscilloscope/CH1/6_Filtre/cmd_filtre.php +++ b/html/Oscilloscope/CH1/6_Filtre/cmd_filtre.php @@ -14,7 +14,6 @@ }else{ $filt_c1 = shell_exec('lxi scpi -a '.$adresse.' "c1:filt?"'); } - /* TODO : Probleme (Voir erreur /var/log/apache2/error.log) */ /* Commande type de filtre CH1 */ if(array_key_exists('c1_filts',$_POST)){ $c1filts=$_POST['c1_filts']; diff --git a/html/Oscilloscope/CH1/6_Filtre/form_filtre.php b/html/Oscilloscope/CH1/6_Filtre/form_filtre.php index fcaae6a..7605e02 100644 --- a/html/Oscilloscope/CH1/6_Filtre/form_filtre.php +++ b/html/Oscilloscope/CH1/6_Filtre/form_filtre.php @@ -1,6 +1,6 @@ - +
-
+
diff --git a/html/Oscilloscope/CH2/1_Trace/form_trace.php b/html/Oscilloscope/CH2/1_Trace/form_trace.php index 1cd0278..c80bcf9 100644 --- a/html/Oscilloscope/CH2/1_Trace/form_trace.php +++ b/html/Oscilloscope/CH2/1_Trace/form_trace.php @@ -1,6 +1,6 @@ - +
diff --git a/html/Oscilloscope/CH2/2_Attn/form_attn.php b/html/Oscilloscope/CH2/2_Attn/form_attn.php index e4ae5b2..b356c20 100644 --- a/html/Oscilloscope/CH2/2_Attn/form_attn.php +++ b/html/Oscilloscope/CH2/2_Attn/form_attn.php @@ -1,6 +1,6 @@ -
+ diff --git a/html/Oscilloscope/CH2/4_Vdiv/form_volt_div.php b/html/Oscilloscope/CH2/4_Vdiv/form_volt_div.php index 6e1c1e7..3122ed4 100644 --- a/html/Oscilloscope/CH2/4_Vdiv/form_volt_div.php +++ b/html/Oscilloscope/CH2/4_Vdiv/form_volt_div.php @@ -1,12 +1,11 @@ - + diff --git a/html/Oscilloscope/CH2/6_Filtre/form_filtre.php b/html/Oscilloscope/CH2/6_Filtre/form_filtre.php index f00989a..c5a6126 100644 --- a/html/Oscilloscope/CH2/6_Filtre/form_filtre.php +++ b/html/Oscilloscope/CH2/6_Filtre/form_filtre.php @@ -1,6 +1,6 @@ - +
- -
+
diff --git a/html/Oscilloscope/Curseurs/1_Choix/form_choix.php b/html/Oscilloscope/Curseurs/1_Choix/form_choix.php index c01ba39..9fece70 100644 --- a/html/Oscilloscope/Curseurs/1_Choix/form_choix.php +++ b/html/Oscilloscope/Curseurs/1_Choix/form_choix.php @@ -1,6 +1,6 @@ - + diff --git a/html/Oscilloscope/Global/2_Cmd/form_run_stop_aset.php b/html/Oscilloscope/Global/2_Cmd/form_run_stop_aset.php index 3f07203..54ec88a 100644 --- a/html/Oscilloscope/Global/2_Cmd/form_run_stop_aset.php +++ b/html/Oscilloscope/Global/2_Cmd/form_run_stop_aset.php @@ -1,6 +1,6 @@ - + diff --git a/html/Oscilloscope/Global/3_Trigger/form_trigger_mode.php b/html/Oscilloscope/Global/3_Trigger/form_trigger_mode.php index cb3f554..82cc68d 100644 --- a/html/Oscilloscope/Global/3_Trigger/form_trigger_mode.php +++ b/html/Oscilloscope/Global/3_Trigger/form_trigger_mode.php @@ -1,6 +1,6 @@ - + diff --git a/html/Oscilloscope/commandes_oscilloscope.php b/html/Oscilloscope/commandes_oscilloscope.php index 96a9209..b37504e 100644 --- a/html/Oscilloscope/commandes_oscilloscope.php +++ b/html/Oscilloscope/commandes_oscilloscope.php @@ -1,15 +1,17 @@ '; echo '
'; /* Affichage image */ @@ -16,54 +11,33 @@ echo '
'; echo '

Panel de commande

'; echo '
'; - echo '
'; - echo ''; - echo '
'; - foreach($files as $Fich){ - $path = $chemin.'/'.$Fich; + //$chemin = getcwd().'/'.$Appareil[$i]['type']; + //$files = array_diff(scandir($chemin),array('..','.')); + echo '
'; + /* On parcourt l'arborescence pour trouver les fichiers 'form_fichiers.php' + * Ces fichiers affichent les différents boutons correspondant aux commandes de l'appareil */ + foreach($files as $dir){ + $path = $chemin.'/'.$dir; if(is_dir($path)){ - echo '
'; - echo '

'; - $files = array_diff(scandir($path),array('..','.')); - foreach($files as $dir){ - $path2 = $path.'/'.$dir; + $sub_dir = array_diff(scandir($path),array('..','.')); + echo '

'; + foreach($sub_dir as $new_dir){ + $path2 = $path.'/'.$new_dir; if(is_dir($path2)){ - $files2 = array_diff(scandir($path2),array('..','.')); - foreach($files2 as $form){ + $fichiers = array_diff(scandir($path2),array('..','.')); + foreach($fichiers as $form){ $path3 = $path2.'/'.$form; if(is_file($path3) && strpos($path3,"form")!=false){ include($path3); - echo '
'; } } } } - echo '

'; - echo '
'; + echo '
'; } } echo '
'; echo '
'; echo '
'; - echo '
'; ?> diff --git a/html/Oscilloscope_onglets/CH1/1_Trace/cmd_trace.php b/html/Oscilloscope_onglets/CH1/1_Trace/cmd_trace.php new file mode 100644 index 0000000..f4600b0 --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/1_Trace/cmd_trace.php @@ -0,0 +1,12 @@ + diff --git a/html/Oscilloscope_onglets/CH1/1_Trace/form_trace.php b/html/Oscilloscope_onglets/CH1/1_Trace/form_trace.php new file mode 100644 index 0000000..6ba27ff --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/1_Trace/form_trace.php @@ -0,0 +1,6 @@ + + + + +
+ diff --git a/html/Oscilloscope_onglets/CH1/2_Attn/cmd_attn.php b/html/Oscilloscope_onglets/CH1/2_Attn/cmd_attn.php new file mode 100644 index 0000000..be4add1 --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/2_Attn/cmd_attn.php @@ -0,0 +1,8 @@ + diff --git a/html/Oscilloscope_onglets/CH1/2_Attn/form_attn.php b/html/Oscilloscope_onglets/CH1/2_Attn/form_attn.php new file mode 100644 index 0000000..4e181c6 --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/2_Attn/form_attn.php @@ -0,0 +1,24 @@ + + +
+ + +
+ diff --git a/html/Oscilloscope_onglets/CH1/3_Unite/cmd_unite.php b/html/Oscilloscope_onglets/CH1/3_Unite/cmd_unite.php new file mode 100644 index 0000000..5f2a08d --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/3_Unite/cmd_unite.php @@ -0,0 +1,8 @@ + diff --git a/html/Oscilloscope_onglets/CH1/3_Unite/form_unite.php b/html/Oscilloscope_onglets/CH1/3_Unite/form_unite.php new file mode 100644 index 0000000..1aa019a --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/3_Unite/form_unite.php @@ -0,0 +1,10 @@ + + +
+ + +
+ diff --git a/html/Oscilloscope_onglets/CH1/4_Vdiv/cmd_volt_div.php b/html/Oscilloscope_onglets/CH1/4_Vdiv/cmd_volt_div.php new file mode 100644 index 0000000..0b20ac5 --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/4_Vdiv/cmd_volt_div.php @@ -0,0 +1,14 @@ + diff --git a/html/Oscilloscope_onglets/CH1/4_Vdiv/form_volt_div.php b/html/Oscilloscope_onglets/CH1/4_Vdiv/form_volt_div.php new file mode 100644 index 0000000..dc5b454 --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/4_Vdiv/form_volt_div.php @@ -0,0 +1,25 @@ + + + +
+ + +
+ diff --git a/html/Oscilloscope_onglets/CH1/5_Couplage/cmd_couplage.php b/html/Oscilloscope_onglets/CH1/5_Couplage/cmd_couplage.php new file mode 100644 index 0000000..21a1f9c --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/5_Couplage/cmd_couplage.php @@ -0,0 +1,8 @@ + diff --git a/html/Oscilloscope_onglets/CH1/5_Couplage/form_couplage.php b/html/Oscilloscope_onglets/CH1/5_Couplage/form_couplage.php new file mode 100644 index 0000000..b8b758c --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/5_Couplage/form_couplage.php @@ -0,0 +1,11 @@ + + +
+ + +
+ diff --git a/html/Oscilloscope_onglets/CH1/6_Filtre/cmd_filtre.php b/html/Oscilloscope_onglets/CH1/6_Filtre/cmd_filtre.php new file mode 100644 index 0000000..6bbbd17 --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/6_Filtre/cmd_filtre.php @@ -0,0 +1,36 @@ +=$limite_sup){ + $limite_inf=$limite_sup-5; + } + shell_exec('lxi scpi -a '.$adresse.' "c1:filts type,'.$c1filts.',upplimit,'.$limite_sup.'MHz,lowlimit,'.$limite_inf.'MHz"'); + } + } + $c1filts=shell_exec('lxi scpi -a '.$adresse.' "c1:filts?"'); +?> diff --git a/html/Oscilloscope_onglets/CH1/6_Filtre/form_filtre.php b/html/Oscilloscope_onglets/CH1/6_Filtre/form_filtre.php new file mode 100644 index 0000000..fcaae6a --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/6_Filtre/form_filtre.php @@ -0,0 +1,72 @@ + + +
+ +
+ "; + if(strpos($c1filts,"LP")!=false){ + echo "
"; + }else if(strpos($c1filts,"HP")!=false){ + echo ""; + }else{ + echo ""; + } + echo '
'; + echo ""; + echo ""; + if(strpos($c1filts,"LP")!=false){ + $limite = strstr($c1filts,"UPPLIMIT"); + $lim_sup=floatval(substr($limite,9,-4)); + echo ''; + echo ''; + echo '
'; + echo 'Fréquence : '.$lim_sup.' MHz'; + echo '
'; + }else if(strpos($c1filts,"HP")!=false){ + $limite = strstr($c1filts,"LOWLIMIT"); + $lim_inf=floatval(substr($limite,9,-4)); + echo ''; + echo ''; + echo '
'; + echo 'Fréquence : '.$lim_inf.' MHz'; + echo '
'; + }else{ + $limite = strstr($c1filts,"UPPLIMIT"); + $lim_sup=floatval(substr($limite,9,-4)); + $limite = strstr($c1filts,"LOWLIMIT"); + $lim_inf=floatval(substr($limite,9,-4)); + echo ''; + echo ''; + echo '
'; + echo 'Fréquence : '.$lim_sup.' MHz'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo 'Fréquence : '.$lim_inf.' MHz'; + echo '
'; + } + echo '
'; + echo "
"; + }else{ + echo "OFF"; + } + ?> + diff --git a/html/Oscilloscope_onglets/CH1/7_Trigger_level/cmd_trig_lvl.php b/html/Oscilloscope_onglets/CH1/7_Trigger_level/cmd_trig_lvl.php new file mode 100644 index 0000000..2d1ed30 --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/7_Trigger_level/cmd_trig_lvl.php @@ -0,0 +1,8 @@ + diff --git a/html/Oscilloscope_onglets/CH1/7_Trigger_level/form_trig_lvl.php b/html/Oscilloscope_onglets/CH1/7_Trigger_level/form_trig_lvl.php new file mode 100644 index 0000000..c6c2ce2 --- /dev/null +++ b/html/Oscilloscope_onglets/CH1/7_Trigger_level/form_trig_lvl.php @@ -0,0 +1,12 @@ + + + +
+ + +
+ Trigger level : V +
+ diff --git a/html/Oscilloscope_onglets/CH2/1_Trace/cmd_trace.php b/html/Oscilloscope_onglets/CH2/1_Trace/cmd_trace.php new file mode 100644 index 0000000..baeca03 --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/1_Trace/cmd_trace.php @@ -0,0 +1,13 @@ + diff --git a/html/Oscilloscope_onglets/CH2/1_Trace/form_trace.php b/html/Oscilloscope_onglets/CH2/1_Trace/form_trace.php new file mode 100644 index 0000000..1cd0278 --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/1_Trace/form_trace.php @@ -0,0 +1,6 @@ + + +
+ +
+ diff --git a/html/Oscilloscope_onglets/CH2/2_Attn/cmd_attn.php b/html/Oscilloscope_onglets/CH2/2_Attn/cmd_attn.php new file mode 100644 index 0000000..1ead050 --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/2_Attn/cmd_attn.php @@ -0,0 +1,8 @@ + diff --git a/html/Oscilloscope_onglets/CH2/2_Attn/form_attn.php b/html/Oscilloscope_onglets/CH2/2_Attn/form_attn.php new file mode 100644 index 0000000..e4ae5b2 --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/2_Attn/form_attn.php @@ -0,0 +1,24 @@ + + +
+ + +
+ diff --git a/html/Oscilloscope_onglets/CH2/3_Unite/cmd_unite.php b/html/Oscilloscope_onglets/CH2/3_Unite/cmd_unite.php new file mode 100644 index 0000000..6d97ae5 --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/3_Unite/cmd_unite.php @@ -0,0 +1,8 @@ + diff --git a/html/Oscilloscope_onglets/CH2/3_Unite/form_unite.php b/html/Oscilloscope_onglets/CH2/3_Unite/form_unite.php new file mode 100644 index 0000000..a8820a2 --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/3_Unite/form_unite.php @@ -0,0 +1,10 @@ + + +
+ + +
+ diff --git a/html/Oscilloscope_onglets/CH2/4_Vdiv/cmd_volt_div.php b/html/Oscilloscope_onglets/CH2/4_Vdiv/cmd_volt_div.php new file mode 100644 index 0000000..5208e5d --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/4_Vdiv/cmd_volt_div.php @@ -0,0 +1,14 @@ + diff --git a/html/Oscilloscope_onglets/CH2/4_Vdiv/form_volt_div.php b/html/Oscilloscope_onglets/CH2/4_Vdiv/form_volt_div.php new file mode 100644 index 0000000..e15c796 --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/4_Vdiv/form_volt_div.php @@ -0,0 +1,25 @@ + + + +
+ + +
+ diff --git a/html/Oscilloscope_onglets/CH2/5_Couplage/cmd_couplage.php b/html/Oscilloscope_onglets/CH2/5_Couplage/cmd_couplage.php new file mode 100644 index 0000000..dd88220 --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/5_Couplage/cmd_couplage.php @@ -0,0 +1,8 @@ + diff --git a/html/Oscilloscope_onglets/CH2/5_Couplage/form_couplage.php b/html/Oscilloscope_onglets/CH2/5_Couplage/form_couplage.php new file mode 100644 index 0000000..42d21f4 --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/5_Couplage/form_couplage.php @@ -0,0 +1,11 @@ + + +
+ + +
+ diff --git a/html/Oscilloscope_onglets/CH2/6_Filtre/cmd_filtre.php b/html/Oscilloscope_onglets/CH2/6_Filtre/cmd_filtre.php new file mode 100644 index 0000000..25ef700 --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/6_Filtre/cmd_filtre.php @@ -0,0 +1,36 @@ +=$limite_sup){ + $limite_inf=$limite_sup-5; + } + shell_exec('lxi scpi -a '.$adresse.' "c2:filts type,'.$c2filts.',upplimit,'.$limite_sup.'MHz,lowlimit,'.$limite_inf.'MHz"'); + } + } + $c2filts=shell_exec('lxi scpi -a '.$adresse.' "c2:filts?"'); +?> diff --git a/html/Oscilloscope_onglets/CH2/6_Filtre/form_filtre.php b/html/Oscilloscope_onglets/CH2/6_Filtre/form_filtre.php new file mode 100644 index 0000000..f00989a --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/6_Filtre/form_filtre.php @@ -0,0 +1,72 @@ + + +
+ +
+ "; + if(strpos($c2filts,"LP")!=false){ + echo "
"; + }else if(strpos($c2filts,"HP")!=false){ + echo ""; + }else{ + echo ""; + } + echo '
'; + echo ""; + echo ""; + if(strpos($c2filts,"LP")!=false){ + $limite = strstr($c2filts,"UPPLIMIT"); + $lim_sup=floatval(substr($limite,9,-4)); + echo ''; + echo ''; + echo '
'; + echo 'Fréquence : '.$lim_sup.' MHz'; + echo '
'; + }else if(strpos($c2filts,"HP")!=false){ + $limite = strstr($c2filts,"LOWLIMIT"); + $lim_inf=floatval(substr($limite,9,-4)); + echo ''; + echo ''; + echo '
'; + echo 'Fréquence : '.$lim_inf.' MHz'; + echo '
'; + }else{ + $limite = strstr($c2filts,"UPPLIMIT"); + $lim_sup=floatval(substr($limite,9,-4)); + $limite = strstr($c2filts,"LOWLIMIT"); + $lim_inf=floatval(substr($limite,9,-4)); + echo ''; + echo ''; + echo '
'; + echo 'Fréquence : '.$lim_sup.' MHz'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo 'Fréquence : '.$lim_inf.' MHz'; + echo '
'; + } + echo '
'; + echo "
"; + }else{ + echo "OFF"; + } + ?> + diff --git a/html/Oscilloscope_onglets/CH2/7_Trigger_level/cmd_trig_lvl.php b/html/Oscilloscope_onglets/CH2/7_Trigger_level/cmd_trig_lvl.php new file mode 100644 index 0000000..90ced24 --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/7_Trigger_level/cmd_trig_lvl.php @@ -0,0 +1,8 @@ + diff --git a/html/Oscilloscope_onglets/CH2/7_Trigger_level/form_trig_lvl.php b/html/Oscilloscope_onglets/CH2/7_Trigger_level/form_trig_lvl.php new file mode 100644 index 0000000..6c372ee --- /dev/null +++ b/html/Oscilloscope_onglets/CH2/7_Trigger_level/form_trig_lvl.php @@ -0,0 +1,12 @@ + + + +
+ + +
+ Trigger level : V +
+ diff --git a/html/Oscilloscope_onglets/Curseurs/1_Choix/cmd_choix.php b/html/Oscilloscope_onglets/Curseurs/1_Choix/cmd_choix.php new file mode 100644 index 0000000..0917232 --- /dev/null +++ b/html/Oscilloscope_onglets/Curseurs/1_Choix/cmd_choix.php @@ -0,0 +1,8 @@ + diff --git a/html/Oscilloscope_onglets/Curseurs/1_Choix/form_choix.php b/html/Oscilloscope_onglets/Curseurs/1_Choix/form_choix.php new file mode 100644 index 0000000..c01ba39 --- /dev/null +++ b/html/Oscilloscope_onglets/Curseurs/1_Choix/form_choix.php @@ -0,0 +1,11 @@ + + +
+ + +
+ diff --git a/html/Oscilloscope_onglets/Curseurs/2_Affichage_curseurs/cmd_affichage_curseurs.php b/html/Oscilloscope_onglets/Curseurs/2_Affichage_curseurs/cmd_affichage_curseurs.php new file mode 100644 index 0000000..83c10b3 --- /dev/null +++ b/html/Oscilloscope_onglets/Curseurs/2_Affichage_curseurs/cmd_affichage_curseurs.php @@ -0,0 +1,50 @@ + diff --git a/html/Oscilloscope_onglets/Curseurs/2_Affichage_curseurs/form_affichage_curseurs.php b/html/Oscilloscope_onglets/Curseurs/2_Affichage_curseurs/form_affichage_curseurs.php new file mode 100644 index 0000000..2426453 --- /dev/null +++ b/html/Oscilloscope_onglets/Curseurs/2_Affichage_curseurs/form_affichage_curseurs.php @@ -0,0 +1,78 @@ + + + '; + echo '
'; + if(strpos($trace_c1,"ON")!=false or strpos($trace_c2,"ON")!=false){ + echo ''; + echo ''; + } + echo ''; + echo ''; + echo '
'; + echo 'Division : '.$valueA.''; + echo '
'; + /* Curseur B */ + echo ''; + echo ''; + echo '
'; + echo 'Division : '.$valueB.''; + echo '
'; + echo '
'; + echo ''; + }else if(strpos($crms,"VREL")!=false){ + $valueA=floatval(substr($vrelA,13)); + $valueB=floatval(substr($vrelB,13)); + /* Curseur A */ + echo '
'; + echo '
'; + if(strpos($trace_c1,"ON")!=false or strpos($trace_c2,"ON")!=false){ + echo ''; + echo ''; + } + echo ''; + echo ''; + echo '
'; + echo 'Division : '.$valueA.''; + echo '
'; + /* Curseur B */ + echo ''; + echo ''; + echo '
'; + echo 'Division : '.$valueB.''; + echo '
'; + echo '
'; + echo '
'; + } + ?> + diff --git a/html/Oscilloscope_onglets/Global/1_Mode_acqw/cmd_acqw.php b/html/Oscilloscope_onglets/Global/1_Mode_acqw/cmd_acqw.php new file mode 100644 index 0000000..0f08033 --- /dev/null +++ b/html/Oscilloscope_onglets/Global/1_Mode_acqw/cmd_acqw.php @@ -0,0 +1,14 @@ + diff --git a/html/Oscilloscope_onglets/Global/1_Mode_acqw/form_acqw.php b/html/Oscilloscope_onglets/Global/1_Mode_acqw/form_acqw.php new file mode 100644 index 0000000..3724bdc --- /dev/null +++ b/html/Oscilloscope_onglets/Global/1_Mode_acqw/form_acqw.php @@ -0,0 +1,38 @@ + + +
+ + +
+ '; + echo ''; + echo ''; + echo ''; + } + ?> + diff --git a/html/Oscilloscope_onglets/Global/2_Cmd/cmd_run_stop_aset.php b/html/Oscilloscope_onglets/Global/2_Cmd/cmd_run_stop_aset.php new file mode 100644 index 0000000..a3b0ba0 --- /dev/null +++ b/html/Oscilloscope_onglets/Global/2_Cmd/cmd_run_stop_aset.php @@ -0,0 +1,14 @@ + diff --git a/html/Oscilloscope_onglets/Global/2_Cmd/form_run_stop_aset.php b/html/Oscilloscope_onglets/Global/2_Cmd/form_run_stop_aset.php new file mode 100644 index 0000000..3f07203 --- /dev/null +++ b/html/Oscilloscope_onglets/Global/2_Cmd/form_run_stop_aset.php @@ -0,0 +1,8 @@ + + +
+ + + +
+ diff --git a/html/Oscilloscope_onglets/Global/3_Trigger/cmd_trigger_mode.php b/html/Oscilloscope_onglets/Global/3_Trigger/cmd_trigger_mode.php new file mode 100644 index 0000000..5a46743 --- /dev/null +++ b/html/Oscilloscope_onglets/Global/3_Trigger/cmd_trigger_mode.php @@ -0,0 +1,8 @@ + diff --git a/html/Oscilloscope_onglets/Global/3_Trigger/form_trigger_mode.php b/html/Oscilloscope_onglets/Global/3_Trigger/form_trigger_mode.php new file mode 100644 index 0000000..cb3f554 --- /dev/null +++ b/html/Oscilloscope_onglets/Global/3_Trigger/form_trigger_mode.php @@ -0,0 +1,12 @@ + + +
+ + +
+ diff --git a/html/Oscilloscope_onglets/Global/4_Temps_par_div/cmd_temps_div.php b/html/Oscilloscope_onglets/Global/4_Temps_par_div/cmd_temps_div.php new file mode 100644 index 0000000..9f5415a --- /dev/null +++ b/html/Oscilloscope_onglets/Global/4_Temps_par_div/cmd_temps_div.php @@ -0,0 +1,9 @@ + diff --git a/html/Oscilloscope_onglets/Global/4_Temps_par_div/form_temps_div.php b/html/Oscilloscope_onglets/Global/4_Temps_par_div/form_temps_div.php new file mode 100644 index 0000000..df5d665 --- /dev/null +++ b/html/Oscilloscope_onglets/Global/4_Temps_par_div/form_temps_div.php @@ -0,0 +1,40 @@ + + +
+ + +
+ diff --git a/html/Oscilloscope_onglets/Global/5_Menu/cmd_menu.php b/html/Oscilloscope_onglets/Global/5_Menu/cmd_menu.php new file mode 100644 index 0000000..9cf02b0 --- /dev/null +++ b/html/Oscilloscope_onglets/Global/5_Menu/cmd_menu.php @@ -0,0 +1,10 @@ + diff --git a/html/Oscilloscope_onglets/Global/5_Menu/form_menu.php b/html/Oscilloscope_onglets/Global/5_Menu/form_menu.php new file mode 100644 index 0000000..094e959 --- /dev/null +++ b/html/Oscilloscope_onglets/Global/5_Menu/form_menu.php @@ -0,0 +1,7 @@ + + +
+ + +
+ diff --git a/html/Oscilloscope_onglets/commandes_oscilloscope.php b/html/Oscilloscope_onglets/commandes_oscilloscope.php new file mode 100644 index 0000000..96a9209 --- /dev/null +++ b/html/Oscilloscope_onglets/commandes_oscilloscope.php @@ -0,0 +1,22 @@ + diff --git a/html/Oscilloscope_onglets/main_oscilloscope.php b/html/Oscilloscope_onglets/main_oscilloscope.php new file mode 100644 index 0000000..fbaa853 --- /dev/null +++ b/html/Oscilloscope_onglets/main_oscilloscope.php @@ -0,0 +1,69 @@ + + + '; + echo '
'; + /* Affichage image */ + include('./Scripts/creation_img.php'); + echo '
'; + echo '
'; + /* Commandes de l'appareil */ + echo '
'; + echo '

Panel de commande

'; + echo '
'; + echo '
'; + echo ''; + echo '
'; + foreach($files as $Fich){ + $path = $chemin.'/'.$Fich; + if(is_dir($path)){ + echo '
'; + echo '

'; + $files = array_diff(scandir($path),array('..','.')); + foreach($files as $dir){ + $path2 = $path.'/'.$dir; + if(is_dir($path2)){ + $files2 = array_diff(scandir($path2),array('..','.')); + foreach($files2 as $form){ + $path3 = $path2.'/'.$form; + if(is_file($path3) && strpos($path3,"form")!=false){ + include($path3); + echo '
'; + } + } + } + } + echo '

'; + echo '
'; + } + } + echo '
'; + echo '
'; + echo '
'; + echo '
'; + ?> + diff --git a/html/Oscilloscope_test/CH1/1_Trace/cmd_trace.php b/html/Oscilloscope_test/CH1/1_Trace/cmd_trace.php deleted file mode 100644 index f4600b0..0000000 --- a/html/Oscilloscope_test/CH1/1_Trace/cmd_trace.php +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/html/Oscilloscope_test/CH1/1_Trace/form_trace.php b/html/Oscilloscope_test/CH1/1_Trace/form_trace.php deleted file mode 100644 index db61a58..0000000 --- a/html/Oscilloscope_test/CH1/1_Trace/form_trace.php +++ /dev/null @@ -1,6 +0,0 @@ - - -
- -
- diff --git a/html/Oscilloscope_test/CH1/2_Attn/cmd_attn.php b/html/Oscilloscope_test/CH1/2_Attn/cmd_attn.php deleted file mode 100644 index be4add1..0000000 --- a/html/Oscilloscope_test/CH1/2_Attn/cmd_attn.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/html/Oscilloscope_test/CH1/2_Attn/form_attn.php b/html/Oscilloscope_test/CH1/2_Attn/form_attn.php deleted file mode 100644 index 9b48a4a..0000000 --- a/html/Oscilloscope_test/CH1/2_Attn/form_attn.php +++ /dev/null @@ -1,24 +0,0 @@ - - -
- - -
- diff --git a/html/Oscilloscope_test/CH1/3_Unite/cmd_unite.php b/html/Oscilloscope_test/CH1/3_Unite/cmd_unite.php deleted file mode 100644 index 5f2a08d..0000000 --- a/html/Oscilloscope_test/CH1/3_Unite/cmd_unite.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/html/Oscilloscope_test/CH1/3_Unite/form_unite.php b/html/Oscilloscope_test/CH1/3_Unite/form_unite.php deleted file mode 100644 index 3bf6329..0000000 --- a/html/Oscilloscope_test/CH1/3_Unite/form_unite.php +++ /dev/null @@ -1,10 +0,0 @@ - - -
- - -
- diff --git a/html/Oscilloscope_test/CH1/4_Vdiv/cmd_volt_div.php b/html/Oscilloscope_test/CH1/4_Vdiv/cmd_volt_div.php deleted file mode 100644 index 0b20ac5..0000000 --- a/html/Oscilloscope_test/CH1/4_Vdiv/cmd_volt_div.php +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/html/Oscilloscope_test/CH1/4_Vdiv/form_volt_div.php b/html/Oscilloscope_test/CH1/4_Vdiv/form_volt_div.php deleted file mode 100644 index 9d9ef64..0000000 --- a/html/Oscilloscope_test/CH1/4_Vdiv/form_volt_div.php +++ /dev/null @@ -1,26 +0,0 @@ - - - -
- - -
- diff --git a/html/Oscilloscope_test/CH1/5_Couplage/cmd_couplage.php b/html/Oscilloscope_test/CH1/5_Couplage/cmd_couplage.php deleted file mode 100644 index 21a1f9c..0000000 --- a/html/Oscilloscope_test/CH1/5_Couplage/cmd_couplage.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/html/Oscilloscope_test/CH1/5_Couplage/form_couplage.php b/html/Oscilloscope_test/CH1/5_Couplage/form_couplage.php deleted file mode 100644 index c4b0733..0000000 --- a/html/Oscilloscope_test/CH1/5_Couplage/form_couplage.php +++ /dev/null @@ -1,11 +0,0 @@ - - -
- - -
- diff --git a/html/Oscilloscope_test/CH1/6_Filtre/cmd_filtre.php b/html/Oscilloscope_test/CH1/6_Filtre/cmd_filtre.php deleted file mode 100644 index e5516d3..0000000 --- a/html/Oscilloscope_test/CH1/6_Filtre/cmd_filtre.php +++ /dev/null @@ -1,37 +0,0 @@ -=$limite_sup){ - $limite_inf=$limite_sup-5; - } - shell_exec('lxi scpi -a '.$adresse.' "c1:filts type,'.$c1filts.',upplimit,'.$limite_sup.'MHz,lowlimit,'.$limite_inf.'MHz"'); - } - } - $c1filts=shell_exec('lxi scpi -a '.$adresse.' "c1:filts?"'); -?> diff --git a/html/Oscilloscope_test/CH1/6_Filtre/form_filtre.php b/html/Oscilloscope_test/CH1/6_Filtre/form_filtre.php deleted file mode 100644 index 7605e02..0000000 --- a/html/Oscilloscope_test/CH1/6_Filtre/form_filtre.php +++ /dev/null @@ -1,72 +0,0 @@ - - -
- -
- "; - if(strpos($c1filts,"LP")!=false){ - echo "
"; - }else if(strpos($c1filts,"HP")!=false){ - echo ""; - }else{ - echo ""; - } - echo '
'; - echo ""; - echo ""; - if(strpos($c1filts,"LP")!=false){ - $limite = strstr($c1filts,"UPPLIMIT"); - $lim_sup=floatval(substr($limite,9,-4)); - echo ''; - echo ''; - echo '
'; - echo 'Fréquence : '.$lim_sup.' MHz'; - echo '
'; - }else if(strpos($c1filts,"HP")!=false){ - $limite = strstr($c1filts,"LOWLIMIT"); - $lim_inf=floatval(substr($limite,9,-4)); - echo ''; - echo ''; - echo '
'; - echo 'Fréquence : '.$lim_inf.' MHz'; - echo '
'; - }else{ - $limite = strstr($c1filts,"UPPLIMIT"); - $lim_sup=floatval(substr($limite,9,-4)); - $limite = strstr($c1filts,"LOWLIMIT"); - $lim_inf=floatval(substr($limite,9,-4)); - echo ''; - echo ''; - echo '
'; - echo 'Fréquence : '.$lim_sup.' MHz'; - echo '
'; - echo ''; - echo ''; - echo '
'; - echo 'Fréquence : '.$lim_inf.' MHz'; - echo '
'; - } - echo '
'; - echo "
"; - }else{ - echo "OFF"; - } - ?> - diff --git a/html/Oscilloscope_test/CH1/7_Trigger_level/cmd_trig_lvl.php b/html/Oscilloscope_test/CH1/7_Trigger_level/cmd_trig_lvl.php deleted file mode 100644 index 2d1ed30..0000000 --- a/html/Oscilloscope_test/CH1/7_Trigger_level/cmd_trig_lvl.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/html/Oscilloscope_test/CH1/7_Trigger_level/form_trig_lvl.php b/html/Oscilloscope_test/CH1/7_Trigger_level/form_trig_lvl.php deleted file mode 100644 index 160ad10..0000000 --- a/html/Oscilloscope_test/CH1/7_Trigger_level/form_trig_lvl.php +++ /dev/null @@ -1,13 +0,0 @@ - - - -
- - -
- Trigger level : V -
- diff --git a/html/Oscilloscope_test/CH2/1_Trace/cmd_trace.php b/html/Oscilloscope_test/CH2/1_Trace/cmd_trace.php deleted file mode 100644 index baeca03..0000000 --- a/html/Oscilloscope_test/CH2/1_Trace/cmd_trace.php +++ /dev/null @@ -1,13 +0,0 @@ - diff --git a/html/Oscilloscope_test/CH2/1_Trace/form_trace.php b/html/Oscilloscope_test/CH2/1_Trace/form_trace.php deleted file mode 100644 index c80bcf9..0000000 --- a/html/Oscilloscope_test/CH2/1_Trace/form_trace.php +++ /dev/null @@ -1,6 +0,0 @@ - - -
- -
- diff --git a/html/Oscilloscope_test/CH2/2_Attn/cmd_attn.php b/html/Oscilloscope_test/CH2/2_Attn/cmd_attn.php deleted file mode 100644 index 1ead050..0000000 --- a/html/Oscilloscope_test/CH2/2_Attn/cmd_attn.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/html/Oscilloscope_test/CH2/2_Attn/form_attn.php b/html/Oscilloscope_test/CH2/2_Attn/form_attn.php deleted file mode 100644 index b356c20..0000000 --- a/html/Oscilloscope_test/CH2/2_Attn/form_attn.php +++ /dev/null @@ -1,24 +0,0 @@ - - -
- - -
- diff --git a/html/Oscilloscope_test/CH2/3_Unite/cmd_unite.php b/html/Oscilloscope_test/CH2/3_Unite/cmd_unite.php deleted file mode 100644 index 6d97ae5..0000000 --- a/html/Oscilloscope_test/CH2/3_Unite/cmd_unite.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/html/Oscilloscope_test/CH2/3_Unite/form_unite.php b/html/Oscilloscope_test/CH2/3_Unite/form_unite.php deleted file mode 100644 index 5c65ad6..0000000 --- a/html/Oscilloscope_test/CH2/3_Unite/form_unite.php +++ /dev/null @@ -1,10 +0,0 @@ - - -
- - -
- diff --git a/html/Oscilloscope_test/CH2/4_Vdiv/cmd_volt_div.php b/html/Oscilloscope_test/CH2/4_Vdiv/cmd_volt_div.php deleted file mode 100644 index 5208e5d..0000000 --- a/html/Oscilloscope_test/CH2/4_Vdiv/cmd_volt_div.php +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/html/Oscilloscope_test/CH2/4_Vdiv/form_volt_div.php b/html/Oscilloscope_test/CH2/4_Vdiv/form_volt_div.php deleted file mode 100644 index 22ad507..0000000 --- a/html/Oscilloscope_test/CH2/4_Vdiv/form_volt_div.php +++ /dev/null @@ -1,26 +0,0 @@ - - - -
- - -
- diff --git a/html/Oscilloscope_test/CH2/5_Couplage/cmd_couplage.php b/html/Oscilloscope_test/CH2/5_Couplage/cmd_couplage.php deleted file mode 100644 index dd88220..0000000 --- a/html/Oscilloscope_test/CH2/5_Couplage/cmd_couplage.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/html/Oscilloscope_test/CH2/5_Couplage/form_couplage.php b/html/Oscilloscope_test/CH2/5_Couplage/form_couplage.php deleted file mode 100644 index 4c8faef..0000000 --- a/html/Oscilloscope_test/CH2/5_Couplage/form_couplage.php +++ /dev/null @@ -1,11 +0,0 @@ - - -
- - -
- diff --git a/html/Oscilloscope_test/CH2/6_Filtre/cmd_filtre.php b/html/Oscilloscope_test/CH2/6_Filtre/cmd_filtre.php deleted file mode 100644 index 25ef700..0000000 --- a/html/Oscilloscope_test/CH2/6_Filtre/cmd_filtre.php +++ /dev/null @@ -1,36 +0,0 @@ -=$limite_sup){ - $limite_inf=$limite_sup-5; - } - shell_exec('lxi scpi -a '.$adresse.' "c2:filts type,'.$c2filts.',upplimit,'.$limite_sup.'MHz,lowlimit,'.$limite_inf.'MHz"'); - } - } - $c2filts=shell_exec('lxi scpi -a '.$adresse.' "c2:filts?"'); -?> diff --git a/html/Oscilloscope_test/CH2/6_Filtre/form_filtre.php b/html/Oscilloscope_test/CH2/6_Filtre/form_filtre.php deleted file mode 100644 index c5a6126..0000000 --- a/html/Oscilloscope_test/CH2/6_Filtre/form_filtre.php +++ /dev/null @@ -1,72 +0,0 @@ - - -
- -
- "; - if(strpos($c2filts,"LP")!=false){ - echo "
"; - }else if(strpos($c2filts,"HP")!=false){ - echo ""; - }else{ - echo ""; - } - echo '
'; - echo ""; - echo ""; - if(strpos($c2filts,"LP")!=false){ - $limite = strstr($c2filts,"UPPLIMIT"); - $lim_sup=floatval(substr($limite,9,-4)); - echo ''; - echo ''; - echo '
'; - echo 'Fréquence : '.$lim_sup.' MHz'; - echo '
'; - }else if(strpos($c2filts,"HP")!=false){ - $limite = strstr($c2filts,"LOWLIMIT"); - $lim_inf=floatval(substr($limite,9,-4)); - echo ''; - echo ''; - echo '
'; - echo 'Fréquence : '.$lim_inf.' MHz'; - echo '
'; - }else{ - $limite = strstr($c2filts,"UPPLIMIT"); - $lim_sup=floatval(substr($limite,9,-4)); - $limite = strstr($c2filts,"LOWLIMIT"); - $lim_inf=floatval(substr($limite,9,-4)); - echo ''; - echo ''; - echo '
'; - echo 'Fréquence : '.$lim_sup.' MHz'; - echo '
'; - echo ''; - echo ''; - echo '
'; - echo 'Fréquence : '.$lim_inf.' MHz'; - echo '
'; - } - echo '
'; - echo "
"; - }else{ - echo "OFF"; - } - ?> - diff --git a/html/Oscilloscope_test/CH2/7_Trigger_level/cmd_trig_lvl.php b/html/Oscilloscope_test/CH2/7_Trigger_level/cmd_trig_lvl.php deleted file mode 100644 index 90ced24..0000000 --- a/html/Oscilloscope_test/CH2/7_Trigger_level/cmd_trig_lvl.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/html/Oscilloscope_test/CH2/7_Trigger_level/form_trig_lvl.php b/html/Oscilloscope_test/CH2/7_Trigger_level/form_trig_lvl.php deleted file mode 100644 index 4b5f7b4..0000000 --- a/html/Oscilloscope_test/CH2/7_Trigger_level/form_trig_lvl.php +++ /dev/null @@ -1,13 +0,0 @@ - - - -
- - -
- Trigger level : V -
- diff --git a/html/Oscilloscope_test/Curseurs/1_Choix/cmd_choix.php b/html/Oscilloscope_test/Curseurs/1_Choix/cmd_choix.php deleted file mode 100644 index 0917232..0000000 --- a/html/Oscilloscope_test/Curseurs/1_Choix/cmd_choix.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/html/Oscilloscope_test/Curseurs/1_Choix/form_choix.php b/html/Oscilloscope_test/Curseurs/1_Choix/form_choix.php deleted file mode 100644 index 9fece70..0000000 --- a/html/Oscilloscope_test/Curseurs/1_Choix/form_choix.php +++ /dev/null @@ -1,11 +0,0 @@ - - -
- - -
- diff --git a/html/Oscilloscope_test/Curseurs/2_Affichage_curseurs/cmd_affichage_curseurs.php b/html/Oscilloscope_test/Curseurs/2_Affichage_curseurs/cmd_affichage_curseurs.php deleted file mode 100644 index 83c10b3..0000000 --- a/html/Oscilloscope_test/Curseurs/2_Affichage_curseurs/cmd_affichage_curseurs.php +++ /dev/null @@ -1,50 +0,0 @@ - diff --git a/html/Oscilloscope_test/Curseurs/2_Affichage_curseurs/form_affichage_curseurs.php b/html/Oscilloscope_test/Curseurs/2_Affichage_curseurs/form_affichage_curseurs.php deleted file mode 100644 index dd28b72..0000000 --- a/html/Oscilloscope_test/Curseurs/2_Affichage_curseurs/form_affichage_curseurs.php +++ /dev/null @@ -1,78 +0,0 @@ - - - '; - echo '
'; - if(strpos($trace_c1,"ON")!=false or strpos($trace_c2,"ON")!=false){ - echo ''; - echo ''; - } - echo ''; - echo ''; - echo '
'; - echo 'Division : '.$valueA.''; - echo '
'; - /* Curseur B */ - echo ''; - echo ''; - echo '
'; - echo 'Division : '.$valueB.''; - echo '
'; - echo '
'; - echo ''; - }else if(strpos($crms,"VREL")!=false){ - $valueA=floatval(substr($vrelA,13)); - $valueB=floatval(substr($vrelB,13)); - /* Curseur A */ - echo '
'; - echo '
'; - if(strpos($trace_c1,"ON")!=false or strpos($trace_c2,"ON")!=false){ - echo ''; - echo ''; - } - echo ''; - echo ''; - echo '
'; - echo 'Division : '.$valueA.''; - echo '
'; - /* Curseur B */ - echo ''; - echo ''; - echo '
'; - echo 'Division : '.$valueB.''; - echo '
'; - echo '
'; - echo '
'; - } - ?> - diff --git a/html/Oscilloscope_test/Global/1_Mode_acqw/cmd_acqw.php b/html/Oscilloscope_test/Global/1_Mode_acqw/cmd_acqw.php deleted file mode 100644 index 0f08033..0000000 --- a/html/Oscilloscope_test/Global/1_Mode_acqw/cmd_acqw.php +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/html/Oscilloscope_test/Global/1_Mode_acqw/form_acqw.php b/html/Oscilloscope_test/Global/1_Mode_acqw/form_acqw.php deleted file mode 100644 index f28f0b0..0000000 --- a/html/Oscilloscope_test/Global/1_Mode_acqw/form_acqw.php +++ /dev/null @@ -1,38 +0,0 @@ - - -
- - -
- '; - echo ''; - echo ''; - echo ''; - } - ?> - diff --git a/html/Oscilloscope_test/Global/2_Cmd/cmd_run_stop_aset.php b/html/Oscilloscope_test/Global/2_Cmd/cmd_run_stop_aset.php deleted file mode 100644 index a3b0ba0..0000000 --- a/html/Oscilloscope_test/Global/2_Cmd/cmd_run_stop_aset.php +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/html/Oscilloscope_test/Global/2_Cmd/form_run_stop_aset.php b/html/Oscilloscope_test/Global/2_Cmd/form_run_stop_aset.php deleted file mode 100644 index 54ec88a..0000000 --- a/html/Oscilloscope_test/Global/2_Cmd/form_run_stop_aset.php +++ /dev/null @@ -1,8 +0,0 @@ - - -
- - - -
- diff --git a/html/Oscilloscope_test/Global/3_Trigger/cmd_trigger_mode.php b/html/Oscilloscope_test/Global/3_Trigger/cmd_trigger_mode.php deleted file mode 100644 index 5a46743..0000000 --- a/html/Oscilloscope_test/Global/3_Trigger/cmd_trigger_mode.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/html/Oscilloscope_test/Global/3_Trigger/form_trigger_mode.php b/html/Oscilloscope_test/Global/3_Trigger/form_trigger_mode.php deleted file mode 100644 index 82cc68d..0000000 --- a/html/Oscilloscope_test/Global/3_Trigger/form_trigger_mode.php +++ /dev/null @@ -1,12 +0,0 @@ - - -
- - -
- diff --git a/html/Oscilloscope_test/Global/4_Temps_par_div/cmd_temps_div.php b/html/Oscilloscope_test/Global/4_Temps_par_div/cmd_temps_div.php deleted file mode 100644 index 9f5415a..0000000 --- a/html/Oscilloscope_test/Global/4_Temps_par_div/cmd_temps_div.php +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/html/Oscilloscope_test/Global/4_Temps_par_div/form_temps_div.php b/html/Oscilloscope_test/Global/4_Temps_par_div/form_temps_div.php deleted file mode 100644 index 5f8aa1c..0000000 --- a/html/Oscilloscope_test/Global/4_Temps_par_div/form_temps_div.php +++ /dev/null @@ -1,40 +0,0 @@ - - -
- - -
- diff --git a/html/Oscilloscope_test/Global/5_Menu/cmd_menu.php b/html/Oscilloscope_test/Global/5_Menu/cmd_menu.php deleted file mode 100644 index 9cf02b0..0000000 --- a/html/Oscilloscope_test/Global/5_Menu/cmd_menu.php +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/html/Oscilloscope_test/Global/5_Menu/form_menu.php b/html/Oscilloscope_test/Global/5_Menu/form_menu.php deleted file mode 100644 index 094e959..0000000 --- a/html/Oscilloscope_test/Global/5_Menu/form_menu.php +++ /dev/null @@ -1,7 +0,0 @@ - - -
- - -
- diff --git a/html/Oscilloscope_test/commandes_oscilloscope.php b/html/Oscilloscope_test/commandes_oscilloscope.php deleted file mode 100644 index 96a9209..0000000 --- a/html/Oscilloscope_test/commandes_oscilloscope.php +++ /dev/null @@ -1,22 +0,0 @@ - diff --git a/html/Oscilloscope_test/main_oscilloscope.php b/html/Oscilloscope_test/main_oscilloscope.php deleted file mode 100644 index 2e0ba1d..0000000 --- a/html/Oscilloscope_test/main_oscilloscope.php +++ /dev/null @@ -1,45 +0,0 @@ - - - '; - echo '
'; - /* Affichage image */ - include('./Scripts/creation_img.php'); - echo '
'; - echo '
'; - /* Commandes de l'appareil */ - echo '
'; - echo '

Panel de commande

'; - echo '
'; - $chemin = getcwd().'/'.$Appareil[$i]['type']; - $files = array_diff(scandir($chemin),array('..','.')); - echo '
'; - foreach($files as $Fich){ - $path = $chemin.'/'.$Fich; - if(is_dir($path)){ - $files = array_diff(scandir($path),array('..','.')); - if($Fich!="Menus"){ - echo '
'; - } - foreach($files as $dir){ - $path2 = $path.'/'.$dir; - if(is_dir($path2)){ - $new_dir = array_diff(scandir($path2),array('..','.')); - foreach($new_dir as $form){ - $path3 = $path2.'/'.$form; - if(is_file($path3) && strpos($path3,"form")!=false){ - include($path3); - } - } - } - } - if($Fich!="Menus"){ - echo '
'; - } - } - } - echo '
'; - echo '
'; - echo '
'; - ?> - diff --git a/html/Scripts/creation_img.php b/html/Scripts/creation_img.php index bbf7023..cc01383 100644 --- a/html/Scripts/creation_img.php +++ b/html/Scripts/creation_img.php @@ -1,14 +1,14 @@ "; ?> diff --git a/html/Scripts/refresh_img.php b/html/Scripts/refresh_img.php index 653b4a0..7995f2e 100644 --- a/html/Scripts/refresh_img.php +++ b/html/Scripts/refresh_img.php @@ -1,7 +1,7 @@ "; + echo ""; + } +?> diff --git a/html/bdd.json b/html/bdd.json index c24b79b..1d33305 100644 --- a/html/bdd.json +++ b/html/bdd.json @@ -1,10 +1,10 @@ [ { "name": "SDS1102CML+", - "appareil": "Oscilloscope_test" + "appareil": "Oscilloscope" }, { "name": "SDG1032X", - "appareil": "Generateur_test" + "appareil": "Generateur" } ] diff --git a/html/decouvre.php b/html/decouvre.php index 994631a..361c440 100644 --- a/html/decouvre.php +++ b/html/decouvre.php @@ -34,17 +34,21 @@ - +

- +
- +

+ + +
"; echo ""; echo ""; - for($i=0;$i<=$nb-1;$i++){ /* On affiche tous les appareils trouvés en enlevant la derniere ligne qui correspond au nombre d'appareils trouvés */ - $infos = $Devices[$i].'$'.$Types[$i].'$'.$Adresses[$i]; - echo ""; + for($i=0;$i<=$nb-1;$i++){ /* On affiche tous les appareils trouvés */ + $infos = $Devices[$i].'$'.$Types[$i].'$'.$Adresses[$i]; /* Pour envoyer les données vers la page main, les informations sont séparées par des '$' */ + /* Les informations sont stockées dans un tableau, ce qui est simple a recuperer */ + echo ""; echo "".$Devices[$i].""; echo "".$Types[$i].""; echo "".$Adresses[$i].""; @@ -107,23 +110,20 @@ } echo ""; echo ""; - /* Bouton d'envoi des donnees de l'appareil choisi */ - echo ""; - echo '
'; + /* Bouton d'envoi */ + echo ""; echo ""; } ?> - diff --git a/html/index.html b/html/index.html index 3c9e510..843dd8f 100644 --- a/html/index.html +++ b/html/index.html @@ -13,6 +13,7 @@ +

Appuyez pour rechercher les appareils utilisables

@@ -24,13 +25,15 @@
diff --git a/html/main.php b/html/main.php index 331794b..6f60a72 100644 --- a/html/main.php +++ b/html/main.php @@ -13,20 +13,27 @@ + -
+ +
+
- -

+ + +
+ + +
"; - echo "Nom : ".$nom."
"; - echo "Adresse : ".$adresse."
"; - echo 'Type : '.$type.'
'; - echo "
";*/ $Appareil[$number-1]['nom'] = $nom; $Appareil[$number-1]['type'] = $type; $Appareil[$number-1]['adresse'] = $adresse; @@ -54,14 +54,7 @@ $donnees=explode("$",$element); $nom = $donnees[0]; $type = $donnees[1]; - $adresse = $donnees[2]; - /* DEBUG */ - /* Affichage des données de l'appareil (nom,type et adresse IP) */ - /*echo "Données de l'appareil $number choisi :
"; - echo "Nom : ".$nom."
"; - echo "Adresse : ".$adresse."
"; - echo 'Type : '.$type.'
'; - echo "
";*/ + $adresse = $donnees[2]; $Appareil[$number-1]['nom'] = $nom; $Appareil[$number-1]['type'] = $type; $Appareil[$number-1]['adresse'] = $adresse; @@ -71,65 +64,62 @@ echo "Pas de sélection réalisée, vous allez être redirigé"; echo ""; } - /*if(isset($_GET['tab'])){ - $tab=$_GET['tab']; - }else{ - $tab="Global"; + + /* DEBUG */ + /* Affichage des données de l'appareil (nom,type et adresse IP) */ + /*for($i=1;$i<=count($Appareil);$i++){ + echo "Données de l'appareil $i choisi :
"; + echo "Nom : ".$nom."
"; + echo "Adresse : ".$adresse."
"; + echo 'Type : '.$type.'
'; + echo "
"; }*/ - /* TODO : Noms des variables plus clair */ + /* Recherche des fichiers 'commandes_type.php' dans les dossiers des types d'appareils sélectionnés + * Ces fichiers vont effectuer les commandes de l'appareil si un bouton est utilisé */ for($i=0;$i

+ diff --git a/html/type_appareil.php b/html/type_appareil.php deleted file mode 100644 index 8955253..0000000 --- a/html/type_appareil.php +++ /dev/null @@ -1,14 +0,0 @@ - alert('Appareil non reconnu') "; - echo ""; - } -?> -- libgit2 0.21.2