Merge pull request #76 from sensebox/fix-double-wirelib
fix duplicate wire library
This commit is contained in:
		
						commit
						09a9318b24
					
				
							
								
								
									
										38363
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										38363
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -27,7 +27,7 @@ | ||||
|     "react-markdown": "^5.0.2", | ||||
|     "react-redux": "^7.2.0", | ||||
|     "react-router-dom": "^5.2.0", | ||||
|     "react-scripts": "3.4.1", | ||||
|     "react-scripts": "^4.0.3", | ||||
|     "reactour": "^1.18.0", | ||||
|     "redux": "^4.0.5", | ||||
|     "redux-thunk": "^2.3.0", | ||||
|  | ||||
| @ -304,7 +304,7 @@ Blockly.Arduino.sensebox_scd30 = function () { | ||||
| Blockly.Arduino.sensebox_gps = function () { | ||||
|   var dropdown = this.getFieldValue('dropdown'); | ||||
|   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.definitions_['GPS'] = 'SFE_UBLOX_GNSS myGNSS;'; | ||||
|   Blockly.Arduino.setupCode_['init_gps'] = ` Wire.begin();
 | ||||
|  | ||||
| @ -8,7 +8,6 @@ export const OSEM = { | ||||
|     senseBox_osem_connection: "Verbinde mit openSenseMap:", | ||||
|     senseBox_osem_host: "opensensemap.org", | ||||
|     senseBox_osem_host_workshop: "workshop.opensensemap.org", | ||||
|     senseBox_osem_connection: "Verbinde mit openSenseMap", | ||||
|     senseBox_osem_exposure: "Typ", | ||||
|     senseBox_osem_stationary: "Stationär", | ||||
|     senseBox_osem_mobile: "Mobil", | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user