Skip to content

Commit

Permalink
release
Browse files Browse the repository at this point in the history
  • Loading branch information
cfry committed Oct 24, 2022
1 parent 7b67955 commit 773ad89
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 9 deletions.
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.10" //require("../package.json").version
global.dde_release_date = "Oct 22, 2022" //require("../package.json").release_date
global.dde_version = "3.8.11" //require("../package.json").version
global.dde_release_date = "Oct 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
5 changes: 4 additions & 1 deletion core/robot.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ var Robot = class Robot {
}

static get_simulate_actual(simulate_val){
if (simulate_val === true) { return true }
if(platform === "node") {
return false //because now when in job engine, never attempt to run simulator
}
else if (simulate_val === true) { return true }
else if (simulate_val === false) { return false }
else if (simulate_val === "both") { return "both" }
else if (simulate_val === null) { return persistent_get("default_dexter_simulate") }
Expand Down
2 changes: 1 addition & 1 deletion core/socket.js
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ var Socket = class Socket{
job_instance.sent_instructions_strings.push(str)
}
const arr_buff = Socket.string_to_array_buffer(str)
const sim_actual = Robot.get_simulate_actual(rob.simulate)
var sim_actual = Robot.get_simulate_actual(rob.simulate)
if((sim_actual === true) || (sim_actual === "both")){
let sim_inst = DexterSim.robot_name_to_dextersim_instance_map[robot_name]
if(sim_inst) {
Expand Down
2 changes: 1 addition & 1 deletion core/storage.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function get_persistent_values_defaults() {
"files_menu_paths": [add_default_file_prefix_maybe("dde_init.js")],
"misc_pane_content": "Simulate Dexter",
"misc_pane_choose_file_path": "", //only used on dde init, and only if misc_pane_content is "choose_file"
"default_dexter_simulate": true,
"default_dexter_simulate": ((platform === "node") ? false : true),
"editor_font_size": 17,

"dde_window_x": 50,
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.10</span><br/>
released: <span id="dde_release_date_id">Oct 22, 2022</span>
version: <span id="dde_version_id">3.8.11</span><br/>
released: <span id="dde_release_date_id">Oct 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
10 changes: 10 additions & 0 deletions doc/release_notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@
}
.doc_details summary { font-weight: 600; }
</style>
<details class="doc_details"><summary>v 3.8.11, Oct 24, 2022</summary>
Highlights: bug fixes for Job Engine
<ul>
<li>Fixed the initial defaulting of simulate at first launch to be:
If in the job_engine: <code>false</code>, else <code>true</code>.</li>
<li><code>get_simulate_actual</code> now will always return false if we're running the job engine.
While running Jobs in the Job engine, you can't simulate them.</li>
</ul>
</details>

<details class="doc_details"><summary>v 3.8.10, Oct 22, 2022</summary>
Highlights: Job Engine Improvements, Dexter UI tutorial Improvements.
<ul>
Expand Down
4 changes: 2 additions & 2 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.10",
"release_date": "Oct 22, 2022",
"version": "3.8.11",
"release_date": "Oct 24, 2022",
"description": "Dexter Development Environment for programming the Dexter robot.",
"author": "Fry",
"license": "GPL-3.0",
Expand Down

0 comments on commit 773ad89

Please sign in to comment.