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

fix duplicate wire library

Browse Source
This commit is contained in:
mariopesch 2021-03-19 10:54:17 +01:00
parent a163c76463
commit d442b2f100
3 changed files with 26733 additions and 9156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17651
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

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();

18236
yarn.lock
View File

File diff suppressed because it is too large Load Diff