Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

small gps fix #134

Merged
merged 2 commits into from
Sep 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ardublockly/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<link rel="stylesheet" type="text/css" href="prettify/loading-btn.css"/>
<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.css" />

<!-- Ardublockly - These three files contain the compress version-->
<!-- Ardublockly - These three files contain the compress version
<script src="../blockly/blockly_compressed.js"></script>
<script src="../blockly/blocks_compressed.js"></script>
<script src="../blockly/arduino_compressed.js"></script>
<!-- To use the uncompressed version comment out the above and comment in the ones below
<script src="../blockly/arduino_compressed.js"></script>-->
<!-- To use the uncompressed version comment out the above and comment in the ones below-->
<script src="../blockly/blockly_uncompressed.js"></script>
<script src="../blockly/blocks/logic.js"></script>
<script src="../blockly/blocks/loops.js"></script>
Expand Down Expand Up @@ -57,7 +57,7 @@
<script src="../blockly/generators/arduino/time.js"></script>
<script src="../blockly/generators/arduino/tone.js"></script>
<script src="../blockly/generators/arduino/variables.js"></script>
<script src="../blockly/generators/arduino/sensebox.js"></script>-->
<script src="../blockly/generators/arduino/sensebox.js"></script>

<!-- Default language js files, user selection appended to head on load -->
<script src="../blockly/msg/js/en.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion blockly/arduino_compressed.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 19 additions & 17 deletions blockly/blockly_compressed.js

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion blockly/generators/arduino/sensebox.js
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,11 @@ Blockly.Arduino.sensebox_sd_write_file = function(block) {
}else{
linebreak = "";
}
var code ='dataFile' + filename +'.print'+linebreak+'('+ text +');\n'
if (text == "gps.getLongitude()" || text == "gps.getLatitude()"){
var code ='dataFile' + filename +'.print'+linebreak+'('+ text +',5);\n'
}
else {
var code ='dataFile' + filename +'.print'+linebreak+'('+ text +');\n'}
return code;
};

Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/ar.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/az.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/ba.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/bcc.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/be-tarask.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/bg.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/bn.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/br.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/ca.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/cs.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/da.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ Blockly.Msg.senseBox_sd_write_file = " Schreibe Daten auf SD-Karte";
Blockly.Msg.senseBox_sd_open_file = "Öffne eine Datei auf der SD-Karte";
Blockly.Msg.sensebox_sd_filename = "Daten";
Blockly.Msg.senseBox_SD_COMPONENT = "SD-Block";
Blockly.Msg.senseBox_sd_decimals = "Dezimalen";
Blockly.Msg.senseBox_output_linebreak = "Zeilenumbruch";
Blockly.Msg.senseBox_output_networkid = "NetzwerkID";
Blockly.Msg.senseBox_output_password = "Passwort";
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/el.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED";
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED";
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card";
Blockly.Msg.senseBox_sd_decimals = "decimals";
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card";
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card";
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card";
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/fa.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/fi.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/he.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/hi.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/hrx.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/hu.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/ia.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
1 change: 1 addition & 0 deletions blockly/msg/js/id.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ Blockly.Msg.senseBox_pressure_tip = "airpressure sensor can measure the airpres
Blockly.Msg.senseBox_rgb_led = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_rgb_led_tip = "RGB-LED"; // untranslated
Blockly.Msg.senseBox_sd_create_file = "Create file on SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_decimals = "decimals"; // untranslated
Blockly.Msg.senseBox_sd_open_file = "Open a file from SD-Card"; // untranslated
Blockly.Msg.senseBox_sd_web_readHTML = "Read HTML from SD Card"; // untranslated
Blockly.Msg.senseBox_sd_write_file = " Write Data to SD-Card"; // untranslated
Expand Down
Loading