Skip to content

Commit 159017e

Browse files
jtguggedaljtguggedal
committed
Added balancer control page
1 parent a141c2b commit 159017e

File tree

6 files changed

+172
-12
lines changed

6 files changed

+172
-12
lines changed

‎RGB_controller/.gitignore ‎.gitignore

File renamed without changes.

‎RGB_controller/.tags

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ colorpickerHTMLSnippet .\js\colorpicker.js /^ var colorpickerHTMLSnippet = [$
2222
connect .\js\ble.js /^function connect(callbackOnConnect) {$/;" f
2323
device .\js\ble.js /^var device;$/;" v
2424
enableDragging .\js\colorpicker.js /^ function enableDragging(ctx, element, listener) {$/;" f
25+
enableLogging .\js\ble.js /^var enableLogging = true;$/;" v
2526
hsv2rgb .\js\colorpicker.js /^ function hsv2rgb(hsv) {$/;" f
26-
log .\js\ble.js /^function log(string){$/;" f
2727
mousePosition .\js\colorpicker.js /^ function mousePosition(evt) {$/;" f
2828
onConnect .\index.html /^ function onConnect() {$/;" f
2929
pickerListener .\js\colorpicker.js /^ function pickerListener(ctx, pickerElement) {$/;" f

‎RGB_controller/js/ble.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var device;
22
var server;
33
var service;
44
var characteristic;
5+
var enableLogging = true;
56

67
const serviceUUID = "6e400001-b5a3-f393-e0a9-e50e24dcca9e";
78
const characteristicUUID = "6e400002-b5a3-f393-e0a9-e50e24dcca9e";
@@ -13,36 +14,35 @@ function connect(callbackOnConnect) {
1314
)
1415
.then( d => {
1516
device = d;
16-
log("Found device " + device + ", trying to connect to GATT server");
17+
if(enableLogging)
18+
console.log("Found device " + device + ", trying to connect to GATT server");
1719
return device.gatt.connect();
1820
})
1921
.then( s => {
2022
server = s;
21-
log("Connected to server " + s + ", getting service");
23+
if(enableLogging)
24+
console.log("Connected to server " + s + ", getting service");
2225
return server.getPrimaryService(serviceUUID);
2326
})
2427
.then( sc => {
2528
service = sc;
26-
log("Found service " + service + ", getting characteristic");
29+
if(enableLogging)
30+
console.log("Found service " + service + ", getting characteristic");
2731
return service.getCharacteristic(characteristicUUID);
2832
})
2933
.then(ch => {
3034
characteristic = ch;
31-
log("Characteristic " + characteristic + " found and available globally")
32-
if(callbackOnConnect != undefined)
35+
if(enableLogging)
36+
console.log("Characteristic " + characteristic + " found and available globally")
37+
if(typeof(callbackOnConnect) === "function")
3338
callbackOnConnect();
3439
})
3540
.catch(error => {
36-
log("Error: " + error)
41+
console.log("Error: " + error)
3742
})
3843
}
3944

4045

4146
function sendData(dataArray) {
4247
return characteristic.writeValue(dataArray);
4348
}
44-
45-
46-
function log(string){
47-
console.log(string);
48-
}

‎balancer/css/style.css

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
@import url('https://fonts.googleapis.com/css?family=Lato');
2+
3+
body {
4+
box-sizing: border-box;
5+
font-family: Lato;
6+
}
7+
8+
9+
h1 {
10+
text-align: center;
11+
}
12+
13+
14+
input[type="range"] {
15+
transform: rotate(270deg);
16+
margin-top: 70px;
17+
height: 150px;
18+
}
19+
20+
21+
#wrapper {
22+
margin-left: 40px;
23+
}
24+
25+
26+
#connectWrapper {
27+
width: 250px;
28+
margin: 20px auto 0 auto;
29+
}
30+
31+
#connectBtn {
32+
margin: auto;
33+
padding: 8px 6px;
34+
width: 80px;
35+
font-size: 16px;
36+
font-weight: 700;
37+
text-align: center;
38+
border: 1px solid #c3c3c3;
39+
box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.2);
40+
cursor: pointer;
41+
user-select: none;
42+
background-color: rgb(24, 51, 60);
43+
color: white;
44+
}
45+
46+
47+
#controller-pitch-wrapper {
48+
float: left;
49+
vertical-align: top;
50+
}

‎balancer/index.html

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<html>
2+
<head>
3+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
4+
<link rel="stylesheet" type="text/css" href="css/style.css">
5+
<title>nRF Balancer</title>
6+
</head>
7+
<body>
8+
<div id="wrapper">
9+
<div id="header">
10+
<h1>nRF Balancer</h1>
11+
</div> <!-- / header -->
12+
<div id="connectWrapper">
13+
<div id="connectBtn">
14+
Connect
15+
</div>
16+
</div>
17+
<div id="controllers-wrapper">
18+
<div id="controller-pitch-wrapper">
19+
<input type="range" id="pitch-value" min="1" max="255">
20+
<div id="pitch-value-output">0°</div>
21+
</div>
22+
</div> <!-- / controllers-wrapper -->
23+
24+
</div> <!-- / wrapper -->
25+
<script src="js/ble.js" type="text/javascript"></script>
26+
<script>
27+
const MAX_ANGLE_PITCH = 10;
28+
const PITCH_ANGLE_BYTE_OFFSET = 0;
29+
30+
var connected = false;
31+
var bleBusy = false;
32+
33+
var bleDataArray = new Uint8Array(3);
34+
35+
var elPitchRange = document.querySelector("#pitch-value");
36+
var elPitchOutput = document.querySelector('#pitch-value-output');
37+
var elConnectBtn = document.querySelector('#connectBtn');
38+
39+
elPitchRange.addEventListener("input", function() {
40+
bleDataArray[PITCH_ANGLE_BYTE_OFFSET] = elPitchRange.value;
41+
displayPitchAngle();
42+
if(connected && !bleBusy) {
43+
bleBusy = true;
44+
sendData(bleDataArray)
45+
.then(() => {
46+
bleBusy = false;
47+
console.log("Sent data ", bleDataArray)
48+
});
49+
}
50+
51+
});
52+
elConnectBtn.addEventListener("click", function() {
53+
connect(function(){ connected = true; })
54+
});
55+
56+
function displayPitchAngle() {
57+
elPitchOutput.innerHTML = (MAX_ANGLE_PITCH*(elPitchRange.value - 128)/127).toFixed(1) + "°";
58+
}
59+
</script>
60+
</body>
61+
</html>

‎balancer/js/ble.js

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
2+
var device;
3+
var server;
4+
var service;
5+
var characteristic;
6+
var enableLogging = true;
7+
8+
const serviceUUID = "6e400001-b5a3-f393-e0a9-e50e24dcca9e";
9+
const characteristicUUID = "6e400002-b5a3-f393-e0a9-e50e24dcca9e";
10+
11+
function connect(callbackOnConnect) {
12+
if(enableLogging)
13+
console.log("Scanning for devices with service UUID " + serviceUUID );
14+
navigator.bluetooth.requestDevice(
15+
{filters: [{services: [serviceUUID]}]}
16+
)
17+
.then( d => {
18+
device = d;
19+
if(enableLogging)
20+
console.log("Found device " + device + ", trying to connect to GATT server");
21+
return device.gatt.connect();
22+
})
23+
.then( s => {
24+
server = s;
25+
if(enableLogging)
26+
console.log("Connected to server " + s + ", getting service");
27+
return server.getPrimaryService(serviceUUID);
28+
})
29+
.then( sc => {
30+
service = sc;
31+
if(enableLogging)
32+
console.log("Found service " + service + ", getting characteristic");
33+
return service.getCharacteristic(characteristicUUID);
34+
})
35+
.then(ch => {
36+
characteristic = ch;
37+
if(enableLogging)
38+
console.log("Characteristic " + characteristic + " found and available globally")
39+
if(typeof(callbackOnConnect) === "function")
40+
callbackOnConnect();
41+
})
42+
.catch(error => {
43+
console.log("Error: " + error)
44+
})
45+
}
46+
47+
function sendData(dataArray) {
48+
return characteristic.writeValue(dataArray);
49+
}

0 commit comments

Comments
 (0)