Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 40 additions & 5 deletions lib/skulpt/microbit/__init__.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ var accelerometer = function(name) {
});

mod.get_y = new Sk.builtin.func(function() {
return new Sk.builtin.number(mod.data.y);
return new Sk.builtin.nmber(mod.data.y);
});

mod.get_z = new Sk.builtin.func(function() {
return new Sk.builtin.number(mod.data.z);
return new Sk.builtin.nmber(mod.data.z);
});

mod.get_values = new Sk.builtin.func(function() {
Expand Down Expand Up @@ -1424,9 +1424,10 @@ var $builtinmodule = function (name) {
html += ' <span id="mb_pin_detail"></span>';
html += '</div>';
html += '<div id="mb_tabs_accelerometer">';
html += 'x: <span id="mb_acc_value_x">0</span><div class="mb_slider" id="mb_acc_slider_x"></div>';
html += 'y: <span id="mb_acc_value_y">0</span><div class="mb_slider" id="mb_acc_slider_y"></div>';
html += 'z: <span id="mb_acc_value_z">9</span><div class="mb_slider" id="mb_acc_slider_z"></div>';
html += 'x: <span id="mb_acc_value_x" class="mb_slider_acc">0</span><div class="mb_slider" id="mb_acc_slider_x"></div>';
html += 'y: <span id="mb_acc_value_y" class="mb_slider_acc">0</span><div class="mb_slider" id="mb_acc_slider_y"></div>';
html += 'z: <span id="mb_acc_value_z" class="mb_slider_acc">9</span><div class="mb_slider" id="mb_acc_slider_z"></div>';
html += '<span id="accel_check"><input type="checkbox" name="accel_check"><label for="accel_check">Move accelerometer with mouse</label></span>';
html += '<h3>Gestures</h3>';
html += '<span class="mb_help_link mb_gesture">up</span>';
html += '<span class="mb_help_link mb_gesture">down</span>';
Expand Down Expand Up @@ -1721,6 +1722,40 @@ var $builtinmodule = function (name) {
step: 1,
change: sliderChange
}).on("slide", sliderChange);

var accel_mouse_timer = null;
$('#accel_check :checkbox').change(function() {
if (this.checked) {
var mousemove_enabled = false;
const offset = $('#microbit').offset();
const height = $('#microbit').height();
const width = $('#microbit').width();
$('#microbit').mousemove(function (event) {
// debounce
if (!mousemove_enabled) {
return;
}
// Micro:bit accel values are +/- 2000, let's do half for sensitivity
const x = ((event.pageX - offset.left) / width) * 2000 - 1000;
const y = ((event.pageY - offset.top) / height) * 2000 - 1000;
mod.accelerometer.$d.data.x = x;
mod.accelerometer.$d.data.y = y;

$('#mb_acc_slider_x').slider('value', x);
$('#mb_acc_slider_y').slider('value', y);
$('#mb_acc_value_x').text(Math.floor(x));
$('#mb_acc_value_y').text(Math.floor(y));
mousemove_enabled = false;
});

accel_mouse_timer = window.setInterval(function () {
mousemove_enabled = true;
}, 30);
} else {
$('#microbit').off('mousemove');
window.clearInterval(accel_mouse_timer);
}
});
$('#mb_therm_slider').slider({
value: 23,
min: 0,
Expand Down
12 changes: 8 additions & 4 deletions lib/skulpt/microbit/mb.css
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
height: 100px;
line-height: 100px;
text-align: center;
vertical-align: center;
vertical-align: middle;
background-image: url('compassbk.jpg');
position: relative;
}
Expand All @@ -119,6 +119,10 @@
display: inline-block;
margin: 0px 10px 0px 10px;
}
.mb_slider_acc {
display: inline-block;
min-width: 2.5em;
}
#mb_gesture_list {
border-style: solid;
border-width: 1px;
Expand All @@ -127,16 +131,16 @@
}
.mb_current_gesture {
color: #F00;
margin; 1em;
margin: 1em;
}
.mb_active_gesture_down {
transform: rotate(180deg);
}
.mb_active_gesture_left, .mb_active_gesture_right {
-webkit-transform: rotateY(80deg);transform: rotateY(80deg);
transform: rotateY(80deg);
}
.mb_active_gesture_facedown {
-webkit-transform: rotateY(180deg);transform: rotateY(180deg);
transform: rotateY(180deg);
}
.mb_active_gesture_freefall {
transform: scale(0.2,0.2);
Expand Down