Skip to content

Commit

Permalink
release
Browse files Browse the repository at this point in the history
  • Loading branch information
cfry committed Mar 24, 2023
1 parent 7d0de9f commit d27764f
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 10 deletions.
2 changes: 1 addition & 1 deletion HCA/ipg_to_json.js
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ grab_io('(myt "myn ame", myt2 myn2)')
grab_io(str)
*/
static grab_io(str, start_index=0) {
if(str.includes("MSB008 MSB008)")) { debugger; }
if(str.includes("MSB008 MSB008)")) { }
let cur_term = ""
let cur_pair
let pair_array = [] //the main result
Expand Down
4 changes: 2 additions & 2 deletions core/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
global.dde_version = "3.8.13" //require("../package.json").version
global.dde_release_date = "Nov 24, 2022" //require("../package.json").release_date
global.dde_version = "3.8.14" //require("../package.json").version
global.dde_release_date = "Mar 24, 2022" //require("../package.json").release_date

console.log("dde_version: " + global.dde_version + " dde_release_date: " + global.dde_release_date +
"\nRead electron_dde/core/job_engine_doc.txt for how to use the Job Engine.\n")
Expand Down
12 changes: 11 additions & 1 deletion core/robot.js
Original file line number Diff line number Diff line change
Expand Up @@ -1441,6 +1441,16 @@ Dexter = class Dexter extends Robot {
else if((error_code !== 0) && (oplet !== "r")){ //we've got an error
//job_instance.stop_for_reason("errored", "Robot status got error: " + error_code)
job_instance.wait_until_instruction_id_has_run = null //but don't increment PC
let busy_job_array_copy = rob.busy_job_array.slice()
rob.clear_busy_job_array() //so that the other jobs that I call set_up_next_do, won't hang up because they are busy,
//because they no longer should be busy, because we got back our ack from Dexter that was keeping them busy,
for(let busy_job of busy_job_array_copy){
if(busy_job === job_instance) {} //let this pass through to the below as the passed in robot_status is from this instrr and this job_instance
else {
busy_job.set_up_next_do(0) //now execute the instr at the PC in an OTHER job, without advancing it.
return
}
}
let instruction_to_run_when_error = job_instance.if_robot_status_error //.call(job_instance, robot_status)
if(instruction_to_run_when_error){
//note instruction_to_run_when_error can be a single instruction or an array
Expand Down Expand Up @@ -1522,7 +1532,7 @@ Dexter = class Dexter extends Robot {
clean_up_busy_job_array(){
let result = []
for(let a_job of this.busy_job_array){
if(a_job.is_active()) { //remove inactive jobs from busy_job_array by preserviong the still active ones
if(a_job.is_active()) { //remove inactive jobs from busy_job_array by preserving the still active ones
if(!result.includes(a_job)) { //remove duplicates
result.push(a_job)
}
Expand Down
5 changes: 5 additions & 0 deletions core/socket.js
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,11 @@ var Socket = class Socket{
let job_id = robot_status[Dexter.JOB_ID]
let job_instance = Job.job_id_to_job_instance(job_id)
//out(job_instance.name + " " + rob.name + " bottom of Socket.on_receive with: " + robot_status)

if(oplet === "M"){ //todo just temporary for testing. remove.
robot_status[Dexter.ERROR_CODE] = 9
}

dexter_instance.robot_done_with_instruction(robot_status) //robot_status ERROR_CODE *might* be 1
}

Expand Down
4 changes: 2 additions & 2 deletions doc/guide.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

<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.13</span><br/>
released: <span id="dde_release_date_id">Nov 24, 2022</span>
version: <span id="dde_version_id">3.8.14</span><br/>
released: <span id="dde_release_date_id">Mar 24, 2022</span>
<p></p>
DDE helps you create, debug, and send software to a Dexter robot.
You can use any JavaScript augmented with DDE-specific functions to help find out about,
Expand Down
19 changes: 19 additions & 0 deletions doc/release_notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,25 @@
.doc_details summary { font-weight: 600; }
</style>

<details class="doc_details"><summary>v 3.8.14, Mar 24, 2023</summary>
Highlights mathjs installed, fixes and extensions for class Vector that uses mathjs.
Fix and extension for Defaults.make_ins processing.
<ul>
<li>Fixed bug in Jobs menu Show Robot Status whereby,
if the last job run had a robot that was not a Dexter,
it would not display the dialog box.</li>
<li>Fixed bug in <code>to_source_code</code> in the argument when calling to_source_code_lit_obj.</li>
<li>Fix for <code>Dexter.prototype.defaults_high_level_to_defaults_lines_ServoSetup_line</code>
about duplicate RebootServo written out to defaults.make_ins</li>
<li>Extended <code>Defaults.make_ins</code> parsing and writing back out to accomadate <code>CmdXor</code> processing.</li>
<li><code>Vector.rotate</code> fixed for "term3"</li>
<li>Fixed doc eval_after_changing_dde-init</li>
<li><code>mathjs</code> is now installed in DDE3. To use it: for example, <code>mathjs.eigs(...)</code></li>
<li>Vector.js new methods on <code>Vector</code> class: <code>circle_fit_3D</code>,
<code>circle_fit_2D</code>, <code>plane_fit</code>. plane_fit calls <code>mathjs.eigs</code></li>
<li><code>Dexter.robot_done_with_instruction</code> extended to better handle errors.</li>
</ul>
</details>
<details class="doc_details"><summary>v 3.8.13, Nov 24, 2022</summary>
Highlights: Big fixes to Dexter.defaults, zip file support
<ul>
Expand Down
2 changes: 1 addition & 1 deletion math/Vector.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//James Wigglesworth
//Started: 6_18_16
//Updated: 2_28_23
var mathjs = require(DDE_NPM.folder + "mathjs") // needed for Vector.plane_fit(), 'mathjs' avoids confusion of 'Math' vs 'math'
var mathjs = require(/*DDE_NPM.folder + */ "mathjs") // needed for Vector.plane_fit(), 'mathjs' avoids confusion of 'Math' vs 'math'

var dde_github_issues = "https://github.com/cfry/dde/issues"

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "dexter_dev_env",
"productName": "dexter_dev_env",
"version": "3.8.13",
"release_date": "Nov 24, 2022",
"version": "3.8.14",
"release_date": "Mar 24, 2022",
"description": "Dexter Development Environment for programming the Dexter robot.",
"author": "Fry",
"license": "GPL-3.0",
Expand Down Expand Up @@ -46,7 +46,7 @@
"js-beautify": "^1.13.13",
"litegraph.js": "^0.7.9",
"mark.js": "^8.11.1",
"mathjs": "^5.3.1",
"mathjs": "^5.10.3",
"modbus-serial": "^7.8.1",
"multicast-dns": "^7.2.0",
"nano-time": "^1.0.0",
Expand Down
2 changes: 2 additions & 0 deletions ready.js
Original file line number Diff line number Diff line change
Expand Up @@ -1848,6 +1848,8 @@ var {FPGA} = require("./core/fpga.js")
var {Simqueue} = require("./core/simqueue.js")
require('./core/dexter_defaults.js')

var mathjs = require(/*DDE_NPM.folder + */ "mathjs")



//packages for package sake.
Expand Down

0 comments on commit d27764f

Please sign in to comment.