Sende verdier til DK

Author: jtguggedal

joystick.html

@@ -395,7 +395,7 @@ <h3>Logg</h3>
                             return controlPoint.writeValue(resetEnergyExpended);
                           });*/
 
-                        setTimeout(readWriteCharacteristic.writeValue(charVal), 100);
+                        return myCharacteristic.writeValue(charVal);
                     }
                     // Skriver veriden fra slideren til HTML-elementet med ID 'slider-value'
                     //$('#slider-value').html(sliderVal + '%');
@@ -520,9 +520,7 @@ <h3>Logg</h3>
 
                 if ( diffTop < REVERT_THRESHOLD && diffLeft < REVERT_THRESHOLD ){
                   this.$el.css( initialOffset ).addClass('ease') ;
-                
-
-                resetCharByte(1);
+                setTimeout(resetCharByte(1), 2000);
 
 
 

motor.html

@@ -206,11 +206,11 @@ <h1>Styring av motorer</h1>
                 setBit(10, 'b', speed);
 
                 // Set direction
-                setBit(15, 'b', direction);
+                setBit(14, 'b', direction);
             } else if(power == 0) {
                 // Set speed to 0
                 setBit(10, 'b', 0);
-                setBit(15, 'b', 1);
+                setBit(14, 'b', 1);
             }
 
             if(readWriteCharacteristic) {
@@ -233,11 +233,11 @@ <h1>Styring av motorer</h1>
                 setBit(11, 'b', speed);
 
                 // Set direction
-                setBit(16, 'b', direction);
+                setBit(15, 'b', direction);
             } else if(power == 0) {
                 // Set speed to 0
                 setBit(11, 'b', 0);
-                setBit(16, 'b', 1);
+                setBit(15, 'b', 1);
             }
 
             if(readWriteCharacteristic) {
@@ -258,11 +258,11 @@ <h1>Styring av motorer</h1>
                 setBit(12, 'b', speed);
 
                 // Set direction
-                setBit(17, 'b', direction);
+                setBit(16, 'b', direction);
             } else if(power == 0) {
                 // Set speed to 0
                 setBit(12, 'b', 0);
-                setBit(17, 'b', 1);
+                setBit(16, 'b', 1);
             }
 
             if(readWriteCharacteristic) {
@@ -285,11 +285,11 @@ <h1>Styring av motorer</h1>
                 setBit(13, 'b', speed);
 
                 // Set direction
-                setBit(18, 'b', direction);
+                setBit(17, 'b', direction);
             } else if(power == 0) {
                 // Set speed to 0
                 setBit(13, 'b', 0);
-                setBit(18, 'b', 1);
+                setBit(17, 'b', 1);
             }
 
             if(readWriteCharacteristic) {

read.html

@@ -109,8 +109,10 @@
             padding: 5px;
             background-color: red;
             color: white;
+            visibility: 
         }
 
+
     </style>
 
     <title>Physical Web</title>
@@ -353,6 +355,31 @@ <h3>Logg</h3>
                 $("#sliderLeft").val(outputLeft);
                 $("#sliderRight").val(outputRight);
 
+                var charVal = new Uint8Array(20);
+
+                if( readWriteCharacteristic &&  writePermission == 1 ) {
+
+                    // Sjekker i hvilket intervall slider-verdien er, og sender korresponderende verdi
+                    // via BLE til firmware. 
+                    // Setter 1. bit lik 1 for å tenne 1. LED osv.
+                    writePermission = 0;
+
+                    charVal[16] = outputLeft;
+                    charVal[17] = outputRight;
+
+                    console.log(charVal);
+
+
+                    return readWriteCharacteristic.writeValue(charVal)
+                    .then( writeReturn => {
+                        writePermission = 1;
+                    });
+                } else if (writePermission == 0) {
+                    discardedPackets.push(charVal);
+                }
+            });
+
+
 
 
             });
@@ -396,12 +423,14 @@ <h3>Logg</h3>
                 $("#sliderLeft").val(0);
                 $("#sliderRight").val(0);
 
+                var charVal = new Uint8Array(20);
+
                     setTimeout(function(){
                         if(writePermission)
-                            writeToCharacteristic(1, 0);
+                            readWriteCharacteristic.writeValue(charVal);
                         else {
                             setTimeout(function(){
-                                writeToCharacteristic(1, 0);
+                                readWriteCharacteristic.writeValue(charVal);
                             }, 300);
                         }