schuelerlabor-cleverlab/smarti
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #76 from sensebox/fix-double-wirelib

Browse Source 
fix duplicate wire library
This commit is contained in:
Mario Pesch 2021-03-19 11:21:41 +01:00 committed by GitHub
commit 09a9318b24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 45175 additions and 14416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38373
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -27,7 +27,7 @@
"react-markdown": "^5.0.2", "react-markdown": "^5.0.2",
"react-redux": "^7.2.0", "react-redux": "^7.2.0",
"react-router-dom": "^5.2.0", "react-router-dom": "^5.2.0",
"react-scripts": "3.4.1", "react-scripts": "^4.0.3",
"reactour": "^1.18.0", "reactour": "^1.18.0",
"redux": "^4.0.5", "redux": "^4.0.5",
"redux-thunk": "^2.3.0", "redux-thunk": "^2.3.0",

2
src/components/Blockly/generator/sensebox-sensors.js
View File

@ -304,7 +304,7 @@ Blockly.Arduino.sensebox_scd30 = function () {
Blockly.Arduino.sensebox_gps = function () { Blockly.Arduino.sensebox_gps = function () {
var dropdown = this.getFieldValue('dropdown'); var dropdown = this.getFieldValue('dropdown');
Blockly.Arduino.libraries_['gps_library'] = '#include <SparkFun_u-blox_GNSS_Arduino_Library.h>' Blockly.Arduino.libraries_['gps_library'] = '#include <SparkFun_u-blox_GNSS_Arduino_Library.h>'
Blockly.Arduino.libraries_['wire'] = '#include <Wire.h>' Blockly.Arduino.libraries_['library_wire'] = '#include <Wire.h>';
Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"'; Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.definitions_['GPS'] = 'SFE_UBLOX_GNSS myGNSS;'; Blockly.Arduino.definitions_['GPS'] = 'SFE_UBLOX_GNSS myGNSS;';
Blockly.Arduino.setupCode_['init_gps'] = ` Wire.begin(); Blockly.Arduino.setupCode_['init_gps'] = ` Wire.begin();

1
src/components/Blockly/msg/de/sensebox-osem.js
View File

@ -8,7 +8,6 @@ export const OSEM = {
senseBox_osem_connection: "Verbinde mit openSenseMap:", senseBox_osem_connection: "Verbinde mit openSenseMap:",
senseBox_osem_host: "opensensemap.org", senseBox_osem_host: "opensensemap.org",
senseBox_osem_host_workshop: "workshop.opensensemap.org", senseBox_osem_host_workshop: "workshop.opensensemap.org",
senseBox_osem_connection: "Verbinde mit openSenseMap",
senseBox_osem_exposure: "Typ", senseBox_osem_exposure: "Typ",
senseBox_osem_stationary: "Stationär", senseBox_osem_stationary: "Stationär",
senseBox_osem_mobile: "Mobil", senseBox_osem_mobile: "Mobil",

21213
yarn.lock
View File

File diff suppressed because it is too large Load Diff