- -

- - Exploding Cans -

- - - - - -

- + -

JavaScript required

- This website requires JavaScript to function correctly. - Please enable JavaScript to use this site. -

- -

Navigation menu

- +

JavaScript required

+ This website requires JavaScript to function correctly. + Please enable JavaScript to use this site. -

Help

- +

+ +

+ -

- + -

Controls

- Main controls - - Error and warning messages
- +

Controls

+ Main controls + + Error and warning messages
+ +

- -

diff --git a/testing/MCTXWeb/public_html/index.html b/testing/MCTXWeb/public_html/index.html index b0b3de1..4ffacec 100644 --- a/testing/MCTXWeb/public_html/index.html +++ b/testing/MCTXWeb/public_html/index.html @@ -27,133 +27,139 @@ -

- -

- - Exploding Cans -

- - - - - -

- + -

JavaScript required

- This website requires JavaScript to function correctly. - Please enable JavaScript to use this site. -

- -

Navigation menu

- +

JavaScript required

+ This website requires JavaScript to function correctly. + Please enable JavaScript to use this site. -

Help

- -

Welcome

- Welcome to the MCTX3420 remote pressure vessel experiment site! -

- To explore how this system works, hover over the elements of the - system diagram below. Clicking each element will lead to a new - page that briefly describes that component of the system. -

- For the full documentation, see the project wiki at: - - https://github.com/szmoore/MCTX3420/wiki - -

- To begin a new experiment, use the left navigation pane. -

+ -

System diagram

- - - - - - - - - - - - - - - - + - $("#enclosure-btn").mouseover(function () { - $("#enclosure-area").hilightToggle(true).mouseover(); - }).mouseout(function () { - $("#enclosure-area").hilightToggle(false); - }); - - +

diff --git a/testing/MCTXWeb/public_html/login.html b/testing/MCTXWeb/public_html/login.html index c833e12..c19dd73 100644 --- a/testing/MCTXWeb/public_html/login.html +++ b/testing/MCTXWeb/public_html/login.html @@ -21,49 +21,53 @@ -

- -

- - Exploding Cans + -

- +

+ +

diff --git a/testing/MCTXWeb/public_html/pintest.html b/testing/MCTXWeb/public_html/pintest.html index 10310c7..fbc9411 100644 --- a/testing/MCTXWeb/public_html/pintest.html +++ b/testing/MCTXWeb/public_html/pintest.html @@ -68,148 +68,160 @@ -

- -

- - BBB Pin test (debug only) -

- - - - - -

- + -

- - - - -

PWM explained

The frequency must be a decimal number greater than 0.

- The duty cycle describes the proportion of off/on time per period. - This number is specified as a ratio, with values ranging from 0 to 1. -

- The polarity determines if the duty represents the 'active - high' or 'active low' portion. By default, the duty cycle - represents the 'active high' portion. -

JavaScript required

+ This website requires JavaScript to function correctly. + Please enable JavaScript to use this site. -

+ +

+ + + + +

PWM explained

The frequency must be a decimal number greater than 0.

+ The duty cycle describes the proportion of off/on time per period. + This number is specified as a ratio, with values ranging from 0 to 1. +

+ The polarity determines if the duty represents the 'active + high' or 'active low' portion. By default, the duty cycle + represents the 'active high' portion. +

+ -

Analogue input (ADC)

- +

- - - - - - - - - - - - - - - - - - - - - - - - + +

AIN	0	1	2	3	4	5	6	7
Value
Export									+ GPIO + +	+ PWM + +

- - - - + +

Analogue input (ADC)

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + +

diff --git a/testing/MCTXWeb/public_html/static/sbd4.png b/testing/MCTXWeb/public_html/static/sbd4.png new file mode 100644 index 0000000..04a2688 Binary files /dev/null and b/testing/MCTXWeb/public_html/static/sbd4.png differ diff --git a/testing/MCTXWeb/public_html/static/style.css b/testing/MCTXWeb/public_html/static/style.css index 2ff0cb1..1dd3718 100644 --- a/testing/MCTXWeb/public_html/static/style.css +++ b/testing/MCTXWeb/public_html/static/style.css @@ -5,16 +5,12 @@ url("OpenSans.eot"); } -/** Limit max width and auto-center content **/ -html { - max-width: 1280px; - margin: 0 auto; -} - body { font-family: "Open Sans", "Lucida Grande","Lucida Sans",Verdana,Arial; font-size: 13px; background-color: #F5F5F5; + margin: 0; + padding: 0; } hr { @@ -114,18 +110,21 @@ input[type="text"]:focus, input[type="password"]:focus { box-shadow: 0 0 2px #BBBBBB; } -#header { +#header-wrap { background-color: #2a2a2a; - border-top: 0.8em solid #1188DD; + border-top: 0.3em solid #1188DD; color: #f2f2f2; - padding: 1.5em 2em; - margin-top: -1em; margin-bottom: 1em; box-shadow: 0 0 0.5em #444444; - border-radius: 4px; transition: all 0.2s ease 0s; } +#header { + padding: 1.5em 2em; + max-width: 1280px; + margin: 0 auto; +} + #header input[type="button"], #header input[type="submit"] { background-color: #808080; border: 1px solid #808080; @@ -184,8 +183,14 @@ input[type="text"]:focus, input[type="password"]:focus { font-size: 12px; } -#content { +#content-wrap { padding: 1em 2em; + max-width: 1280px; + margin: 1em auto; +} + +#content { + /*display: none; Enable in non-debug mode*/ }

Experiment name
Experiment mode	- Strain it - Explode it -
-	- - - -

Experiment name
Experiment mode	+ Strain it + Explode it +
+	+ + + +