Skip to content

Commit 3cdd85d

Browse files
jtguggedaljtguggedal
committed
Update to bitwise motor direction, laser
- Bitwise motor direction settings - Laser on when game session started - Minor BLE fixes
1 parent e543e78 commit 3cdd85d

File tree

6 files changed

+483
-156
lines changed

6 files changed

+483
-156
lines changed

‎controllers.html

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
2+
<!-- Controllers: joystick and button -->
3+
<div id="control-container">
4+
<div id="cool-down-bar-container" class="wait-till-game">
5+
<div id="cool-down-bar">
6+
</div>
7+
</div>
8+
9+
<div id="joystick-container" class="wait-till-game">
10+
</div>
11+
12+
<div id="points" class="wait-till-game">
13+
</div>
14+
<div id="slotmachine-container">
15+
<div id="slotmachine">
16+
<span></span>
17+
</div>
18+
</div>
19+
<div id="game-message">
20+
</div>
21+
<div id="message-container">
22+
<div id="message">
23+
</div>
24+
<div id="game-info">
25+
</div>
26+
</div>
27+
<div id="btn-gamemenu-container">
28+
<div id="btn-singleplayer" class="button-main-menu">
29+
<img src="img/singleplayer.png">
30+
Singleplayer
31+
</div>
32+
<div id="btn-create-game" class="button-main-menu">
33+
<img src="img/multiplayer.png">
34+
Create Game
35+
</div>
36+
<div id="btn-join-game" class="button-main-menu">
37+
<img src="img/joingame.png">
38+
Join Game
39+
</div>
40+
<div id="btn-settings" class="button-main-menu">
41+
<img src="img/settings.png">
42+
Settings
43+
</div>
44+
<div id="btn-reconnect" class="button-main-menu">
45+
<img src="img/bluetoothlogo.png">
46+
Reconnect
47+
</div>
48+
<div id="btn-home" class="button-main-menu">
49+
<img src="img/home.png">
50+
Home
51+
</div>
52+
</div>
53+
<div id="btn-join-container">
54+
<div id='btn-join-popup' class='button'>
55+
Join
56+
</div>
57+
<div id="btn-return" class="button">
58+
Return
59+
</div>
60+
</div>
61+
<div id="count-down">
62+
</div>
63+
<div id="static" class ="wait-till-game">
64+
</div>
65+
66+
<div id="fire-button-container" >
67+
<div id="control-button" class="wait-till-game">
68+
</div>
69+
</div>
70+
<div id="btn-menu" class="wait-till-game">
71+
<img src="img/menu.png">
72+
</div>
73+
<div id="slide-menu">
74+
<div id="slide-menu-btn-container">
75+
<div id="btn-exit" class="button btn-slide-menu">
76+
Exit Game
77+
</div>
78+
<div id="btn-slotmachine" class="button btn-slide-menu">
79+
Get Powerup
80+
</div>
81+
</div>
82+
</div>
83+
</div>
84+
<div id="status-create-game">
85+
</div>
86+
<script src="js/nipplejs.min.js"></script>
87+
88+
<script>
89+
$('#btn-settings').on('click', function() {
90+
$('#btn-gamemenu-container').fadeOut("slow");
91+
$('#main').fadeOut(200).promise().done(function() {
92+
93+
var time = new Date();
94+
var e = time.getTime();
95+
$('#main').load('settings.html?' + e).promise().done( function() { $(this).fadeIn(200)});
96+
});
97+
});
98+
</script>
99+
100+
<!-- Include demo version of the car controllers -->
101+
<script src="js/game.js">
102+
</script>

‎index.html

+6-7
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
<meta charset="utf-8">
77
<meta name="viewport" content="width=device-width, initial-scale=1.0">
8-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-beta1/jquery.js"></script>
9-
<script type="text/javascript" src="js/jquery.mobile-events.js"></script>
10-
<script src="js/gatt.js"></script>
8+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js"></script>
9+
<script src="js/ble.js"></script>
1110
<link rel="stylesheet" type="text/css" href="css/slotmachine.css"></link>
1211
<link rel="stylesheet" type="text/css" href="css/stylesheet.css?"></link>
1312
<link rel="stylesheet" type="text/css" href="css/controllers.css"></link>
@@ -26,11 +25,11 @@
2625
</div>
2726
<div id="connectionStatus">Connection status</div>
2827

29-
<div id="fullscreen" onclick="">Klikk for fullskjerm</div>
28+
<div id="fullscreen" onclick="">Click for fullscreen</div>
3029

3130
<div id="main">
3231

33-
<h1 id="welcome">Physical Web Toy</h1>
32+
<h1 id="welcome">Physical Web Car</h1>
3433
<div id="main-message">
3534
<div onclick="game_init();" id='connect' class="button-main-menu">
3635
<img src="img/play.png">
@@ -59,7 +58,7 @@ <h1 id="welcome">Physical Web Toy</h1>
5958
var time = new Date();
6059
var e = time.getTime();
6160
setTimeout(function() {
62-
$('#main').load('include/controllers.html?t=1' + e);
61+
$('#main').load('controllers.html?t=' + e);
6362
}, 1000);
6463
}
6564

@@ -69,7 +68,7 @@ <h1 id="welcome">Physical Web Toy</h1>
6968

7069

7170
<script>
72-
// Funksjon for å vise siden i fullskjerm
71+
// Enable fullscreen
7372
function toggleFullscreen(elem) {
7473
elem = elem || document.documentElement;
7574
if (!document.fullscreenElement && !document.mozFullScreenElement &&

‎js/gatt.js ‎js/ble.js

+40-40
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
// Functions for connecting to BLE device and setting up main service and characteristics //
33
// //
44
// connect Searches for devices that matches the filter criterias //
5-
// notificationCharacteristicHandler Sets up event listener for the notification characteristic //
5+
// notificationCharHandler Sets up event listener for the notification characteristic //
66
// handleNotification Event handler for changes in the notifications //
7-
// readWriteCharacteristicHandler Sets up the readWriteCharacteristic //
8-
// readFromCharacteristic Function for reading values from the readWriteCharacteristic //
9-
// writeToCharacteristic Function for reading chosen values from the readWriteCharacterstic //
7+
// readWriteCharHandler Sets up the readWriteCharacteristic //
8+
// readFromChar Function for reading values from the readWriteCharacteristic //
9+
// writeToChar Function for reading chosen values from the readWriteCharacterstic //
1010

1111

1212
//* Creatig BLE object
1313
var ble = {
1414
/** Declaring the necessary global variables **/
1515
mainServiceUUID : '00001523-1212-efde-1523-785feabcd123',
16-
readWriteCharacteristicUUID : '00001525-1212-efde-1523-785feabcd123',
17-
notificationCharacteristicUUID : '00001524-1212-efde-1523-785feabcd123',
16+
readWriteCharUUID : '00001525-1212-efde-1523-785feabcd123',
17+
notificationCharUUID : '00001524-1212-efde-1523-785feabcd123',
1818
bluetoothDevice : '',
1919
mainServer : '',
2020
mainService : '',
21-
readWriteCharacteristic : '',
22-
notificationCharacteristic : '',
21+
readWriteChar : '',
22+
notificationChar : '',
2323
notificationContent : '',
2424
charVal : new Uint8Array(20),
2525
prevNotification : '',
@@ -31,21 +31,21 @@ var ble = {
3131
// Searching for Bluetooth devices that match the filter criteria
3232
console.log('Requesting Bluetooth Device...');
3333
navigator.bluetooth.requestDevice(
34-
{filters: [{services: [this.mainServiceUUID]}]})
35-
.then(device => {
36-
this.bluetoothDevice = device;
37-
// Adding event listener to detect loss of connection (not used for now because of errors on some phones)
38-
//bluetoothDevice.addEventListener('gattserverdisconnected', disconnectHandler);
39-
console.log('> Found ' + this.bluetoothDevice.name);
40-
console.log('Connecting to GATT Server...');
41-
return this.bluetoothDevice.connectGATT()
42-
.then(gattServer => {
43-
this.mainServer = gattServer;
44-
console.log('> Bluetooth Device connected: ');
45-
this.connectionStatus(1);
34+
{ filters:[{ services: [ this.mainServiceUUID ]}] })
35+
.then(device => {
36+
this.bluetoothDevice = device;
37+
// Adding event listener to detect loss of connection
38+
//bluetoothDevice.addEventListener('gattserverdisconnected', disconnectHandler);
39+
console.log('> Found ' + this.bluetoothDevice.name);
40+
console.log('Connecting to GATT Server...');
41+
return this.bluetoothDevice.connectGATT()
42+
.then(gattServer => {
43+
this.mainServer = gattServer;
44+
console.log('> Bluetooth Device connected: ');
45+
this.connectionStatus(1);
4646

47-
});
48-
})
47+
});
48+
})
4949

5050
// When matching device is found and selected, get the main service
5151
.then(server => {
@@ -58,10 +58,10 @@ var ble = {
5858
console.log('> serviceReturn: ' + service);
5959
return Promise.all([
6060
// Get all characteristics and call handler functions for both
61-
service.getCharacteristic(this.readWriteCharacteristicUUID)
62-
.then(this.readWriteCharacteristicHandler),
63-
service.getCharacteristic(this.notificationCharacteristicUUID)
64-
.then(this.notificationCharacteristicHandler)
61+
service.getCharacteristic(this.readWriteCharUUID)
62+
.then(this.readWriteCharHandler),
63+
service.getCharacteristic(this.notificationCharUUID)
64+
.then(this.notificationCharHandler)
6565
])
6666
// Print errors to console
6767
.catch(error => {
@@ -106,23 +106,23 @@ var ble = {
106106
},
107107

108108
/** Function for setting up the notification characteristic **/
109-
notificationCharacteristicHandler : function(characteristic) {
109+
notificationCharHandler : function(characteristic) {
110110
'use strict';
111111

112112
// Stores the notification characteristic object to ble object for easy access
113-
ble.notificationCharacteristic = characteristic;
113+
ble.notificationChar = characteristic;
114114
console.log('Notifications started.');
115115

116116
// Initiates event listener for notifications sent from DK
117-
ble.notificationCharacteristic.addEventListener('characteristicvaluechanged',ble.handleNotification);
117+
ble.notificationChar.addEventListener('characteristicvaluechanged',ble.handleNotification);
118118
return characteristic.startNotifications();
119119
},
120120

121121
/** Function for handling the read and write characteristic **/
122-
readWriteCharacteristicHandler : function(characteristic) {
122+
readWriteCharHandler : function(characteristic) {
123123
'use strict';
124-
// Stores the readWriteCharacteristic to ble object
125-
ble.readWriteCharacteristic = characteristic;
124+
// Stores the readWriteChar to ble object
125+
ble.readWriteChar = characteristic;
126126
return 1;
127127
},
128128

@@ -155,14 +155,14 @@ var ble = {
155155

156156
/** Function for reading from the read and write characteristic **/
157157
// Parameter byteOffset int, 0-19 or string, 'all'
158-
readFromCharacteristic : function(byteOffset) {
158+
readFromChar : function(byteOffset) {
159159
'use strict';
160160

161161
// Data is sent from DK as a 20 byte long Uint8Array, stores in the data variable
162162
var data = new Uint8Array(20);
163163

164-
// Calls the redValue method in the readWriteCharacteristic
165-
ble.readWriteCharacteristic.readValue()
164+
// Calls the redValue method in the readWriteChar
165+
ble.readWriteChar.readValue()
166166
.then(value => {
167167
// DataView is received from DK
168168
value = value.buffer ? value : new DataView(value);
@@ -191,21 +191,21 @@ var ble = {
191191
/** Function for writing to the read and write characteristic **/
192192
// Parameters byteOffset int, 0-19
193193
// value int, 0-255
194-
writeToCharacteristic : function(byteOffset, value) {
194+
writeToChar : function(byteOffset, value) {
195195
'use strict';
196196

197197
ble.charVal[byteOffset] = value;
198198

199-
ble.readWriteCharacteristic.writeValue(ble.charVal);
199+
ble.readWriteChar.writeValue(ble.charVal);
200200
},
201201

202202
/** Function for writing array to the read and write characteristic **/
203203
// Parameters charVal Uint8Array, maximum 20 bytes long
204-
writeArrayToCharacteristic : function(charVal) {
204+
writeArrayToChar : function(charVal) {
205205
'use strict';
206206

207207
if(game.writePermission) {
208-
ble.readWriteCharacteristic.writeValue(charVal);
208+
ble.readWriteChar.writeValue(charVal);
209209
return 1;
210210
} else {
211211
return 0;
@@ -224,7 +224,7 @@ var ble = {
224224
return 0;
225225
} else {
226226
game.writePermission = 0;
227-
return ble.readWriteCharacteristic.writeValue(charVal)
227+
return ble.readWriteChar.writeValue(charVal)
228228
.then( writeReturn => {
229229
game.writePermission = true;
230230
game.priorityPacket = 0;

0 commit comments

Comments
 (0)