Skip to content

Commit

Permalink
release
Browse files Browse the repository at this point in the history
  • Loading branch information
@cfry
cfry committed May 1, 2017
1 parent d27e772 commit 9433c8b
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 17 deletions.
4 changes: 2 additions & 2 deletions doc/guide.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</style>
<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">1.1.5</span><br/>
released: <span id="dde_release_date_id">Apr 30, 2017</span>
version: <span id="dde_version_id">1.1.6</span><br/>
released: <span id="dde_release_date_id">May 1, 2017</span>
<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
9 changes: 5 additions & 4 deletions doc/ref_man.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,14 +359,15 @@

<details id="persistent_get_doc_id" style="margin-left:40px;"><summary>persistent_get</summary>
Retreives a literal that was set with <code>persistent_set</code>
The first argument is the key to retreive. Its default value is <code>"get_all"</code>
The argument is the key to retreive. Its default value is <code>"get_all"</code>
which gets a JavaScript literal object that has key-value pairs for all the
calls to <code>persistent_set</code>. If a key is not in the database,
<code>undefined</code> will be retreived.
<p/>
The 2nd arg is a callback that is passed the retreived value.
Its default value is the DDE function <code>out</code>.<br/>
<b>Example:</b> <code> persistent_get("test4", function(val){ out("Got: " + val)})</code>
persistent_get returns the value of the variable in the argument.<br/>
<b>Example:</b> <br/>
<code> persistent_set("test4", 44)</code><br/>
<code> persistent_get("test4")</code> => 44<br/>
</details> <!-- end persistent_get -->

<details id="persistent_initialize_doc_id" style="margin-left:40px;"><summary>persistent_initialize</summary>
Expand Down
18 changes: 10 additions & 8 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<div id="left_splitter">
<div>
<div class="pane_header_wrapper" style="height:50px;min-height:50px;max-height:50px;">
<span id="javascript_pane_help_id" class="pane_header" title="Click for help.">JavaScript</span>
<span id="javascript_pane_help_id" class="pane_header" title="Click for help." style="vertical-align:super;"><u>JavaScript</u></span>
<div id='js_menubar_id' class='dde_menu' style="display:inline-block;">
<ul style="display:inline-block;padding:0;margin-top:0px;">
<li style="display:inline-block;">File&#9660;
Expand Down Expand Up @@ -477,17 +477,19 @@
</li>
</ul>
</div>
<div style="vertical-align:top;display:inline-block;line-height: 1.0;">font<br/>size:</div>
<input id="font_size_id" type="number" style="vertical-align:top; width:30px;" value="17" min="6"/>
<select id="file_name_id" style="width:360px;font-size:14px;"><option>new file</option></select>
ROS url: <input id='dexter_url' value="localhost:9090" style="font-size:14px;"/>
<div style="vertical-align:top;display:inline-block;line-height: 1.0;font-size:10px;margin:0px;padding:0px;">
fontsize<br/>
<input id="font_size_id" type="number" style="vertical-align:top; width:30px;" value="17" min="6"/>
</div>
<select id="file_name_id" style="width:450px;font-size:14px;"><option>new file</option></select>
<!--ROS url: <input id='dexter_url' value="localhost:9090" style="font-size:14px;"/> -->
</div>
<textarea id="js_textarea" wrap="off" style="width:98%; height:84%; font-size:17px; font-family:monospace;padding:4px;"
placeholder="Enter JavaScript code here."></textarea>
</div>
<div style="background-color:#dddddd;">
<div class='pane_header_wrapper' style="white-space:nowrap;height:57px;min-height:57px;max-height:57px;">
<span id="output_pane_help_id" class='pane_header' title="Click for help.">Output</span>
<span id="output_pane_help_id" class='pane_header' title="Click for help."><u>Output</u></span>
<button id="eval_id" style="vertical-align:middle;" title="Evaluate (run) the selected JS or, if none,&#013;all the JavaScript in the pane.&#013;Can also be invoked by typing &#8984;e">Eval</button>
<div title="Automatically save the edited file&#013;when you click 'Eval',&#013;and when you edit another file." style="vertical-align:middle;display:inline-block;"><input id="save_on_eval_id" type="checkbox" style="vertical-align:60%;padding_bottom:15px;"/> <div style="padding:0px;margin:0px;display:inline-block;font-size:10px; line-height:10px;">Save<br/>on</br/>Eval</div></div>
<button id="clear_output_id" title="Remove all previously output text.">Clear</button>
Expand Down Expand Up @@ -548,7 +550,7 @@
<div id="right_splitter">
<div id="doc_pane_id" style="background-color:#e1e1e1; padding-left:5px;">
<div class="pane_header_wrapper" style="height:30px;white-space:nowrap;">
<span id="documentation_pane_help_id" class="pane_header">Doc</span>
<span id="documentation_pane_help_id" class="pane_header"><u>Doc</u></span>
<input id="find_doc_input_id" placeholder="search string" title="If this field is empty,&#013;the selection in the&#013;Doc, JavaScript, or Output&#013;pane is used." style="width:100px;"/>
<button id="find_doc_button_id">Find</button>
<button id="eval_doc_button_id" title="Evaluated the selected code&#013;in the Doc pane.&#013;Result goes in the Output pane.ƒ">Eval Doc</button>
Expand All @@ -558,7 +560,7 @@
</div> <!--doc_pane -->
<div id="simulate_pane" style="background-color:black">
<div class="pane_header_wrapper" style="white-space:nowrap;">
<span id="simulate_pane_help_id" class="pane_header" title="Click for help.">Sim</span>
<span id="simulate_pane_help_id" class="pane_header" title="Click for help."><u>Sim</u></span>
<select id='videos_id'>
<option value='All'>All</option>
<option value='None'>None</option>
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "dexter_dev_env",
"productName": "dexter_dev_env",
"version": "1.1.5",
"release_date": "Apr 30, 2017",
"version": "1.1.6",
"release_date": "May 1, 2017",
"description": "Dexter Development Environment",
"author": "Fry",
"license": "GPL-3.0",
Expand Down
10 changes: 9 additions & 1 deletion ros_interface.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function show_url_error_message(url){
"<code style='color:#000000;'>nslookup localhost</code>",
"red")
}

/*
var full_dexter_url //primarily used when on the sandboxed side by get_full_dexter_url
// set in window.addEventListener('message' ...) ie the receiver of
// a mesage for the eval sandbox
Expand All @@ -74,6 +74,14 @@ function get_full_dexter_url(){
}
}
return full_dexter_url
}*/

function get_full_dexter_url(){
var result = "ws://" + persistent_get("ROS_URL")
if (!result.endsWith("/")){
result += "/"
}
return result
}

function init_ros_service_if_url_changed(){
Expand Down
4 changes: 4 additions & 0 deletions storage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ function persistent_remove(key, callback=function() { out("Removed " + key + " f
persistent_save()
}

var default_default_ROS_URL = "localhost:9090"
var default_default_dexter_ip_address = "192.168.1.142"
var default_default_dexter_port = "50000"

Expand All @@ -109,6 +110,9 @@ function dde_init_dot_js_initialize() {
else if (file_exists("dde_init.js")){ //we don't want to error if the file doesn't exist.
load_files("dde_init.js")
var add_to_dde_init_js = ""
if (!persistent_get("ROS_URL")){
add_to_dde_init_js += 'persistent_set("ROS_URL", "' + default_default_ROS_URL + '") //required property, but you can edit the value.\n'
}
if (!persistent_get("default_dexter_ip_address")){
add_to_dde_init_js += 'persistent_set("default_dexter_ip_address", "' + default_default_dexter_ip_address + '") //required property, but you can edit the value.\n'
}
Expand Down

0 comments on commit 9433c8b

Please sign in to comment.