pxt-common-packages 9.4.14 → 9.4.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/built/common-sim.js +66 -66
  2. package/libs/game/sim/keymap.ts +3 -3
  3. package/package.json +1 -1
package/built/common-sim.js CHANGED
@@ -5,11 +5,11 @@ var pxsim;
5
5
  function onGesture(gesture, handler) {
6
6
  let b = pxsim.accelerometer();
7
7
  b.accelerometer.activate();
8
- if (gesture == 11 /* ACCELEROMETER_EVT_SHAKE */ && !b.useShake) {
8
+ if (gesture == 11 /* DAL.ACCELEROMETER_EVT_SHAKE */ && !b.useShake) {
9
9
  b.useShake = true;
10
10
  pxsim.runtime.queueDisplayUpdate();
11
11
  }
12
- pxsim.pxtcore.registerWithDal(13 /* DEVICE_ID_GESTURE */, gesture, handler);
12
+ pxsim.pxtcore.registerWithDal(13 /* DAL.DEVICE_ID_GESTURE */, gesture, handler);
13
13
  }
14
14
  input.onGesture = onGesture;
15
15
  function rotation(kind) {
@@ -99,7 +99,7 @@ var pxsim;
99
99
  this.shake = { x: false, y: false, z: false, count: 0, shaken: 0, timer: 0 }; // State information needed to detect shake events.
100
100
  this.isActive = false;
101
101
  this.sampleRange = 2;
102
- this.id = 5 /* DEVICE_ID_ACCELEROMETER */;
102
+ this.id = 5 /* DAL.DEVICE_ID_ACCELEROMETER */;
103
103
  }
104
104
  setSampleRange(range) {
105
105
  this.activate();
@@ -123,7 +123,7 @@ var pxsim;
123
123
  // Update gesture tracking
124
124
  this.updateGesture();
125
125
  // Indicate that a new sample is available
126
- pxsim.board().bus.queue(this.id, 1 /* ACCELEROMETER_EVT_DATA_UPDATE */);
126
+ pxsim.board().bus.queue(this.id, 1 /* DAL.ACCELEROMETER_EVT_DATA_UPDATE */);
127
127
  }
128
128
  instantaneousAccelerationSquared() {
129
129
  // Use pythagoras theorem to determine the combined force acting on the device.
@@ -144,21 +144,21 @@ var pxsim;
144
144
  //
145
145
  // If we see enough zero crossings in succession (MICROBIT_ACCELEROMETER_SHAKE_COUNT_THRESHOLD), then we decide that the device
146
146
  // has been shaken.
147
- if ((this.getX() < -400 /* ACCELEROMETER_SHAKE_TOLERANCE */ && this.shake.x) || (this.getX() > 400 /* ACCELEROMETER_SHAKE_TOLERANCE */ && !this.shake.x)) {
147
+ if ((this.getX() < -400 /* DAL.ACCELEROMETER_SHAKE_TOLERANCE */ && this.shake.x) || (this.getX() > 400 /* DAL.ACCELEROMETER_SHAKE_TOLERANCE */ && !this.shake.x)) {
148
148
  shakeDetected = true;
149
149
  this.shake.x = !this.shake.x;
150
150
  }
151
- if ((this.getY() < -400 /* ACCELEROMETER_SHAKE_TOLERANCE */ && this.shake.y) || (this.getY() > 400 /* ACCELEROMETER_SHAKE_TOLERANCE */ && !this.shake.y)) {
151
+ if ((this.getY() < -400 /* DAL.ACCELEROMETER_SHAKE_TOLERANCE */ && this.shake.y) || (this.getY() > 400 /* DAL.ACCELEROMETER_SHAKE_TOLERANCE */ && !this.shake.y)) {
152
152
  shakeDetected = true;
153
153
  this.shake.y = !this.shake.y;
154
154
  }
155
- if ((this.getZ() < -400 /* ACCELEROMETER_SHAKE_TOLERANCE */ && this.shake.z) || (this.getZ() > 400 /* ACCELEROMETER_SHAKE_TOLERANCE */ && !this.shake.z)) {
155
+ if ((this.getZ() < -400 /* DAL.ACCELEROMETER_SHAKE_TOLERANCE */ && this.shake.z) || (this.getZ() > 400 /* DAL.ACCELEROMETER_SHAKE_TOLERANCE */ && !this.shake.z)) {
156
156
  shakeDetected = true;
157
157
  this.shake.z = !this.shake.z;
158
158
  }
159
- if (shakeDetected && this.shake.count < 4 /* ACCELEROMETER_SHAKE_COUNT_THRESHOLD */ && ++this.shake.count == 4 /* ACCELEROMETER_SHAKE_COUNT_THRESHOLD */)
159
+ if (shakeDetected && this.shake.count < 4 /* DAL.ACCELEROMETER_SHAKE_COUNT_THRESHOLD */ && ++this.shake.count == 4 /* DAL.ACCELEROMETER_SHAKE_COUNT_THRESHOLD */)
160
160
  this.shake.shaken = 1;
161
- if (++this.shake.timer >= 10 /* ACCELEROMETER_SHAKE_DAMPING */) {
161
+ if (++this.shake.timer >= 10 /* DAL.ACCELEROMETER_SHAKE_DAMPING */) {
162
162
  this.shake.timer = 0;
163
163
  if (this.shake.count > 0) {
164
164
  if (--this.shake.count == 0)
@@ -166,29 +166,29 @@ var pxsim;
166
166
  }
167
167
  }
168
168
  if (this.shake.shaken)
169
- return 11 /* ACCELEROMETER_EVT_SHAKE */;
169
+ return 11 /* DAL.ACCELEROMETER_EVT_SHAKE */;
170
170
  let sq = (n) => n * n;
171
- if (force < sq(400 /* ACCELEROMETER_FREEFALL_TOLERANCE */))
172
- return 7 /* ACCELEROMETER_EVT_FREEFALL */;
173
- if (force > sq(3072 /* ACCELEROMETER_3G_TOLERANCE */))
174
- return 8 /* ACCELEROMETER_EVT_3G */;
175
- if (force > sq(6144 /* ACCELEROMETER_6G_TOLERANCE */))
176
- return 9 /* ACCELEROMETER_EVT_6G */;
177
- if (force > sq(8192 /* ACCELEROMETER_8G_TOLERANCE */))
178
- return 10 /* ACCELEROMETER_EVT_8G */;
171
+ if (force < sq(400 /* DAL.ACCELEROMETER_FREEFALL_TOLERANCE */))
172
+ return 7 /* DAL.ACCELEROMETER_EVT_FREEFALL */;
173
+ if (force > sq(3072 /* DAL.ACCELEROMETER_3G_TOLERANCE */))
174
+ return 8 /* DAL.ACCELEROMETER_EVT_3G */;
175
+ if (force > sq(6144 /* DAL.ACCELEROMETER_6G_TOLERANCE */))
176
+ return 9 /* DAL.ACCELEROMETER_EVT_6G */;
177
+ if (force > sq(8192 /* DAL.ACCELEROMETER_8G_TOLERANCE */))
178
+ return 10 /* DAL.ACCELEROMETER_EVT_8G */;
179
179
  // Determine our posture.
180
- if (this.getX() < (-1000 + 200 /* ACCELEROMETER_TILT_TOLERANCE */))
181
- return 3 /* ACCELEROMETER_EVT_TILT_LEFT */;
182
- if (this.getX() > (1000 - 200 /* ACCELEROMETER_TILT_TOLERANCE */))
183
- return 4 /* ACCELEROMETER_EVT_TILT_RIGHT */;
184
- if (this.getY() < (-1000 + 200 /* ACCELEROMETER_TILT_TOLERANCE */))
185
- return 1 /* ACCELEROMETER_EVT_TILT_UP */;
186
- if (this.getY() > (1000 - 200 /* ACCELEROMETER_TILT_TOLERANCE */))
187
- return 2 /* ACCELEROMETER_EVT_TILT_DOWN */;
188
- if (this.getZ() < (-1000 + 200 /* ACCELEROMETER_TILT_TOLERANCE */))
189
- return 5 /* ACCELEROMETER_EVT_FACE_UP */;
190
- if (this.getZ() > (1000 - 200 /* ACCELEROMETER_TILT_TOLERANCE */))
191
- return 6 /* ACCELEROMETER_EVT_FACE_DOWN */;
180
+ if (this.getX() < (-1000 + 200 /* DAL.ACCELEROMETER_TILT_TOLERANCE */))
181
+ return 3 /* DAL.ACCELEROMETER_EVT_TILT_LEFT */;
182
+ if (this.getX() > (1000 - 200 /* DAL.ACCELEROMETER_TILT_TOLERANCE */))
183
+ return 4 /* DAL.ACCELEROMETER_EVT_TILT_RIGHT */;
184
+ if (this.getY() < (-1000 + 200 /* DAL.ACCELEROMETER_TILT_TOLERANCE */))
185
+ return 1 /* DAL.ACCELEROMETER_EVT_TILT_UP */;
186
+ if (this.getY() > (1000 - 200 /* DAL.ACCELEROMETER_TILT_TOLERANCE */))
187
+ return 2 /* DAL.ACCELEROMETER_EVT_TILT_DOWN */;
188
+ if (this.getZ() < (-1000 + 200 /* DAL.ACCELEROMETER_TILT_TOLERANCE */))
189
+ return 5 /* DAL.ACCELEROMETER_EVT_FACE_UP */;
190
+ if (this.getZ() > (1000 - 200 /* DAL.ACCELEROMETER_TILT_TOLERANCE */))
191
+ return 6 /* DAL.ACCELEROMETER_EVT_FACE_DOWN */;
192
192
  return 0;
193
193
  }
194
194
  updateGesture() {
@@ -196,7 +196,7 @@ var pxsim;
196
196
  let g = this.instantaneousPosture();
197
197
  // Perform some low pass filtering to reduce jitter from any detected effects
198
198
  if (g == this.currentGesture) {
199
- if (this.sigma < 5 /* ACCELEROMETER_GESTURE_DAMPING */)
199
+ if (this.sigma < 5 /* DAL.ACCELEROMETER_GESTURE_DAMPING */)
200
200
  this.sigma++;
201
201
  }
202
202
  else {
@@ -204,9 +204,9 @@ var pxsim;
204
204
  this.sigma = 0;
205
205
  }
206
206
  // If we've reached threshold, update our record and raise the relevant event...
207
- if (this.currentGesture != this.lastGesture && this.sigma >= 5 /* ACCELEROMETER_GESTURE_DAMPING */) {
207
+ if (this.currentGesture != this.lastGesture && this.sigma >= 5 /* DAL.ACCELEROMETER_GESTURE_DAMPING */) {
208
208
  this.lastGesture = this.currentGesture;
209
- pxsim.board().bus.queue(13 /* DEVICE_ID_GESTURE */, this.lastGesture);
209
+ pxsim.board().bus.queue(13 /* DAL.DEVICE_ID_GESTURE */, this.lastGesture);
210
210
  }
211
211
  }
212
212
  /**
@@ -728,21 +728,21 @@ var pxsim;
728
728
  this.pressed = p;
729
729
  if (p) {
730
730
  this._wasPressed = true;
731
- pxsim.board().bus.queue(this.id, 1 /* DEVICE_BUTTON_EVT_DOWN */);
731
+ pxsim.board().bus.queue(this.id, 1 /* DAL.DEVICE_BUTTON_EVT_DOWN */);
732
732
  this._pressedTime = pxsim.runtime.runningTime();
733
733
  }
734
734
  else if (this._pressedTime !== -1) {
735
- pxsim.board().bus.queue(this.id, 2 /* DEVICE_BUTTON_EVT_UP */);
735
+ pxsim.board().bus.queue(this.id, 2 /* DAL.DEVICE_BUTTON_EVT_UP */);
736
736
  const current = pxsim.runtime.runningTime();
737
- if (current - this._pressedTime >= 1000 /* DEVICE_BUTTON_LONG_CLICK_TIME */) {
738
- pxsim.board().bus.queue(this.id, 4 /* DEVICE_BUTTON_EVT_LONG_CLICK */);
737
+ if (current - this._pressedTime >= 1000 /* DAL.DEVICE_BUTTON_LONG_CLICK_TIME */) {
738
+ pxsim.board().bus.queue(this.id, 4 /* DAL.DEVICE_BUTTON_EVT_LONG_CLICK */);
739
739
  }
740
740
  else {
741
- pxsim.board().bus.queue(this.id, 3 /* DEVICE_BUTTON_EVT_CLICK */);
741
+ pxsim.board().bus.queue(this.id, 3 /* DAL.DEVICE_BUTTON_EVT_CLICK */);
742
742
  }
743
743
  if (this._clickedTime !== -1) {
744
744
  if (current - this._clickedTime <= DOUBLE_CLICK_TIME) {
745
- pxsim.board().bus.queue(this.id, 6 /* DEVICE_BUTTON_EVT_DOUBLE_CLICK */);
745
+ pxsim.board().bus.queue(this.id, 6 /* DAL.DEVICE_BUTTON_EVT_DOUBLE_CLICK */);
746
746
  }
747
747
  }
748
748
  this._clickedTime = current;
@@ -767,9 +767,9 @@ var pxsim;
767
767
  this.usesButtonAB = false;
768
768
  this.buttonsByPin = {};
769
769
  this.buttons = buttons || [
770
- new CommonButton(1 /* DEVICE_ID_BUTTON_A */),
771
- new CommonButton(2 /* DEVICE_ID_BUTTON_B */),
772
- new CommonButton(3 /* DEVICE_ID_BUTTON_AB */)
770
+ new CommonButton(1 /* DAL.DEVICE_ID_BUTTON_A */),
771
+ new CommonButton(2 /* DAL.DEVICE_ID_BUTTON_B */),
772
+ new CommonButton(3 /* DAL.DEVICE_ID_BUTTON_AB */)
773
773
  ];
774
774
  this.buttons.forEach(btn => this.buttonsByPin[btn.id] = btn);
775
775
  }
@@ -966,10 +966,10 @@ var pxsim;
966
966
  this.state = state;
967
967
  switch (state) {
968
968
  case ThresholdState.High:
969
- pxsim.board().bus.queue(this.id, 2 /* SENSOR_THRESHOLD_HIGH */);
969
+ pxsim.board().bus.queue(this.id, 2 /* DAL.SENSOR_THRESHOLD_HIGH */);
970
970
  break;
971
971
  case ThresholdState.Low:
972
- pxsim.board().bus.queue(this.id, 1 /* SENSOR_THRESHOLD_LOW */);
972
+ pxsim.board().bus.queue(this.id, 1 /* DAL.SENSOR_THRESHOLD_LOW */);
973
973
  break;
974
974
  case ThresholdState.Normal:
975
975
  break;
@@ -1189,8 +1189,8 @@ var pxsim;
1189
1189
  const old = this.value;
1190
1190
  this.value = value;
1191
1191
  const b = pxsim.board();
1192
- if (b && this.eventMode == 2 /* DEVICE_PIN_EVENT_ON_EDGE */ && old != this.value)
1193
- b.bus.queue(this.id, this.value > 0 ? 2 /* DEVICE_PIN_EVT_RISE */ : 3 /* DEVICE_PIN_EVT_FALL */);
1192
+ if (b && this.eventMode == 2 /* DAL.DEVICE_PIN_EVENT_ON_EDGE */ && old != this.value)
1193
+ b.bus.queue(this.id, this.value > 0 ? 2 /* DAL.DEVICE_PIN_EVT_RISE */ : 3 /* DAL.DEVICE_PIN_EVT_FALL */);
1194
1194
  }
1195
1195
  digitalReadPin() {
1196
1196
  this.mode = PinFlags.Digital | PinFlags.Input;
@@ -1251,13 +1251,13 @@ var pxsim;
1251
1251
  onEvent(ev, handler) {
1252
1252
  const b = pxsim.board();
1253
1253
  switch (ev) {
1254
- case 4 /* DEVICE_PIN_EVT_PULSE_HI */:
1255
- case 5 /* DEVICE_PIN_EVT_PULSE_LO */:
1256
- this.eventMode = 3 /* DEVICE_PIN_EVENT_ON_PULSE */;
1254
+ case 4 /* DAL.DEVICE_PIN_EVT_PULSE_HI */:
1255
+ case 5 /* DAL.DEVICE_PIN_EVT_PULSE_LO */:
1256
+ this.eventMode = 3 /* DAL.DEVICE_PIN_EVENT_ON_PULSE */;
1257
1257
  break;
1258
- case 2 /* DEVICE_PIN_EVT_RISE */:
1259
- case 3 /* DEVICE_PIN_EVT_FALL */:
1260
- this.eventMode = 2 /* DEVICE_PIN_EVENT_ON_EDGE */;
1258
+ case 2 /* DAL.DEVICE_PIN_EVT_RISE */:
1259
+ case 3 /* DAL.DEVICE_PIN_EVT_FALL */:
1260
+ this.eventMode = 2 /* DAL.DEVICE_PIN_EVENT_ON_EDGE */;
1261
1261
  break;
1262
1262
  default:
1263
1263
  return;
@@ -2056,7 +2056,7 @@ var pxsim;
2056
2056
  */
2057
2057
  function onPulsed(name, high, body) {
2058
2058
  pxsim.pins.markUsed(name);
2059
- onEvent(name, high ? 4 /* DEVICE_PIN_EVT_PULSE_HI */ : 5 /* DEVICE_PIN_EVT_PULSE_LO */, body);
2059
+ onEvent(name, high ? 4 /* DAL.DEVICE_PIN_EVT_PULSE_HI */ : 5 /* DAL.DEVICE_PIN_EVT_PULSE_LO */, body);
2060
2060
  }
2061
2061
  DigitalInOutPinMethods.onPulsed = onPulsed;
2062
2062
  function onEvent(name, ev, body) {
@@ -2071,7 +2071,7 @@ var pxsim;
2071
2071
  */
2072
2072
  function pulseIn(name, high, maxDuration = 2000000) {
2073
2073
  pxsim.pins.markUsed(name);
2074
- const pulse = high ? 4 /* DEVICE_PIN_EVT_PULSE_HI */ : 5 /* DEVICE_PIN_EVT_PULSE_LO */;
2074
+ const pulse = high ? 4 /* DAL.DEVICE_PIN_EVT_PULSE_HI */ : 5 /* DAL.DEVICE_PIN_EVT_PULSE_LO */;
2075
2075
  // Always return default value, can't simulate
2076
2076
  return 500;
2077
2077
  }
@@ -2448,9 +2448,9 @@ var pxsim;
2448
2448
  // Player 1 keymap
2449
2449
  this.setPlayerKeys(1, // Player 1
2450
2450
  87, // W - Up
2451
- 83, // D - Down
2451
+ 83, // S - Down
2452
2452
  65, // A - Left
2453
- 83, // S - Right
2453
+ 68, // D - Right
2454
2454
  32, // Space - A
2455
2455
  13 // Enter - B
2456
2456
  );
@@ -2459,7 +2459,7 @@ var pxsim;
2459
2459
  73, // I - Up
2460
2460
  75, // K - Down
2461
2461
  74, // J - Left
2462
- 75, // K - Right
2462
+ 76, // L - Right
2463
2463
  85, // U - A
2464
2464
  79 // O - B
2465
2465
  );
@@ -2974,10 +2974,10 @@ var pxsim;
2974
2974
  let b = pxsim.lightSensorState();
2975
2975
  b.setUsed();
2976
2976
  switch (condition) {
2977
- case 1 /* SENSOR_THRESHOLD_LOW */:
2977
+ case 1 /* DAL.SENSOR_THRESHOLD_LOW */:
2978
2978
  b.setLowThreshold(value);
2979
2979
  break;
2980
- case 2 /* SENSOR_THRESHOLD_HIGH */:
2980
+ case 2 /* DAL.SENSOR_THRESHOLD_HIGH */:
2981
2981
  b.setHighThreshold(value);
2982
2982
  break;
2983
2983
  }
@@ -3009,7 +3009,7 @@ var pxsim;
3009
3009
  if (!b)
3010
3010
  return;
3011
3011
  b.setUsed();
3012
- pxsim.pxtcore.registerWithDal(b.id, 2 /* LEVEL_THRESHOLD_HIGH */, body);
3012
+ pxsim.pxtcore.registerWithDal(b.id, 2 /* DAL.LEVEL_THRESHOLD_HIGH */, body);
3013
3013
  }
3014
3014
  input.onLoudSound = onLoudSound;
3015
3015
  function setLoudSoundThreshold(value) {
@@ -4335,7 +4335,7 @@ var pxsim;
4335
4335
  const rd = new Uint32Array(ca.buffer);
4336
4336
  const src = buf.data;
4337
4337
  if (48 != src.length)
4338
- pxsim.pxtrt.panic(911 /* PANIC_SCREEN_ERROR */);
4338
+ pxsim.pxtrt.panic(911 /* pxsim.PXT_PANIC.PANIC_SCREEN_ERROR */);
4339
4339
  this.palette = new Uint32Array((src.length / 3) | 0);
4340
4340
  for (let i = 0; i < this.palette.length; ++i) {
4341
4341
  const p = i * 3;
@@ -4688,10 +4688,10 @@ var pxsim;
4688
4688
  return;
4689
4689
  }
4690
4690
  else if (left) {
4691
- pxsim.board().bus.queue(SlideSwitchState.id, 2 /* DEVICE_BUTTON_EVT_UP */);
4691
+ pxsim.board().bus.queue(SlideSwitchState.id, 2 /* DAL.DEVICE_BUTTON_EVT_UP */);
4692
4692
  }
4693
4693
  else {
4694
- pxsim.board().bus.queue(SlideSwitchState.id, 1 /* DEVICE_BUTTON_EVT_DOWN */);
4694
+ pxsim.board().bus.queue(SlideSwitchState.id, 1 /* DAL.DEVICE_BUTTON_EVT_DOWN */);
4695
4695
  }
4696
4696
  this.left = left;
4697
4697
  }
@@ -4829,7 +4829,7 @@ var pxsim;
4829
4829
  const t = unit == pxsim.TemperatureUnit.Celsius
4830
4830
  ? temperature
4831
4831
  : (((temperature - 32) * 10) / 18 >> 0);
4832
- if (condition === 2 /* LEVEL_THRESHOLD_HIGH */) {
4832
+ if (condition === 2 /* DAL.LEVEL_THRESHOLD_HIGH */) {
4833
4833
  b.setHighThreshold(t);
4834
4834
  }
4835
4835
  else {
@@ -5188,7 +5188,7 @@ var pxsim;
5188
5188
  }
5189
5189
  _wifi.eventID = eventID;
5190
5190
  function scanStart() {
5191
- _raiseEvent(1 /* ScanDone */);
5191
+ _raiseEvent(1 /* WifiEvent.ScanDone */);
5192
5192
  }
5193
5193
  _wifi.scanStart = scanStart;
5194
5194
  function startLoginServer() {
@@ -5203,7 +5203,7 @@ var pxsim;
5203
5203
  }
5204
5204
  _wifi.scanResults = scanResults;
5205
5205
  function connect(ssid, pass) {
5206
- _raiseEvent(2 /* GotIP */);
5206
+ _raiseEvent(2 /* WifiEvent.GotIP */);
5207
5207
  return 0;
5208
5208
  }
5209
5209
  _wifi.connect = connect;
package/libs/game/sim/keymap.ts CHANGED
@@ -67,9 +67,9 @@ namespace pxsim {
67
67
  this.setPlayerKeys(
68
68
  1, // Player 1
69
69
  87, // W - Up
70
- 83, // D - Down
70
+ 83, // S - Down
71
71
  65, // A - Left
72
- 83, // S - Right
72
+ 68, // D - Right
73
73
  32, // Space - A
74
74
  13 // Enter - B
75
75
  );
@@ -79,7 +79,7 @@ namespace pxsim {
79
79
  73, // I - Up
80
80
  75, // K - Down
81
81
  74, // J - Left
82
- 75, // K - Right
82
+ 76, // L - Right
83
83
  85, // U - A
84
84
  79 // O - B
85
85
  );
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pxt-common-packages",
3
- "version": "9.4.14",
3
+ "version": "9.4.15",
4
4
  "description": "Microsoft MakeCode (PXT) common packages",
5
5
  "keywords": [
6
6
  "MakeCode",