Skip to content

Commit

Permalink
releaase to fix build process after removing scp2 npm package
Browse files Browse the repository at this point in the history
  • Loading branch information
cfry committed Jun 23, 2022
1 parent 59dc755 commit 738084d
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 440 deletions.
2 changes: 1 addition & 1 deletion core/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
global.dde_version = "3.8.6" //require("../package.json").version
global.dde_version = "3.8.7" //require("../package.json").version
global.dde_release_date = "Jun 22, 2022" //require("../package.json").release_date

console.log("dde_version: " + global.dde_version + " dde_release_date: " + global.dde_release_date +
Expand Down
2 changes: 1 addition & 1 deletion doc/guide.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<details class="doc_details"><summary>About</summary>
This is <a href="http://hdrobotic.com/" target="_blank">Dexter</a> Development Environment<br/>
version: <span id="dde_version_id">3.8.6</span><br/>
version: <span id="dde_version_id">3.8.7</span><br/>
released: <span id="dde_release_date_id">Jun 22, 2022</span>
<p></p>
DDE helps you create, debug, and send software to a Dexter robot.
Expand Down
8 changes: 7 additions & 1 deletion doc/release_notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,15 @@
}
.doc_details summary { font-weight: 600; }
</style>
<details class="doc_details"><summary>v 3.8.7, Jun 22, 2022</summary>
Please see release notes for v 3.8.6
</details>

<details class="doc_details"><summary>v 3.8.6, Jun 22, 2022</summary>
Highlights: Bug fixes for SSH.run_command, SW.close_window, read_file_async.<br/>
Warning: This release failed to build. Please use 3.8.7 instead.
But the below notes are still accurate.<br/>
Highlights:
Bug fixes for SSH.run_command, SW.close_window, read_file_async.<br/>
Simulator extended for Dexter.read_from_robot("#StepAngles") #MeasuredAngles & #POM.<br/>
The "net" npm package is now exported as a global variable.
Dexter.defaults and Dexter instances property "defaults" now mirrors Defaults.make_ins.
Expand Down
431 changes: 0 additions & 431 deletions file_transfer.js

This file was deleted.

4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
<script type="text/javascript" src="picture1.js"></script>
<script type="text/javascript" src="ros_interface.js"></script>
<script type="text/javascript" src="ssh.js"></script>
<script type="text/javascript" src="file_transfer.js"></script>
<!-- <script type="text/javascript" src="file_transfer.js"></script> -->


<link rel="stylesheet" href="ui_widgets/awesomplete.css"/>
Expand Down Expand Up @@ -674,7 +674,7 @@
<li id="reboot_joints_id" title="Re-enable Joints 6 & 7&#13;when they have been disabled and red lights flash,&#13;Documentation will be shown when you choose this.">Reboot Joints</li>
<li id="show_errors_log_id" title="Show the content of the file errors.log&#13;on the default Dexter.">Show errors.log</li>
<li id="dexter_start_options_id" title="View and set the operations run&#13;when the Dexter selected in the Misc Pane header&#13;is turned on.">Start Options</li>
<li id="update_firmware_id" title="Update the software on the default Dexter&#13;(selected in the Misc Pane header).">Update Firmware</li>
<!--<li id="update_firmware_id" title="Update the software on the default Dexter&#13;(selected in the Misc Pane header).">Update Firmware</li> uses scp2 which now causes build errors-->
</ul>
</li>
<li id="run_job_on_dexter_id" title="Grab the Job defined in the selection,&#13;send it to the Job's Dexter robot,&#13;define and start it in the Job Engine.&#13;Warning: takes 40 seconds to start.">Run Job on Dexter</li>
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dexter_dev_env",
"productName": "dexter_dev_env",
"version": "3.8.6",
"version": "3.8.7",
"release_date": "Jun 22 2022",
"description": "Dexter Development Environment for programming the Dexter robot.",
"author": "Fry",
Expand Down Expand Up @@ -60,7 +60,6 @@
"pump": "^3.0.0",
"request": "^2.79.0",
"rotating-calipers": "0.0.0",
"scp2": "^0.5.0",
"semver": "^5.4.1",
"serialport": "^8.0.0",
"shepherd.js": "^8.0.2",
Expand Down
3 changes: 1 addition & 2 deletions ready.js
Original file line number Diff line number Diff line change
Expand Up @@ -1447,7 +1447,7 @@ show_errors_log_id.onclick = function(){
}
dexter_start_options_id.onclick = show_dexter_start_options

update_firmware_id.onclick = FileTransfer.show_dialog
//update_firmware_id.onclick = FileTransfer.show_dialog

run_job_on_dexter_id.onclick = function() {
let job_src = Editor.get_any_selection() //we want to be able to select a Job def in
Expand Down Expand Up @@ -1867,7 +1867,6 @@ var opencv_js = require("opencv.js")
var plotly_js_dist = require("plotly.js-dist")
//var pump = require("pump") //already declared
//var request = require("request") //already declared
var scp2 = require("scp2")
var semver = require("semver")
var serialport = require("serialport")
var simple_get = require("simple-get")
Expand Down

0 comments on commit 738084d

Please sign in to comment.