Skip to content

Commit

Permalink
improve contrast
Browse files Browse the repository at this point in the history
  • Loading branch information
@tedh-shopbot
tedh-shopbot committed Jun 17, 2019
1 parent af0fbbd commit 4ebf858
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 10 deletions.
16 changes: 8 additions & 8 deletions css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ body {
/* SVG fallback for IE 9 (could be data URI, or could use filter) */
/* background-image: url(fallback-gradient.svg); */
/* Safari 4, Chrome 1-9, iOS 3.2-4.3, Android 2.1-3.0 */
background-image: -webkit-gradient(linear, left top, right top, from(grey), to(#f06b06c9));
background-image: -webkit-gradient(linear, left top, right top, from(grey), to(#ac4c03c9));
/* Safari 5.1, iOS 5.0-6.1, Chrome 10-25, Android 4.0-4.3 */
background-image: -webkit-linear-gradient(left, grey, #f06d06c9);
background-image: -webkit-linear-gradient(left, grey, #ac4c03c9);
/* Firefox 3.6 - 15 */
background-image: -moz-linear-gradient(left, grey, #f06d06c9);
background-image: -moz-linear-gradient(left, grey, #ac4c03c9);
/* Opera 11.1 - 12 */
background-image: -o-linear-gradient(left, grey, #f06d06c9);
background-image: -o-linear-gradient(left, grey, #ac4c03c9);
/* Opera 15+, Chrome 25+, IE 10+, Firefox 16+, Safari 6.1+, iOS 7+, Android 4.4+ */
background-image: linear-gradient(to right, grey, #f06d06c9);
background-image: linear-gradient(to right, grey, #ac4c03c9);
margin: 0px;

/* background-color: rgb(235,136,55);
Expand All @@ -30,7 +30,7 @@ body.noScroll body.dialogShowing { /* ...or body.dialogShowing */
*/

#inputs, #outputs {
margin-left: 12%;
margin-left: 10%;
}

a.dinput {
Expand Down Expand Up @@ -66,9 +66,9 @@ a.doutput {
border:none;
background-color: transparent;
/* background-color: rgb(235,136,55); */
color: #FFE105;
color: rgb(255, 247, 189);
line-height:100%;
text-shadow: 0 0 0.1em #fff, 0 0 0.2em #fff, 0 0 0.3em #f00;
text-shadow: 0 0 0.1em rgb(253, 255, 105), 0 0 0.2em #fff, 0 0 0.3em #f00;
/*, 0 0 0.4em #77f;
, 0 0 0.6em #00f, 0 0 0.8em #00f, 0 0 1.0em #00f, 0 0 1.2em #00f; */
}
Expand Down
4 changes: 2 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<p class="show-for-medium-up">&nbsp</p>
<div class="callout panel" id="macros">
<!-- Buttons (actions) -->
<button type="button" class="button success large radius macros" id="cut_part_call" style="color:rgba(251, 255, 20, 0.76)"> === CUT PART === </button>
<button type="button" class="button success large radius macros" id="cut_part_call" style="color:rgba(251, 255, 20, 0.76)"> == CUT PART == </button>
<button type="button" class="secondary button large radius macros" id="first_macro_button" style="color:rgba(251, 255, 20, 0.76)">Home X & Y (C3)</button>
<button type="button" class="secondary button large radius macros" id="second_macro_button" style="color:rgba(251, 255, 20, 0.76)" >Set Z Zero (C2)</button>
<p class="show-for-medium-up" title="Access other Macros from left-side menu" style="color:rgba(251, 255, 20, 0.40)">Useful Commands and Macros</p>
Expand All @@ -52,7 +52,7 @@
<div class="small-12 medium-6 columns show-for-small-only">
<div class="callout panel" id="macros">
<!-- Buttons (actions) -->
<button type="button" class="button success large radius macros" id="cut_part_call" style="color:rgba(251, 255, 20, 0.76)"> === CUT PART === </button>
<button type="button" class="button success large radius macros" id="cut_part_call" style="color:rgba(251, 255, 20, 0.76)">== CUT PART ==</button>
<button type="button" class="secondary button large radius macros" id="first_macro_button" style="color:rgba(251, 255, 20, 0.76)">Home X & Y (C3)</button>
<button type="button" class="secondary button large radius macros" id="second_macro_button" style="color:rgba(251, 255, 20, 0.76)" >Set Z Zero (C2)</button>
<p class="show-for-medium-up" title="Access other Macros from left-side menu" style="color:rgba(251, 255, 20, 0.40)">Useful Commands and Macros</p>
Expand Down
29 changes: 29 additions & 0 deletions js/initialize_ready.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
* Most Event Handling
*/

// Global true position tracking
window.globals = {
TOol_x: 0, // REAL LOCATIONS OF TOOL from G2
TOol_y: 0, // ... had to set as windows.globals to get for paperjs
TOol_z: 0, // ... best way for 3js?
TOol_a: 0,
TOol_b: 0,
TOol_c: 0,
G2_state: ""
}

let cmds = [];

$(document).ready(function() {
Expand Down Expand Up @@ -240,6 +251,21 @@ $(document).ready(function() {
// ** STATUS: Report Ongoing and Clear Command Line after a status report is recieved ## Need a clear after esc too
fabmo.on('status', function(status) {
console.log(status.state);

globals.TOol_x = status.posx; // get LOCATION GLOBALS
console.log(globals.TOol_x)
globals.TOol_y = status.posy;
globals.TOol_z = status.posz;
globals.TOol_a = status.posa;
globals.TOol_b = status.posb;
globals.G2_state = status.state;
// and display them
document.getElementById("tool-display-x").innerHTML = (globals.TOol_x<0?"X ":"X +") + globals.TOol_x.toFixed(3);
document.getElementById("tool-display-y").innerHTML = (globals.TOol_y<0?"Y ":"Y +") + globals.TOol_y.toFixed(3);
document.getElementById("tool-display-z").innerHTML = (globals.TOol_z<0?"Z ":"Z +") + globals.TOol_z.toFixed(3);
document.getElementById("tool-display-a").innerHTML = (globals.TOol_a<0?"A ":"A +") + globals.TOol_a.toFixed(2);
document.getElementById("tool-display-b").innerHTML = (globals.TOol_b<0?"B ":"B +") + globals.TOol_b.toFixed(2);

let lineDisplay = "";
if (status.nb_lines > 0) { // If we're running a file ...
lineDisplay = "Running: " + curFilename + '\n'
Expand Down Expand Up @@ -310,5 +336,8 @@ $(document).ready(function() {

//console.log("Speed is: " + speed_XY.toFixed(2));
//console.log("Twice the speed is: " + (2*speed_XY).toFixed(2));

fabmo.requestStatus(); // Trigger first report from tool

});

0 comments on commit 4ebf858

Please sign in to comment.