scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-26 07:52:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
3346 commits 496 branches 1642 tags 1.4 GiB
Commit graph

533 commits

Author SHA1 Message Date
unknown
f1fc54bfaf Fixing comment based on cwf suggestion. 2019-03-06 13:13:57 -05:00
unknown
2148e9ead1 Adding stopAll binding back in after un-rebased merge. 2019-03-06 13:08:55 -05:00
unknown
54ed67ac22 Adding TaskQueue import back in after un-rebased merge. 2019-03-06 12:57:32 -05:00
unknown
7a14dad668 Removing console logs that came in accidentally via un-rebased merge. 2019-03-06 12:55:04 -05:00
unknown
fed43e1841 Removing busy flag again which was reintroduced via a un-rebased merge. 2019-03-06 12:53:17 -05:00
unknown
b31a1f0e98 Move argument processing outside of TaskQueue.do calls. 2019-03-06 12:47:44 -05:00
Evelyn Eastmond
f5dc90f729 Fixing comment again. 2019-03-06 12:47:44 -05:00
Evelyn Eastmond
d2c14f872c Fixing comment. 2019-03-06 12:47:44 -05:00
Evelyn Eastmond
00d1a407ac Fixing some comments. 2019-03-06 12:47:44 -05:00
Evelyn Eastmond
3c77f82238 Changing maxTokens and refillRate for microbit test. 2019-03-06 12:47:44 -05:00
Evelyn Eastmond
fb36731ce4 Add catches for task queue Promise rejections, and some debug console logs. 2019-03-06 12:47:44 -05:00
Evelyn Eastmond
eecd508464 Fix usage of task queue with an opcode that has its own promise/time delay resolution (i.e. displayText in microbit). 2019-03-06 12:46:56 -05:00
Evelyn Eastmond
6688106852 Continuing to test the newest TaskQueue with microbit. 2019-03-06 12:44:22 -05:00
Eric Rosenbaum
59586291d7 Comments 2019-03-06 12:03:54 -05:00
Eric Rosenbaum
ee0d395b9c Cleanup check supported and get extension locale 2019-03-06 12:03:46 -05:00
Eric Rosenbaum
8fc3111b21 use id for default language 2019-03-06 10:51:08 -05:00
Eric Rosenbaum
65d0a3aa11 cleanup 2019-03-06 10:37:36 -05:00
Eric Rosenbaum
d059f8baa6 Check and set language, handling many-to-one mapping 2019-03-06 10:37:36 -05:00
Eric Rosenbaum
ab633d3448 WIP updating to use new language info data 2019-03-06 10:37:36 -05:00
Eric Rosenbaum
bc9e215ee8 Fill in language info data 2019-03-06 10:37:36 -05:00
Eric Rosenbaum
04c6bc189a Add language ids 2019-03-06 10:37:36 -05:00
Eric Rosenbaum
da212bcf06 wip switching from using locales to language IDs internally 2019-03-06 10:37:36 -05:00
Eric Rosenbaum
920096d061 Add romanian and fix ordering 2019-03-06 10:37:36 -05:00
Eric Rosenbaum
3996cc0c6b Add Welsh, Swedish and Turkish 2019-03-06 10:37:36 -05:00
Eric Rosenbaum
f33e07132e Add hindi, korean, norwegian, and adjust rates 2019-03-06 10:37:36 -05:00
Eric Rosenbaum
5b5c0d80eb Set tenor playback rate for single gender languages 2019-03-06 10:37:36 -05:00
Eric Rosenbaum
0d12cead31 key language info by locale id, and add chinese 2019-03-06 10:37:36 -05:00
Kevin Andersen
a4e005cf2b Merge branch 'develop' of https://github.com/LLK/scratch-vm into boostextension 2019-03-04 18:11:26 -05:00
Kevin Andersen
6cf00a4235 Linted 2019-03-04 17:39:02 -05:00
Kevin Andersen
852ae43348 This commit is a combination of changes after an internal play test with the Scratch Team, as well as code cleanup. 
Motors:
- motor position will now initially report 0 instead of false
- removed remaining motor position zeroing functions.
- removed startBraking().
- turnOn() and turnOnForDegrees() are now using an absolute max power as per the protocol documentation.
- the "turn for rotations"-block now accepts negative values.
-- turnOnForDegrees() accepts a direction to reflect the change above. The direction from the block is calculated against the motors current direction.
- commented EV3 tacho calculation code for motor positioning removed.
- Changed BoostMotorLabel to reflect actual motor block argument.
- startMotorPower() renamed to setMotorPower() since it doesn't start the motor.
- setMotorPower() will not start the motor.
- Max number of rotations for a motor-block is clamped to 100 rotations.
- 'Default' removed from BoostMotorLabel-enum as it wasn't used.

Sensors:
- removed remaining distance-related functions.
- color-reporters default value is now none rather than black.
- tilt-angles left and right switched to reflect the hubs orientation.
 2019-03-04 12:38:02 -05:00
Kevin Andersen
669ff1abf1 - Boost-icon added to blocks 
- Added BoostColorLabel-enum for color sensing block argument labels
- Regrouped blocks to be grouped by functionality, promoting color sensing
- Added 'any' to whenColor hat-block which triggers if the color sensor reports a value that is not none. Implemented an oldColor-value that allows the hat-block to trigger between color-changes, even if the sensor doesnt see 'none' in the meantime.
 2019-03-01 11:36:57 -05:00
Evelyn Eastmond
59ab3b717d Fixing clearInterval > clearTimeout. 2019-03-01 10:04:56 -05:00
Evelyn Eastmond
7a1367d81a Change from setInterval to setTimeout for auto disconnect feature. 2019-03-01 10:02:30 -05:00
Kevin Andersen
ed051cdd82 Changed color-sensing values to be strings instead of LEGO numbering, which seems more intuitive. 2019-02-27 15:49:24 -05:00
Kevin Andersen
d2d236d282 After discussion with @ericrosenbaum, decided to change the following: 
- Regroup blocks by functionality, i.e. motors, led, color-sensing, etc.
- Remove motor position zero-ing as concept and use MathUtil.wrapClamp to instead wrap everything around 360 degrees.
- WIP: "Set motor power to"-block should update motors that are currently running to emphasize principle that blocks have actions.
 2019-02-27 15:19:40 -05:00
Kevin Andersen
7fc705b741 - Consolidated BLE enums for brevity 
- Added IOs from documentation to BoostIO enumotor follows the speed set by Scratch and not the highest possible speed.
- Cleaned up line breaks in codebrake rather than float when stopping.
- Cleaned up documentationensors
- Deleted unused MOTOR_OUTPUT from BoostMode-enumbased on BoostMode-enum
- Set default-value for "set motor power to"-block to be all motors after feedback from @ericrosenbaum
- Implemented check in getMotorPosition() to see if motor is actually there before reporting position
 2019-02-26 14:44:13 -05:00
Kevin Andersen
40c022ca8e - Refactoring of output commands: 
- Simplified generateOutputCommand() to follow the LEGO Wireless Protocol command-structure. Every output-command must have a portID, execution information, sub-command, and then followed by a custom payload which must be defined according to the protocol documentation mentioned in the extension.
- Simple motor commands now use the above subcommand-structure rather than the former primitive command structure.
- stopLED()-function removed since it's not used
- Implemented check of pendingPromiseFunction() for motors before firing.
 2019-02-22 12:50:19 -05:00
Kevin Andersen
9767d72188 - Cleaned up TODOs! 
- Added and made use of more enums rather than hardcoded bytes
 2019-02-21 14:47:30 -05:00
Kevin Andersen
1d72b3b971 - Removed unused distance-mode from BoostMode-enum 
- Added descriptions to BoostMode-enums
- Improved motor-position handling
- Added helper-functions for converting to/from motor position values
- Added default value to BoostMotor._pendingPromiseFunction
- Added changeLedColorBy-block
- Only motors will now try to resolve motor-promises
- Changed motor position wording from 'zero' to 'reset'
- Modified tilt-thresholds to improve tilt-handling
 2019-02-21 13:35:21 -05:00
Eric Rosenbaum
c0e80edfcc Update block and menu icons 2019-02-20 11:13:00 -05:00
Eric Rosenbaum
931d7e9a62 More re-ordering 2019-02-20 11:00:21 -05:00
Eric Rosenbaum
9e650279a6 Re-order blocks 2019-02-20 10:59:07 -05:00
Eric Rosenbaum
7da54dd067 Add tilted any option 2019-02-20 10:49:03 -05:00
Eric Rosenbaum
a19585af75 Add tilt blocks 2019-02-19 16:09:58 -05:00
Eric Rosenbaum
ba548701e2 Set update rate to 80ms 2019-02-19 15:14:37 -05:00
Eric Rosenbaum
f4662f833f rename “tilt angle” and “spin speed” reporters 2019-02-19 15:06:03 -05:00
Eric Rosenbaum
ec2ca32ffa Remove “moved” gesture 2019-02-19 13:55:24 -05:00
Kevin Andersen
e99a217ba5 Merge branch 'develop' of https://github.com/LLK/scratch-vm into boostextension 2019-02-14 13:31:13 -05:00
Kevin Andersen
32a9674b5d Added disconnect-handling per new extensions-spec. Motor-commands that fail will now also cause their blocks to complete 2019-02-14 13:30:58 -05:00
unknown
ac571ece5a Fixing comment. 2019-02-13 14:14:05 -05:00
Evelyn Eastmond
8bbdc4e691 Resolves #1988: Vernier gdxfor tilt values should be 0 when disconnected. 2019-02-13 14:14:05 -05:00
Chris Willis-Ford
7ab41d2bd9
Merge pull request #1881 from apple502j/pen-legacy 
Fix legacy `set pen color` block's transparency behavior
 2019-02-13 10:51:47 -08:00
Kevin Andersen
245ba998d2 merge changes from origin/develop 2019-02-12 13:18:28 -05:00
Kevin Andersen
e2bd28b85e Cleaned up documentation (WIP). Added Output subcommand enum for use throughout extension 2019-02-12 10:10:21 -05:00
Kevin Andersen
c902bbaa0d Cleaned up some documentation. Consolidated and renamed Boost enums 2019-02-11 11:30:22 -05:00
Kevin Andersen
bf02426a4a added named variables to onMessage for readability. Changed wording of motor-blocks. Added BLE Advertisement Manufacturer Data as filter for scanning, for https://github.com/LLK/scratch-link/issues/112 2019-02-11 10:57:57 -05:00
Chris Willis-Ford
51252531af
Update src/extensions/scratch3_pen/index.js 
Co-Authored-By: apple502j <33279053+apple502j@users.noreply.github.com>
 2019-02-08 20:03:54 +09:00
Chris Willis-Ford
2d575a9208
Update src/extensions/scratch3_pen/index.js 
Co-Authored-By: apple502j <33279053+apple502j@users.noreply.github.com>
 2019-02-08 20:03:48 +09:00
Evelyn Eastmond
b5eb54fc44 Resolves 1975: Vernier gdxfor extension should disconnect on sensor timeout. 2019-02-07 16:18:56 -05:00
Evelyn Eastmond
16ebcb82b2
Merge pull request #1986 from evhan55/bug/gdxfor-falling 
Vernier gdxfor "falling?" report false when not connected
 2019-02-07 15:54:46 -05:00
Evelyn Eastmond
7e7326f474
Merge pull request #1984 from evhan55/extensions/gdxfor-update-rate 
Vernier gdxfor input rate change
 2019-02-07 15:24:11 -05:00
Evelyn Eastmond
a68886cee9 Resolves #1977: Vernier gdxfor extension falling? reports true while hardware disconnected. 2019-02-07 14:51:59 -05:00
Eric Rosenbaum
9dd8e9398a
Merge pull request #1982 from VernierST/extensions/gdx-for-freefall-and-tilt 
GDX-FOR better freefall algorithm and different tilt options
 2019-02-07 11:59:50 -05:00
Evelyn Eastmond
104e997b59 Changing the input rate, resolves 1976. 2019-02-07 10:48:48 -05:00
Ian Honohan
7b3996a173 Add localization to the front/back/left/right menu items 2019-02-06 12:51:32 -08:00
Ian Honohan
7cbf4e2a60 Changes the tilt options from x/y to front/back and left/right. Also limits the tilt range to +/-90, just like micro::bit 2019-02-06 10:52:18 -08:00
Eric Rosenbaum
3ae6c93394 Change l10n id so translations will update 2019-02-06 10:40:06 -05:00
Eric Rosenbaum
48e01fe1a3 Rename “spin speed” to “spin” 2019-02-05 17:22:17 -05:00
Eric Rosenbaum
78c72f4185 Add spacers 2019-02-05 17:22:06 -05:00
Ian Honohan
5a2eb3b296 Accounts for any rotation in the GDX-FOR while trying to detect freefall 2019-02-05 12:12:17 -08:00
Evelyn Eastmond
39f69bd8c1 Separate out _spinSpeedFromGyro function. 2019-02-04 21:56:20 -05:00
Evelyn Eastmond
8da82cfe01 Adding JSDoc and removing extension manager gdx uncommenting. 2019-02-04 21:45:23 -05:00
Evelyn Eastmond
da3fc930b1 Factoring out a _onSensorValueChanged function. 2019-02-04 21:41:57 -05:00
Evelyn Eastmond
e87dd01629 Add clearing of values on disconnect. 2019-02-04 19:43:50 -05:00
Evelyn Eastmond
93aecc88be Filling in some comments. 2019-02-04 19:41:07 -05:00
Evelyn Eastmond
9390cd0f8a Fixing 'gyro' labels to 'spin speed'. 2019-02-04 19:41:07 -05:00
Evelyn Eastmond
d84dd72a8c Removing canReadSensors and sensorsEnabled, first pass. 2019-02-04 19:41:07 -05:00
Evelyn Eastmond
eb4f6235d9 Testing new sensor array to store sensor data on/offline. 2019-02-04 19:41:07 -05:00
Kevin Andersen
5822f762ca Multiple motor-changes. Changed _isOn to _status to reflect the more advanced states a motor (or port) can be in. Implemented promise-based completion on motor-on-for-rotation-block, since this block requires a callback from the hub. Changed lower threshold for power-bias function. Deleted some outdated todos. Changed connectID-terminology to portID. Implemented handling port output command feedback. Commented out some distance and tilt-related blocks that I think we can do without and that will lower the number of blocks. 2019-02-04 16:30:04 -05:00
Kevin Andersen
c03dc60feb Deleted BoostUnit, since the new protocol has prescribed units for a particular mode. Implemented helper-function for turning javascript numbers into a bytearray. Changed generateInputCommand()-function delta-parameter to be int32 according to the new protocol. Fixed issue that whenColor hat-block didn't work until dropdown value changed. 2019-02-01 10:19:59 -05:00
Eric Rosenbaum
12283daaa4
Merge pull request #1958 from ericrosenbaum/feature/vernier-updates 
Update, re-order and clean up Vernier Force & Accel extension blocks
 2019-01-30 16:49:46 -05:00
Eric Rosenbaum
3bdb13f049 Rename and re-order freefall threshold constant 2019-01-29 17:12:15 -05:00
Eric Rosenbaum
6cbc71f8d1 Add facing threshold 2019-01-29 17:09:11 -05:00
Eric Rosenbaum
4449ee7f0f Only round sensor vals in opcodes 2019-01-28 17:45:16 -05:00
Eric Rosenbaum
c033732d62 Use enums and constants in isFacing 2019-01-28 17:15:37 -05:00
Eric Rosenbaum
f795197047 Enum and localization for facing up/down 2019-01-28 17:12:25 -05:00
Eric Rosenbaum
b5fb80190d Factor out and scale spin speed 2019-01-28 17:06:14 -05:00
Eric Rosenbaum
1abbf55f55 Re-order and update blocks 2019-01-28 14:05:39 -05:00
Eric Rosenbaum
c542b2384f
Merge pull request #1938 from ericrosenbaum/bugfix/text2speech-default-input-localization 
Fix Text to Speech extension default input localization
 2019-01-28 10:40:58 -05:00
Eric Rosenbaum
92d2a1673a Updating blocks 2019-01-24 17:01:46 -05:00
Kevin Andersen
2aaf424279 stuff 2019-01-24 10:08:17 +01:00
Eric Rosenbaum
09daeb53a1 Don’t use a variable in formatMessage 2019-01-23 17:56:38 -05:00
Eric Rosenbaum
9e00c06ddf Localize the makey makey blocks 2019-01-23 14:05:00 -05:00
Kevin Andersen
ffb5cd63af added zero-block for motor positioning. Added turn-for-rotation-block, but its WIP. Modified generateOutputCommand to allow for advanced motor commands. Changed motor position reporter to follow hardware instead of wrap-clamping. 2019-01-23 09:10:03 +01:00
Kevin Andersen
7cee07db83 Changed default motor to A instead of all. Added TODOs and DEBUG code comments. Changed output-commands to use proper enums 2019-01-21 08:01:10 +01:00
Eric Rosenbaum
9d4442444f
Merge pull request #1914 from bocoup/sensor-error 
Prevent console errors when disconnecting/reconnect to Vernier extension
 2019-01-18 17:09:38 -05:00
Eric Rosenbaum
0b251adace
Merge pull request #1763 from evhan55/extensions/disconnect-errors 
Various fixes to extension disconnect errors
 2019-01-18 16:58:45 -05:00
Evelyn Eastmond
6e290ea937 Calling microbit timeout error in an arrow function. 2019-01-16 16:23:06 -05:00
Evelyn Eastmond
5c885911e7 Replacing a timeout clear. 2019-01-16 16:06:44 -05:00
Evelyn Eastmond
28a54d6e83 Adding back in the disconnect branch to be fixed later in another PR. 2019-01-16 16:05:13 -05:00
Evelyn Eastmond
7ec9494804 Making corrections based on discussion with ericr. 2019-01-16 15:54:38 -05:00
Evelyn Eastmond
bd8f129022 Adding a TODO for an optional read param. 2019-01-16 15:22:58 -05:00
Evelyn Eastmond
e4b82aeaef Adding callback back to battery read to fix clearing the characteristicChanged callback by accident. 2019-01-16 15:22:58 -05:00
Evelyn Eastmond
d7b6cfae97 Move micro:bit data stopped error string to constant. Added another jsdoc. 2019-01-16 15:22:58 -05:00
Evelyn Eastmond
f030afbdc5 Removing extra params from a BLE read in WeDo2. 2019-01-16 15:22:58 -05:00
Evelyn Eastmond
7518a9c149 Changing error to be more accurate. 2019-01-16 15:22:58 -05:00
Evelyn Eastmond
2d9531a15c Removing console logs. 2019-01-16 15:22:58 -05:00
Evelyn Eastmond
fdda1e53e3 Change microbit extension to send BLE socket error on data lost, instead of calling disconnect directly. 2019-01-16 15:22:58 -05:00
Evelyn Eastmond
fab292889f Adding disconnect callback to BT/BLE error system. 2019-01-16 15:22:58 -05:00
Evelyn Eastmond
a177b4eeb7 Adding interval to check for battery level. 2019-01-16 15:22:58 -05:00
Evelyn Eastmond
a6c05d8f61 Removing withResponse flag since it is not needed and was causing a crash on Windows. 2019-01-15 11:43:08 -05:00
Eric Rosenbaum
b57b6c0a84
Merge pull request #1916 from ericrosenbaum/bugfix/vernier-dont-keep-data 
Prevent excess event emitting in Vernier extension
 2019-01-15 11:07:35 -05:00
Eric Rosenbaum
e414e1b246 Add todo comment about keepValues flag 2019-01-15 10:46:22 -05:00
Eric Rosenbaum
2856b32dd5
Merge branch 'develop' into sensor-error 2019-01-15 10:38:51 -05:00
Eric Rosenbaum
8b2f326469
Merge pull request #1920 from evhan55/extensions/vernier-peripheral-list 
Properly disconnect BLE socket in GDX-FOR scan/disconnect
 2019-01-15 10:31:48 -05:00
Evelyn Eastmond
308bb7095a Properly disconnect BLE socket. 2019-01-14 20:17:18 -05:00
Eric Rosenbaum
8f0e025261 Use flag to not keep data, and remove listener hack 2019-01-14 14:01:43 -05:00
Kevin Andersen
0557fc8e09 Motor position reporter kinda working. LED commands working. Added mode information to generateOutputCommand-function. Removed value-format switch-case in favor of hard-coded value-interpretation, but put in a TODO that we perhaps should consider doing it in the future. 2019-01-13 21:10:20 +01:00
Valerie Young
daccdb0a71 Satisfy linter 2019-01-11 16:53:47 -05:00
Valerie Young
f2f4af2590 Don't send disconnect to a closed device 2019-01-11 16:47:42 -05:00
Valerie Young
328e4480f6 Prevent reading non-existing sensors 2019-01-11 16:43:08 -05:00
Eric Rosenbaum
730ec44e5d Update block icon 2019-01-11 12:07:16 -05:00
Valerie Young
9e612acb27 Forgotten parens 2019-01-11 11:00:08 -05:00
Valerie Young
92297444a0 Is jumped should call is freefalling 2019-01-10 15:39:46 -05:00
Valerie Young
f669b4bcb7 satisfy linter 2019-01-10 12:19:00 -05:00
Valerie Young
7a1b6d4f60 Remove normal force from acceleration magnitude 2019-01-10 12:19:00 -05:00
Valerie Young
92e1f040c3 Add when jumped and is free falling 2019-01-10 12:19:00 -05:00
Valerie Young
a62f5b9b0e Add facing blocks 2019-01-10 12:19:00 -05:00
Valerie Young
ac29927c22 other minor feedback 2019-01-10 10:21:32 -05:00
Valerie Young
477c307304 Remove one copy of constants 2019-01-10 10:11:46 -05:00
Valerie Young
5d4aebf301 Satisfy linter 2019-01-09 18:02:36 -05:00
Valerie Young
ae889304c5 satisfy linter 2019-01-09 17:51:56 -05:00
Valerie Young
d2fec35fd8 Set the period to 10 milliseconds 2019-01-09 17:50:25 -05:00
Valerie Young
338b30a17b Increase speed of sample 2019-01-09 17:09:08 -05:00
Valerie Young
abf84975bd Add tilt blocks 2019-01-09 17:08:01 -05:00
Valerie Young
d3e5c7d928 Remove directions option from hats and use magnitude 2019-01-09 13:55:35 -05:00
Kevin Andersen
af800956fe Initial commit. WIP 2019-01-09 10:06:48 -05:00
Valerie Young
da608f6f18 degrees/s instead of radians, normalize force 2019-01-08 12:07:39 -05:00
Valerie Young
a0e1b5aa5b Rename spin speed, make hat blocks work 2019-01-08 11:53:51 -05:00
Valerie Young
be35eb1f70 remove units 2019-01-08 11:15:55 -05:00
Valerie Young
b5decacee2 update name of variable 2019-01-07 18:20:45 -05:00
Valerie Young
5696b76d9a fix typo 2019-01-07 18:17:20 -05:00
Valerie Young
4d75f7776c Remove the onClose skeletons 2019-01-07 18:09:23 -05:00
Valerie Young
4529533aa8 Remove accidental double declarations 2019-01-07 17:45:20 -05:00
Valerie Young
9a3517d878 First draft communication with scratch link and vernier 2019-01-07 11:54:15 -05:00
Valerie Young
a0cccba3be satisfy linter 2019-01-07 11:29:26 -05:00
Valerie Young
deab7dd209 Add @vernier/godirect module 2019-01-07 11:29:26 -05:00
Valerie Young
1471248657 Clean up and all sensors working 2019-01-07 11:29:26 -05:00
Valerie Young
d70fb96d01 Force working with vernier node module 2019-01-07 11:29:26 -05:00
Valerie Young
a0bf69f17c Change extension name 2019-01-07 11:29:26 -05:00