@@ -1301,39 +1299,39 @@
bindData()
}
else {
-
+ alert('comm error')
}
},
error: function () {
- data = {
- lineinput: {
- signal: "analog",
- audio: -30,
- state: "open"
- },
- mic1: {
- signal: "open",
- audio: -5,
- state: "open"
- },
- mic2: {
- signal: "open",
- audio: 5,
- state: "open"
- },
- output: {
- signal: "open",
- audio: 3,
- state: "open"
- }
- }
+ // data = {
+ // lineinput: {
+ // signal: "analog",
+ // audio: -30,
+ // state: "open"
+ // },
+ // mic1: {
+ // signal: "open",
+ // audio: -5,
+ // state: "open"
+ // },
+ // mic2: {
+ // signal: "open",
+ // audio: 5,
+ // state: "open"
+ // },
+ // output: {
+ // signal: "open",
+ // audio: 3,
+ // state: "open"
+ // }
+ // }
- lineinputValue = data.lineinput.audio
- mic1Value = data.mic1.audio
- mic2Value = data.mic2.audio
- outputValue = data.output.audio
+ // lineinputValue = data.lineinput.audio
+ // mic1Value = data.mic1.audio
+ // mic2Value = data.mic2.audio
+ // outputValue = data.output.audio
- bindData()
+ // bindData()
}
})
@@ -1361,7 +1359,7 @@
function LineInputSlider(number) {
-
+
let element = $('#lineinput')
let input = $("#lineinput .volume-slider input")
let value = (parseInt(number) + 72) / (84 / 100)
@@ -1410,7 +1408,7 @@
}
function Microphone1Slider(number) {
-
+
let element = $("#microphone1")
let input = $("#microphone1 .volume-slider input")
let value = (parseInt(number) + 10) / (20 / 100)
@@ -1457,7 +1455,7 @@
}
function Microphone2Slider(number) {
-
+
let element = $('#microphone2')
let input = $("#microphone2 .volume-slider input")
@@ -1507,7 +1505,7 @@
function OutputVolumeSlider(number) {
-
+
let element = $('#outputvolume')
let input = $("#outputvolume .volume-slider input")
diff --git a/js/equalizer.js b/js/equalizer.js
index 0a8eff5..d1d89ec 100644
--- a/js/equalizer.js
+++ b/js/equalizer.js
@@ -26,31 +26,36 @@ $(function () {
// console.log(e.data);
// console.log(typeof (e.data))
var eqData = $.parseJSON(e.data).content
- let number = eqData.value
- if (eqData.value < -72) {
- number = -72
- }
- if (eqData.value > 0) {
- number = 0
- }
- // console.log(number)
- if (eqData.module == "linein_L") {
- LineInputLeftRandomBar(number)
- }
- else if (eqData.module == "linein_R") {
- LineInputRightRandomBar(number)
- }
- else if (eqData.module == "output_L") {
- OutputVolumeLeftRandomBar(number);
- }
- else if (eqData.module == "output_R") {
- OutputVolumeRightRandomBar(number);
- }
- else if (eqData.module == "mic1") {
- Microphone1LeftRandomBar(number)
+ if (eqData.action == '') {
+ loadData()
}
else {
- Microphone2LeftRandomBar(number)
+ let number = eqData.value
+ if (eqData.value < -72) {
+ number = -72
+ }
+ if (eqData.value > 0) {
+ number = 0
+ }
+ // console.log(number)
+ if (eqData.module == "linein_L") {
+ LineInputLeftRandomBar(number)
+ }
+ else if (eqData.module == "linein_R") {
+ LineInputRightRandomBar(number)
+ }
+ else if (eqData.module == "output_L") {
+ OutputVolumeLeftRandomBar(number);
+ }
+ else if (eqData.module == "output_R") {
+ OutputVolumeRightRandomBar(number);
+ }
+ else if (eqData.module == "mic1") {
+ Microphone1LeftRandomBar(number)
+ }
+ else {
+ Microphone2LeftRandomBar(number)
+ }
}
}
ws.onclose = function (e) {
diff --git a/js/main.js b/js/main.js
index 1267c4c..a5ff29c 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,9 +1,9 @@
$(document).ready(function () {
- $("#blink").on('click',function(){
-
+ $("#blink").on('click', function () {
+ console.log('click','#blink')
let url = '/cgi-bin/test.cgi';
let postData = {
- action:'blink'
+ action: 'blink'
}
$.ajax({
@@ -11,7 +11,6 @@ $(document).ready(function () {
url: url,
data: postData,
dataType: "json",
- //contentType: "application/json; charset=utf-8",
success: function (res) {
if (res.success) {
data = res.content
diff --git a/system.bin b/system.bin
new file mode 100644
index 0000000..00fb766
--- /dev/null
+++ b/system.bin
@@ -0,0 +1,238 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/system.html b/system.html
index 427f444..e026184 100644
--- a/system.html
+++ b/system.html
@@ -162,21 +162,35 @@
});
$("#upgrade").on("click", function () {
-
- let url = 'http://192.168.0.116/cgi-bin/test.cgi?action=upgrade';
+ console.log($('#uploadFile')[0].files[0])
+ console.log($('#uploadFile')[0].files[0].name)
+ console.log($('#uploadFile')[0].files[0].size)
+ let url = 'http://192.168.0.116/cgi-bin/test.cgi';
+ var filenum = parseInt($('#uploadFile')[0].files[0].size)
var formData = new FormData();
- formData.append('file', $('#fileName')[0].file[0])
+ formData.append('action', 'upgrade')
+ formData.append('name', $('#uploadFile')[0].files[0].name)
+ formData.append('file', $('#uploadFile')[0].files[0])
+ formData.append('size', filenum)
+
+ if (filenum > 8388608) {
+ alert("file to big!file is less than 8M!");
+ return;
+ }
$.ajax({
type: 'POST',
url: url,
data: formData,
- dataType: "json",
- //contentType: "application/json; charset=utf-8",
+ dataType: 'json',
+ type: 'POST',
+ async: false,
+ processData: false, // 使数据不做处理
+ contentType: false, // 不要设置Content-Type请求头
success: function (res) {
if (res.success) {
data = res.content
- alert('upgrade')
+ window.location.reload(true);
}
else {
alert(res.message)