Compare commits

..

2 Commits

Author SHA1 Message Date
540a097198 driving base sim 2019-10-01 22:17:47 -07:00
93cfb76f68 add city shaper 2019-10-01 22:02:56 -07:00
9 changed files with 197 additions and 289 deletions

View File

@ -6,13 +6,13 @@
<a class="item" href="https://makecode.com/privacy" target="_blank" rel="noopener">Privacy &amp; Cookies</a> <a class="item" href="https://makecode.com/privacy" target="_blank" rel="noopener">Privacy &amp; Cookies</a>
<a class="item" href="https://makecode.com/termsofuse" target="_blank" rel="noopener"> Terms Of Use</a> <a class="item" href="https://makecode.com/termsofuse" target="_blank" rel="noopener"> Terms Of Use</a>
<a class="item" href="https://makecode.com/trademarks" target="_blank" rel="noopener">Trademarks</a> <a class="item" href="https://makecode.com/trademarks" target="_blank" rel="noopener">Trademarks</a>
<div class="item">©2019 Microsoft</div> <div class="item">© 2018 Microsoft</div>
</div> </div>
<div class="ui container horizontal small divided link list"> <div class="ui container horizontal small divided link list">
<a class="ui centered item" href="https://makecode.com/" title="Microsoft MakeCode" target="_blank" rel="noopener">Powered by Microsoft MakeCode</a> <a class="ui centered item" href="https://makecode.com/" title="Microsoft MakeCode" target="_blank" rel="noopener">Powered by Microsoft MakeCode</a>
</div> </div>
<div class="ui centered container small list"> <div class="ui centered container small list">
<p class="item">@copyrightText@</p> <p class="item">LEGO, the LEGO logo, MINDSTORMS and the MINDSTORMS EV3 logo are trademarks and/ or copyrights of the LEGO Group. ©2018 The LEGO Group. All rights reserved.</p>
</div> </div>
</div> </div>
</footer> </footer>

View File

@ -1,3 +1,3 @@
{ {
"appref": "v1.2.22" "appref": "v1.2.18"
} }

View File

@ -3,20 +3,11 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>@name@ Offline App</title> <title>LEGO® MINDSTORMS® Education EV3 Offline App</title>
<meta name="Description" content="A MakeCode for @name@ offline app" /> <meta name="Description" content="A MakeCode for LEGO® MINDSTORMS® Education EV3 offline app" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" data-rtl="/blb/rtlsemantic.css" href="/doccdn/semantic.css" /> <!-- @include indexhead.html -->
<link rel="stylesheet" href="/docfiles/style.css" />
<link rel="stylesheet" href="/docfiles/target.css" />
<script src="/doccdn/jquery.js" type="text/javascript"></script>
<script src="/doccdn/semantic.js" type="text/javascript"></script>
<script src="/docfiles/target.js" type="text/javascript"></script>
<style>
@targetstyle@
</style>
<style> <style>
p.item { p.item {
color: rgba(0, 0, 0, 0.4); color: rgba(0, 0, 0, 0.4);
@ -64,10 +55,6 @@
background-color: rgb(250, 250, 250); background-color: rgb(250, 250, 250);
} }
#legal-segment {
background:white;
}
@media only screen and (max-width: 800px) { @media only screen and (max-width: 800px) {
.grid .column .image { .grid .column .image {
display: none; display: none;
@ -381,61 +368,34 @@
</style> </style>
<script> <script>
var electronLatestVersion = ""; $(document).ready(function () {
function tickEvent(id, data) { tickEvent = function (id, data) {
if (!pxt.aiTrackEvent) return; if (!pxt.aiTrackEvent) return;
if (!data) pxt.aiTrackEvent(id); if (!data) pxt.aiTrackEvent(id);
else { else {
var props = {}; var props = {};
var measures = {}; var measures = {};
for (var k in data) for (var k in data)
if (typeof data[k] == "string") props[k] = data[k]; if (typeof data[k] == "string") props[k] = data[k];
else measures[k] = data[k]; else measures[k] = data[k];
pxt.aiTrackEvent(id, props, measures); pxt.aiTrackEvent(id, props, measures);
}
} }
} });
function agreeCheckboxChanged() { function agreeCheckboxChanged() {
showDownloads(); var downloadSegment = document.getElementById("download-segment");
} downloadSegment.classList.toggle("hidden");
function showAgree() {
$("#agree-segment").removeClass("hidden");
$("#read-segment").removeClass("hidden");
$("#legal-segment").removeClass("hidden");
}
function showNoDownloads() {
$("#no-download-segment").removeClass("hidden");
$("#read-segment").addClass("hidden");
$("#legal-segment").addClass("hidden");
}
function showDownloads() {
$("#download-win64").attr("href", "https://makecode.com/api/release/@targetid@/" + electronLatestVersion + "/win64");
$("#download-mac64").attr("href", "https://makecode.com/api/release/@targetid@/" + electronLatestVersion + "/mac64");
$("#download-segment").removeClass("hidden");
} }
function downloadWin64() { function downloadWin64() {
tickEvent("offlineapp.download", { "target": "@targetid@", "platform": "win64" }); // TODO: Keep this link up-to-date with the desired release version
window.open("https://makecode.com/api/release/ev3/v1.1.20/win64");
tickEvent("offlineapp.download", { "target": "ev3", "platform": "win64" });
} }
function downloadMac64() { function downloadMac64() {
tickEvent("offlineapp.download", { "target": "@targetid@", "platform": "mac64" }); // TODO: Keep this link up-to-date with the desired release version
window.open("https://makecode.com/api/release/ev3/v1.1.20/mac64");
tickEvent("offlineapp.download", { "target": "ev3", "platform": "mac64" });
} }
$(function () {
$.getJSON("https://makecode.com/api/config/@targetid@/targetconfig")
.then(function (data) {
if (data && data.electronManifest && data.electronManifest.latest) {
electronLatestVersion = data.electronManifest.latest;
showAgree();
} else {
showNoDownloads();
}
})
.catch(function () {
showNoDownloads();
})
});
</script> </script>
</head> </head>
@ -446,39 +406,35 @@
<div class="ui grid topbar"> <div class="ui grid topbar">
<div class="three wide column"> <div class="three wide column">
<img class="ui small image left" src="@cardLogo@" /> <img class="ui small image left" src="/static//lego_education_logo_white.png" />
</div> </div>
<div class="ten wide column"> <div class="ten wide column">
<h1 class="ui inverted welcomeheader">@name@ Offline App</h1> <h1 class="ui inverted welcomeheader">MakeCode Offline App</h1>
</div> </div>
<div class="three wide column"> <div class="three wide column">
<img class="ui small image right" src="/static/Microsoft-logo_rgb_c-white.png" /> <img class="ui small image right" src="/static//Microsoft-logo_rgb_c-white.png" />
</div> </div>
</div> </div>
<div id="segments" class="ui compact segments terms-container"> <div class="ui compact segments terms-container">
<div id="read-segment" class="ui secondary center aligned segment hidden"> <div class="ui secondary center aligned segment">
Please read and accept the following terms to download the app. Please read and accept the following terms to download the app.
</div> </div>
<div id="legal-segment" class="ui left aligned segment terms hidden"> <div class="ui left aligned segment terms">
<div id="loader" class="ui active loader"></div>
<div class="c17"> <div class="c17">
<p class="c11"> <p class="c11">
<span class="c4 c1">MICROSOFT PRE-RELEASE SOFTWARE LICENSE TERMS</span> <span class="c4 c1">MICROSOFT PRE-RELEASE SOFTWARE LICENSE TERMS</span>
</p> </p>
<p class="c11"> <p class="c11">
<span class="c4 c1">MICROSOFT MAKECODE SOFTWARE FOR @name@</span> <span class="c4 c1">MICROSOFT MAKECODE FOR LEGO MINDSTORMS EDUCATION EV3</span>
</p> </p>
<p class="c7"> <p class="c7">
<span class="c4 c1"></span> <span class="c4 c1"></span>
</p> </p>
<p class="c11"> <p class="c11">
<span class="c3 c1">These license terms are an agreement between Microsoft Corporation (or based <span class="c3 c1">These license terms are an agreement between Microsoft Corporation (or based on where you live, one
on where you live, one of its affiliates) and you. They apply to the software named above. The terms also apply to any
of its affiliates) and you. They apply to the software named above. The terms also apply to Microsoft services or updates for the software, except to the extent those have additional terms.</span>
any
Microsoft services or updates for the software, except to the extent those have additional
terms.</span>
</p> </p>
<p class="c7"> <p class="c7">
<span class="c3 c1"></span> <span class="c3 c1"></span>
@ -490,34 +446,26 @@
<span class="c5 c1">1.</span> <span class="c5 c1">1.</span>
<span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span class="c5 c1">INSTALLATION AND USE RIGHTS. </span> <span class="c5 c1">INSTALLATION AND USE RIGHTS. </span>
<span class="c3 c1">You may install and use any number of copies of the software to evaluate it <span class="c3 c1">You may install and use any number of copies of the software to evaluate it as you develop and test
as you develop and test your software applications for use with Lego Mindstorms Education EV3 hardware.</span>
your software applications for use with @name@ hardware.</span>
</p> </p>
<p class="c2"> <p class="c2">
<span class="c5 c1">2.</span> <span class="c5 c1">2.</span>
<span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span class="c5 c1">PRE-RELEASE SOFTWARE. </span> <span class="c5 c1">PRE-RELEASE SOFTWARE. </span>
<span class="c3 c1">The software is a pre-release version. It may not work the way a final <span class="c3 c1">The software is a pre-release version. It may not work the way a final version of the software will.
version of the software will. Microsoft may change it for the final, commercial version. We also may not release a commercial
Microsoft may change it for the final, commercial version. We also may not release a version. Microsoft is not obligated to provide maintenance, technical support or updates to you
commercial
version. Microsoft is not obligated to provide maintenance, technical support or updates to
you
for the software.</span> for the software.</span>
</p> </p>
<p class="c2"> <p class="c2">
<span class="c5 c1">3.</span> <span class="c5 c1">3.</span>
<span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span class="c5 c1">ASSOCIATED ONLINE SERVICES.</span> <span class="c5 c1">ASSOCIATED ONLINE SERVICES.</span>
<span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Some features of the software <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Some features of the software provide access
provide access to, or rely on, online services to provide you information about updates to the software or extensions,
to, or rely on, online services to provide you information about updates to the software or or to enable you to retrieve content, collaborate with others, or otherwise supplement your development
extensions, experience. As used throughout these license terms, the term <q>software</q> includes these online
or to enable you to retrieve content, collaborate with others, or otherwise supplement your
development
experience. As used throughout these license terms, the term <q>software</q> includes these
online
services and features. By using these online services and features you consent to the to the services and features. By using these online services and features you consent to the to the
transmission of information as described in Section 5, DATA. transmission of information as described in Section 5, DATA.
</span> </span>
@ -526,11 +474,9 @@
<span class="c5 c1">4.</span> <span class="c5 c1">4.</span>
<span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span class="c5 c1">LICENSES FOR OTHER COMPONENTS.</span> <span class="c5 c1">LICENSES FOR OTHER COMPONENTS.</span>
<span class="c3 c1">&nbsp;The software may include third party components with separate legal <span class="c3 c1">&nbsp;The software may include third party components with separate legal notices or governed by
notices or governed by
other agreements, as described in the ThirdPartyNotices file accompanying the software. Even other agreements, as described in the ThirdPartyNotices file accompanying the software. Even
if such components are governed by other agreements, the disclaimers and the limitations on if such components are governed by other agreements, the disclaimers and the limitations on and
and
exclusions of damages below also apply.</span> exclusions of damages below also apply.</span>
</p> </p>
<p class="c2"> <p class="c2">
@ -542,35 +488,26 @@
<span class="c5 c1">a.</span> <span class="c5 c1">a.</span>
<span class="c1">&nbsp; &nbsp;</span> <span class="c1">&nbsp; &nbsp;</span>
<span class="c1 c5">Data Collection. </span> <span class="c1 c5">Data Collection. </span>
<span class="c1">The software may collect information about you and your use of the software, <span class="c1">The software may collect information about you and your use of the software, and send that to Microsoft.
and send that to Microsoft. Microsoft may use this information to provide services and improve our products and services.
Microsoft may use this information to provide services and improve our products and You may opt out of many of these scenarios, but not all, as described in the product documentation.
services. In using the software, you must comply with applicable law. You can learn more about data collection
You may opt out of many of these scenarios, but not all, as described in the product
documentation.
In using the software, you must comply with applicable law. You can learn more about data
collection
and use in the help documentation and the privacy statement at </span> and use in the help documentation and the privacy statement at </span>
<span class="c14 c1"> <span class="c14 c1">
<a class="c9" <a class="c9" href="http://go.microsoft.com/fwlink/?LinkId=398505">http://go.microsoft.com/fwlink/?LinkId=398505</a>
href="http://go.microsoft.com/fwlink/?LinkId=398505">http://go.microsoft.com/fwlink/?LinkId=398505</a>
</span> </span>
<span class="c1">.</span> <span class="c1">.</span>
<span class="c3 c1">&nbsp;Your use of the software operates as your consent to these <span class="c3 c1">&nbsp;Your use of the software operates as your consent to these practices.</span>
practices.</span>
</p> </p>
<p class="c8"> <p class="c8">
<span class="c5 c1">b.</span> <span class="c5 c1">b.</span>
<span class="c1">&nbsp; &nbsp;</span> <span class="c1">&nbsp; &nbsp;</span>
<span class="c5 c1">Processing of Personal Data. </span> <span class="c5 c1">Processing of Personal Data. </span>
<span class="c1">To the extent Microsoft is a processor or subprocessor of personal data in <span class="c1">To the extent Microsoft is a processor or subprocessor of personal data in connection with the software,
connection with the software, Microsoft makes the commitments in the European Union General Data Protection Regulation Terms
Microsoft makes the commitments in the European Union General Data Protection Regulation
Terms
of the Online Services Terms to all customers effective May 25, 2018, at </span> of the Online Services Terms to all customers effective May 25, 2018, at </span>
<span class="c1 c14"> <span class="c1 c14">
<a class="c9" <a class="c9" href="http://go.microsoft.com/?linkid=9840733">http://go.microsoft.com/?linkid=9840733</a>
href="http://go.microsoft.com/?linkid=9840733">http://go.microsoft.com/?linkid=9840733</a>
</span> </span>
<span class="c3 c1">.</span> <span class="c3 c1">.</span>
</p> </p>
@ -578,62 +515,48 @@
<span class="c5 c1">6.</span> <span class="c5 c1">6.</span>
<span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span class="c5 c1">FEEDBACK. </span> <span class="c5 c1">FEEDBACK. </span>
<span class="c3 c1">If you give feedback about the software to Microsoft, you give to Microsoft, <span class="c3 c1">If you give feedback about the software to Microsoft, you give to Microsoft, without charge, the
without charge, the
right to use, share and commercialize your feedback in any way and for any purpose. You will right to use, share and commercialize your feedback in any way and for any purpose. You will
not give feedback that is subject to a license that requires Microsoft to license its not give feedback that is subject to a license that requires Microsoft to license its software
software or documentation to third parties because we include your feedback in them. These rights survive
or documentation to third parties because we include your feedback in them. These rights
survive
this agreement.</span> this agreement.</span>
</p> </p>
<p class="c2"> <p class="c2">
<span class="c5 c1">7.</span> <span class="c5 c1">7.</span>
<span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span class="c5 c1">SCOPE OF LICENSE.</span> <span class="c5 c1">SCOPE OF LICENSE.</span>
<span class="c3 c1">&nbsp;The software is licensed, not sold. This agreement only gives you some <span class="c3 c1">&nbsp;The software is licensed, not sold. This agreement only gives you some rights to use the software.
rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this
Microsoft reserves all other rights. Unless applicable law gives you more rights despite
this
limitation, you may use the software only as expressly permitted in this agreement. &nbsp;In limitation, you may use the software only as expressly permitted in this agreement. &nbsp;In
doing so, you must comply with any technical limitations in the software that only allow you doing so, you must comply with any technical limitations in the software that only allow you
to use it in certain ways. You may not:</span> to use it in certain ways. You may not:</span>
</p> </p>
<p class="c8"> <p class="c8">
<span class="c3 c1">- &nbsp; &nbsp; work around any technical limitations in the <span class="c3 c1">- &nbsp; &nbsp; work around any technical limitations in the software;</span>
software;</span>
</p> </p>
<p class="c8"> <p class="c8">
<span class="c3 c1">- &nbsp; &nbsp; reverse engineer, decompile or disassemble the software, or <span class="c3 c1">- &nbsp; &nbsp; reverse engineer, decompile or disassemble the software, or attempt to do so, except
attempt to do so, except
and only to the extent required by third party licensing terms governing use of certain open and only to the extent required by third party licensing terms governing use of certain open
source components that may be included with the software;</span> source components that may be included with the software;</span>
</p> </p>
<p class="c8"> <p class="c8">
<span class="c3 c1">- &nbsp; &nbsp; remove, minimize, block or modify any notices of Microsoft <span class="c3 c1">- &nbsp; &nbsp; remove, minimize, block or modify any notices of Microsoft or its suppliers in the
or its suppliers in the
software; software;
</span> </span>
</p> </p>
<p class="c8"> <p class="c8">
<span class="c3 c1">- &nbsp; &nbsp; use the software in any way that is against the law; <span class="c3 c1">- &nbsp; &nbsp; use the software in any way that is against the law; or</span>
or</span>
</p> </p>
<p class="c8"> <p class="c8">
<span class="c3 c1">- &nbsp; &nbsp; share, publish, rent or lease the software, or provide the <span class="c3 c1">- &nbsp; &nbsp; share, publish, rent or lease the software, or provide the software as a stand-alone
software as a stand-alone
offering for others to use.</span> offering for others to use.</span>
</p> </p>
<p class="c2"> <p class="c2">
<span class="c5 c1">8. &nbsp; UPDATES. </span> <span class="c5 c1">8. &nbsp; UPDATES. </span>
<span class="c3 c1">The software may periodically check for updates and download and install <span class="c3 c1">The software may periodically check for updates and download and install them for you. You may obtain
them for you. You may obtain updates only from Microsoft or authorized sources. Microsoft may need to update your system to
updates only from Microsoft or authorized sources. Microsoft may need to update your system provide you with updates. You agree to receive these automatic updates without any additional
to notice. Updates may not include or support all existing software features, services, or peripheral
provide you with updates. You agree to receive these automatic updates without any
additional
notice. Updates may not include or support all existing software features, services, or
peripheral
devices. devices.
</span> </span>
</p> </p>
@ -641,74 +564,57 @@
<span class="c5 c1">9.</span> <span class="c5 c1">9.</span>
<span class="c1">&nbsp; &nbsp;</span> <span class="c1">&nbsp; &nbsp;</span>
<span class="c5 c1">EXPORT RESTRICTIONS.</span> <span class="c5 c1">EXPORT RESTRICTIONS.</span>
<span class="c3 c1">&nbsp;You must comply with all domestic and international export laws and <span class="c3 c1">&nbsp;You must comply with all domestic and international export laws and regulations that apply
regulations that apply to the software, which include restrictions on destinations, end users and end use. For further
to the software, which include restrictions on destinations, end users and end use. For
further
information on export restrictions, visit (aka.ms/exporting).</span> information on export restrictions, visit (aka.ms/exporting).</span>
</p> </p>
<p class="c2"> <p class="c2">
<span class="c5 c1">10.</span> <span class="c5 c1">10.</span>
<span class="c1">&nbsp;</span> <span class="c1">&nbsp;</span>
<span class="c5 c1">SUPPORT SERVICES. </span> <span class="c5 c1">SUPPORT SERVICES. </span>
<span class="c3 c1">Because the software is &ldquo;as is,&rdquo; we may not provide support <span class="c3 c1">Because the software is &ldquo;as is,&rdquo; we may not provide support services for it.</span>
services for it.</span>
</p> </p>
<p class="c2"> <p class="c2">
<span class="c5 c1">11.</span> <span class="c5 c1">11.</span>
<span class="c1">&nbsp;</span> <span class="c1">&nbsp;</span>
<span class="c5 c1">ENTIRE AGREEMENT.</span> <span class="c5 c1">ENTIRE AGREEMENT.</span>
<span class="c3 c1">&nbsp;This agreement, and the terms for supplements, updates, Internet-based <span class="c3 c1">&nbsp;This agreement, and the terms for supplements, updates, Internet-based services and support
services and support services that you use, are the entire agreement for the software and support services.</span>
services that you use, are the entire agreement for the software and support
services.</span>
</p> </p>
<p class="c2"> <p class="c2">
<span class="c5 c1">12.</span> <span class="c5 c1">12.</span>
<span class="c1">&nbsp;</span> <span class="c1">&nbsp;</span>
<span class="c5 c1">APPLICABLE LAW. </span> <span class="c5 c1">APPLICABLE LAW. </span>
<span class="c3 c1">If you acquired the software in the United States, Washington State law <span class="c3 c1">If you acquired the software in the United States, Washington State law applies to interpretation
applies to interpretation of and claims for breach of this agreement, and the laws of the state where you live apply to
of and claims for breach of this agreement, and the laws of the state where you live apply
to
all other claims. If you acquired the software in any other country, its laws apply.</span> all other claims. If you acquired the software in any other country, its laws apply.</span>
</p> </p>
<p class="c2"> <p class="c2">
<span class="c5 c1">13.</span> <span class="c5 c1">13.</span>
<span class="c1">&nbsp;</span> <span class="c1">&nbsp;</span>
<span class="c5 c1">CONSUMER RIGHTS; REGIONAL VARIATIONS. </span> <span class="c5 c1">CONSUMER RIGHTS; REGIONAL VARIATIONS. </span>
<span class="c3 c1">This agreement describes certain legal rights. You may have other rights, <span class="c3 c1">This agreement describes certain legal rights. You may have other rights, including consumer rights,
including consumer rights, under the laws of your state or country. Separate and apart from your relationship with Microsoft,
under the laws of your state or country. Separate and apart from your relationship with you may also have rights with respect to the party from which you acquired the software. This
Microsoft, agreement does not change those other rights if the laws of your state or country do not permit
you may also have rights with respect to the party from which you acquired the software. it to do so. For example, if you acquired the software in one of the below regions, or mandatory
This
agreement does not change those other rights if the laws of your state or country do not
permit
it to do so. For example, if you acquired the software in one of the below regions, or
mandatory
country law applies, then the following provisions apply to you:</span> country law applies, then the following provisions apply to you:</span>
</p> </p>
<p class="c8"> <p class="c8">
<span class="c5 c1">a.</span> <span class="c5 c1">a.</span>
<span class="c1">&nbsp; &nbsp;</span> <span class="c1">&nbsp; &nbsp;</span>
<span class="c5 c1">Australia. </span> <span class="c5 c1">Australia. </span>
<span class="c3 c1">You have statutory guarantees under the Australian Consumer Law and nothing <span class="c3 c1">You have statutory guarantees under the Australian Consumer Law and nothing in this agreement is
in this agreement is
intended to affect those rights.</span> intended to affect those rights.</span>
</p> </p>
<p class="c8"> <p class="c8">
<span class="c5 c1">b.</span> <span class="c5 c1">b.</span>
<span class="c1">&nbsp; &nbsp;</span> <span class="c1">&nbsp; &nbsp;</span>
<span class="c5 c1">Canada. </span> <span class="c5 c1">Canada. </span>
<span class="c3 c1">If you acquired the software in Canada, you may stop receiving updates by <span class="c3 c1">If you acquired the software in Canada, you may stop receiving updates by turning off the automatic
turning off the automatic update feature, disconnecting your device from the Internet (if and when you re-connect to the
update feature, disconnecting your device from the Internet (if and when you re-connect to Internet, however, the software will resume checking for and installing updates), or uninstalling
the the software. The product documentation, if any, may also specify how to turn off updates for
Internet, however, the software will resume checking for and installing updates), or
uninstalling
the software. The product documentation, if any, may also specify how to turn off updates
for
your specific device or software.</span> your specific device or software.</span>
</p> </p>
<p class="c8"> <p class="c8">
@ -721,10 +627,8 @@
<span class="c5 c1">(i)</span> <span class="c5 c1">(i)</span>
<span class="c1">&nbsp; &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class="c1">&nbsp; &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span class="c5 c1">Warranty</span> <span class="c5 c1">Warranty</span>
<span class="c3 c1">. The properly licensed software will perform substantially as described in <span class="c3 c1">. The properly licensed software will perform substantially as described in any Microsoft materials
any Microsoft materials that accompany the software. However, Microsoft gives no contractual guarantee in relation to
that accompany the software. However, Microsoft gives no contractual guarantee in relation
to
the licensed software.</span> the licensed software.</span>
</p> </p>
<p class="c6"> <p class="c6">
@ -734,103 +638,74 @@
<span class="c5 c1">(ii)</span> <span class="c5 c1">(ii)</span>
<span class="c1">&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class="c1">&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span class="c5 c1">Limitation of Liability</span> <span class="c5 c1">Limitation of Liability</span>
<span class="c3 c1">. In case of intentional conduct, gross negligence, claims based on the <span class="c3 c1">. In case of intentional conduct, gross negligence, claims based on the Product Liability Act, as
Product Liability Act, as well as, in case of death or personal or physical injury, Microsoft is liable according to the
well as, in case of death or personal or physical injury, Microsoft is liable according to
the
statutory law.</span> statutory law.</span>
</p> </p>
<p class="c10"> <p class="c10">
<span class="c3 c1">Subject to the foregoing clause (ii), Microsoft will only be liable for <span class="c3 c1">Subject to the foregoing clause (ii), Microsoft will only be liable for slight negligence if Microsoft
slight negligence if Microsoft is in breach of such material contractual obligations, the fulfillment of which facilitate the
is in breach of such material contractual obligations, the fulfillment of which facilitate due performance of this agreement, the breach of which would endanger the purpose of this agreement
the and the compliance with which a party may constantly trust in (so-called &quot;cardinal obligations&quot;).
due performance of this agreement, the breach of which would endanger the purpose of this In other cases of slight negligence, Microsoft will not be liable for slight negligence.</span>
agreement
and the compliance with which a party may constantly trust in (so-called &quot;cardinal
obligations&quot;).
In other cases of slight negligence, Microsoft will not be liable for slight
negligence.</span>
</p> </p>
<p class="c2"> <p class="c2">
<span class="c5 c1">14.</span> <span class="c5 c1">14.</span>
<span class="c1">&nbsp;</span> <span class="c1">&nbsp;</span>
<span class="c5 c1">LEGAL EFFECT.</span> <span class="c5 c1">LEGAL EFFECT.</span>
<span class="c3 c1">&nbsp;This agreement describes certain legal rights. You may have other <span class="c3 c1">&nbsp;This agreement describes certain legal rights. You may have other rights under the laws of
rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software.
your country. You may also have rights with respect to the party from whom you acquired the This agreement does not change your rights under the laws of your country if the laws of your
software.
This agreement does not change your rights under the laws of your country if the laws of
your
country do not permit it to do so.</span> country do not permit it to do so.</span>
</p> </p>
<p class="c2"> <p class="c2">
<span class="c5 c1">15.</span> <span class="c5 c1">15.</span>
<span class="c1">&nbsp;</span> <span class="c1">&nbsp;</span>
<span class="c4 c1">DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED &ldquo;AS-IS.&rdquo; <span class="c4 c1">DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED &ldquo;AS-IS.&rdquo; &nbsp;YOU BEAR THE RISK OF
&nbsp;YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. TO THE EXTENT PERMITTED
USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. TO THE EXTENT
PERMITTED
UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.</span> FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.</span>
</p> </p>
<p class="c2"> <p class="c2">
<span class="c5 c1">16.</span> <span class="c5 c1">16.</span>
<span class="c1">&nbsp;</span> <span class="c1">&nbsp;</span>
<span class="c4 c1">LIMITATION ON AND EXCLUSION OF DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND <span class="c4 c1">LIMITATION ON AND EXCLUSION OF DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT
ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST
DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL,
LOST
PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.</span> PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.</span>
</p> </p>
<p class="c0"> <p class="c0">
<span class="c3 c1">This limitation applies to (a) anything related to the software, services, <span class="c3 c1">This limitation applies to (a) anything related to the software, services, content (including code)
content (including code) on third party Internet sites, or third party programs; and (b) claims for breach of contract,
on third party Internet sites, or third party programs; and (b) claims for breach of breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the
contract,
breach of warranty, guarantee or condition, strict liability, negligence, or other tort to
the
extent permitted by applicable law.</span> extent permitted by applicable law.</span>
</p> </p>
<p class="c0"> <p class="c0">
<span class="c3 c1">It also applies even if Microsoft knew or should have known about the <span class="c3 c1">It also applies even if Microsoft knew or should have known about the possibility of the damages.
possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the
The above limitation or exclusion may not apply to you because your country may not allow
the
exclusion or limitation of incidental, consequential or other damages.</span> exclusion or limitation of incidental, consequential or other damages.</span>
</p> </p>
<p class="c12"> <p class="c12">
<span class="c4 c1">Please note: As the software is distributed in Quebec, Canada, some of the <span class="c4 c1">Please note: As the software is distributed in Quebec, Canada, some of the clauses in this agreement
clauses in this agreement
are provided below in French.</span> are provided below in French.</span>
</p> </p>
<p class="c12"> <p class="c12">
<span class="c4 c1">Remarque : Ce logiciel &eacute;tant distribu&eacute; au Qu&eacute;bec, <span class="c4 c1">Remarque : Ce logiciel &eacute;tant distribu&eacute; au Qu&eacute;bec, Canada, certaines des clauses
Canada, certaines des clauses
dans ce contrat sont fournies ci-dessous en fran&ccedil;ais.</span> dans ce contrat sont fournies ci-dessous en fran&ccedil;ais.</span>
</p> </p>
<p class="c11"> <p class="c11">
<span class="c5 c1">EXON&Eacute;RATION DE GARANTIE.</span> <span class="c5 c1">EXON&Eacute;RATION DE GARANTIE.</span>
<span class="c1 c3">&nbsp;Le logiciel vis&eacute; par une licence est offert &laquo; tel quel <span class="c1 c3">&nbsp;Le logiciel vis&eacute; par une licence est offert &laquo; tel quel &raquo;. Toute utilisation
&raquo;. Toute utilisation de ce logiciel est &agrave; votre seule risque et p&eacute;ril. Microsoft n&rsquo;accorde aucune
de ce logiciel est &agrave; votre seule risque et p&eacute;ril. Microsoft n&rsquo;accorde autre garantie expresse. Vous pouvez b&eacute;n&eacute;ficier de droits additionnels en vertu
aucune du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles
autre garantie expresse. Vous pouvez b&eacute;n&eacute;ficier de droits additionnels en sont permises par le droit locale, les garanties implicites de qualit&eacute; marchande, d&rsquo;ad&eacute;quation
vertu
du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou
elles
sont permises par le droit locale, les garanties implicites de qualit&eacute; marchande,
d&rsquo;ad&eacute;quation
&agrave; un usage particulier et d&rsquo;absence de contrefa&ccedil;on sont exclues. &agrave; un usage particulier et d&rsquo;absence de contrefa&ccedil;on sont exclues.
</span> </span>
</p> </p>
<p class="c11"> <p class="c11">
<span class="c5 c1">LIMITATION DES DOMMAGES-INT&Eacute;R&Ecirc;TS ET EXCLUSION DE <span class="c5 c1">LIMITATION DES DOMMAGES-INT&Eacute;R&Ecirc;TS ET EXCLUSION DE RESPONSABILIT&Eacute; POUR LES DOMMAGES.</span>
RESPONSABILIT&Eacute; POUR LES DOMMAGES.</span> <span class="c3 c1">&nbsp;Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages
<span class="c3 c1">&nbsp;Vous pouvez obtenir de Microsoft et de ses fournisseurs une directs uniquement &agrave; hauteur de 5,00 $ US. Vous ne pouvez pr&eacute;tendre &agrave; aucune
indemnisation en cas de dommages
directs uniquement &agrave; hauteur de 5,00 $ US. Vous ne pouvez pr&eacute;tendre &agrave;
aucune
indemnisation pour les autres dommages, y compris les dommages sp&eacute;ciaux, indirects ou indemnisation pour les autres dommages, y compris les dommages sp&eacute;ciaux, indirects ou
accessoires et pertes de b&eacute;n&eacute;fices.</span> accessoires et pertes de b&eacute;n&eacute;fices.</span>
</p> </p>
@ -838,36 +713,26 @@
<span class="c3 c1">Cette limitation concerne :</span> <span class="c3 c1">Cette limitation concerne :</span>
</p> </p>
<p class="c2"> <p class="c2">
<span class="c3 c1">- &nbsp; &nbsp; &nbsp; &nbsp; tout ce qui est reli&eacute; au logiciel, aux <span class="c3 c1">- &nbsp; &nbsp; &nbsp; &nbsp; tout ce qui est reli&eacute; au logiciel, aux services ou au contenu
services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et</span>
(y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ;
et</span>
</p> </p>
<p class="c2"> <p class="c2">
<span class="c3 c1">- &nbsp; &nbsp; &nbsp; &nbsp; les r&eacute;clamations au titre de violation <span class="c3 c1">- &nbsp; &nbsp; &nbsp; &nbsp; les r&eacute;clamations au titre de violation de contrat ou de garantie,
de contrat ou de garantie, ou au titre de responsabilit&eacute; stricte, de n&eacute;gligence ou d&rsquo;une autre faute
ou au titre de responsabilit&eacute; stricte, de n&eacute;gligence ou d&rsquo;une autre
faute
dans la limite autoris&eacute;e par la loi en vigueur.</span> dans la limite autoris&eacute;e par la loi en vigueur.</span>
</p> </p>
<p class="c12"> <p class="c12">
<span class="c3 c1">Elle s&rsquo;applique &eacute;galement, m&ecirc;me si Microsoft connaissait <span class="c3 c1">Elle s&rsquo;applique &eacute;galement, m&ecirc;me si Microsoft connaissait ou devrait conna&icirc;tre
ou devrait conna&icirc;tre
l&rsquo;&eacute;ventualit&eacute; d&rsquo;un tel dommage. Si votre pays n&rsquo;autorise pas l&rsquo;&eacute;ventualit&eacute; d&rsquo;un tel dommage. Si votre pays n&rsquo;autorise pas
l&rsquo;exclusion ou la limitation de responsabilit&eacute; pour les dommages indirects, l&rsquo;exclusion ou la limitation de responsabilit&eacute; pour les dommages indirects, accessoires
accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l&rsquo;exclusion ci-dessus
ou de quelque nature que ce soit, il se peut que la limitation ou l&rsquo;exclusion
ci-dessus
ne s&rsquo;appliquera pas &agrave; votre &eacute;gard.</span> ne s&rsquo;appliquera pas &agrave; votre &eacute;gard.</span>
</p> </p>
<p class="c16"> <p class="c16">
<span class="c5 c1">EFFET JURIDIQUE.</span> <span class="c5 c1">EFFET JURIDIQUE.</span>
<span class="c3 c1">&nbsp;Le pr&eacute;sent contrat d&eacute;crit certains droits juridiques. <span class="c3 c1">&nbsp;Le pr&eacute;sent contrat d&eacute;crit certains droits juridiques. Vous pourriez avoir d&rsquo;autres
Vous pourriez avoir d&rsquo;autres droits pr&eacute;vus par les lois de votre pays. Le pr&eacute;sent contrat ne modifie pas les
droits pr&eacute;vus par les lois de votre pays. Le pr&eacute;sent contrat ne modifie pas droits que vous conf&egrave;rent les lois de votre pays si celles-ci ne le permettent pas.</span>
les
droits que vous conf&egrave;rent les lois de votre pays si celles-ci ne le permettent
pas.</span>
</p> </p>
<p class="c15"> <p class="c15">
<span class="c3 c1"></span> <span class="c3 c1"></span>
@ -875,9 +740,9 @@
<p class="c16"> <p class="c16">
<span class="c3 c1">&nbsp;</span> <span class="c3 c1">&nbsp;</span>
</p> </p>
<p class="c11"> <p class="c11">
<span class="c3 c1">@copyrightText@</span> <span class="c3 c1">LEGO, the LEGO logo, MINDSTORMS and the MINDSTORMS EV3 logo are trademarks and/ or copyrights of
the LEGO Group. &copy;2018 The LEGO Group. All rights reserved.</span>
</p> </p>
<p class="c11"> <p class="c11">
<span class="c3 c1">&nbsp;</span> <span class="c3 c1">&nbsp;</span>
@ -890,30 +755,27 @@
</p> </p>
</div> </div>
</div> </div>
<div id="agree-segment" class="ui center aligned segment hidden"> <div class="ui center aligned segment">
<input id="agree-checkbox" type="checkbox" autocomplete="off" onchange="agreeCheckboxChanged(this)"> <input id="agree-checkbox" type="checkbox" autocomplete="off" onchange="agreeCheckboxChanged(this)">
<label for="agree-checkbox">I agree to these Microsoft Software License Terms and to the <label for="agree-checkbox">I agree to these Microsoft Software License Terms and to the
<a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement.</a> <a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement.</a>
</label> </label>
</div> </div>
<div id="no-download-segment" class="ui center aligned segment hidden">
<p>Sorry, there is no Offline App available for this editor.</p>
</div>
<div id="download-segment" class="ui center aligned segment hidden"> <div id="download-segment" class="ui center aligned segment hidden">
<div class="ui grid"> <div class="ui grid">
<div class="eight wide column"> <div class="eight wide column">
<h3 class="ui">Windows</h3> <h3 class="ui">Windows</h3>
<a id="download-win64" class="ui icon button" onclick="downloadWin64()"> <button class="ui icon button" onclick="downloadWin64()">
<i class="download icon"></i> <i class="download icon"></i>
makecode-@targetid@-setup-win64.exe makecode-ev3-setup-win64.exe
</a> </button>
</div> </div>
<div class="eight wide column"> <div class="eight wide column">
<h3 class="ui">Mac OS</h3> <h3 class="ui">Mac OS</h3>
<a id="download-mac64" class="ui icon button" onclick="downloadMac64()"> <button class="ui icon button" onclick="downloadMac64()">
<i class="download icon"></i> <i class="download icon"></i>
makecode-@targetid@-mac64.zip makecode-ev3-mac64.zip
</a> </button>
</div> </div>
</div> </div>
</div> </div>

View File

@ -36,14 +36,6 @@
"name": "Line following with 1 color sensor", "name": "Line following with 1 color sensor",
"description": "Simple line following using the color sensor.", "description": "Simple line following using the color sensor.",
"youTubeId": "_LeduyKQVjg" "youTubeId": "_LeduyKQVjg"
}, {
"name": "Proportional line following with 1 color sensor",
"description": "Proportional line following using the color sensor.",
"youTubeId": "-AirqwC9DL4"
}, {
"name": "Proportional line following with 2 color sensors",
"description": "Proportional line following using two color sensor.",
"youTubeId": "QWOflBuu9Oo"
}] }]
``` ```

View File

@ -524,7 +524,6 @@ void stopProgram() {
} }
extern "C" void target_reset() { extern "C" void target_reset() {
pthread_mutex_trylock(&execMutex);
stopMotors(); stopMotors();
stopProgram(); stopProgram();
if (lmsPid) if (lmsPid)

View File

@ -1,6 +1,6 @@
{ {
"name": "pxt-ev3", "name": "pxt-ev3",
"version": "1.2.22", "version": "1.2.21",
"description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode", "description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode",
"private": false, "private": false,
"keywords": [ "keywords": [

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

View File

@ -0,0 +1,55 @@
namespace pxsim {
export class RobotGameTable {
readonly ctx: CanvasRenderingContext2D;
readonly data: ImageData;
cx: number; // cm
cy: number; // cm
angle: number; // radians
cwidth: number; // cm
constructor(public canvas: HTMLCanvasElement, public scale: number) {
this.ctx = this.canvas.getContext("2d");
this.data = this.ctx.getImageData(0, 0, this.canvas.width, this.canvas.height);
this.cx = this.width / 2;
this.cy = 0;
}
/**
* Gets the width in cm
*/
get width() {
return this.canvas.width * this.scale;
}
/**
* gets the height in cm
*/
get height() {
return this.canvas.height * this.scale;
}
color(): number {
// compute color sensor position from center;
// todo
const px = Math.max(0, Math.min(this.data.width, (this.cx ) / this.scale));
const py = Math.max(0, Math.min(this.data.height, (this.cy ) / this.scale));
// get color
const i = px * this.data.width + py;
let c =
(this.data.data[i] << 16) | (this.data.data[i + 1] << 8) | (this.data.data[i + 2]);
// map color to known color
return c;
}
intensity(): number {
const c = this.color();
return ((c >> 16 & 0xff) + (c >> 8 & 0xff) + (c & 0xff)) / 3;
}
ultrasonicDistance() {
// obstacles?
}
}
}

View File

@ -27,6 +27,6 @@
"Videos": "videos" "Videos": "videos"
}, },
"electronManifest": { "electronManifest": {
"latest": "v1.1.22" "latest": "v1.1.20"
} }
} }