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

Merge pull request #136 from sensebox/fix-negative-gps-values

Browse Source 
Fix negative gps values
This commit is contained in:
Mario Pesch 2022-01-14 08:13:12 +01:00 committed by GitHub
commit 1519a7f58b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Blockly/blocks/sensebox-display.js
View File

@ -49,10 +49,10 @@ Blockly.Blocks["sensebox_display_printDisplay"] = {
.appendField(new FieldSlider(1, 1, 4), "SIZE"); .appendField(new FieldSlider(1, 1, 4), "SIZE");
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_display_printDisplay_x) .appendField(Blockly.Msg.senseBox_display_printDisplay_x)
.appendField(new FieldSlider(0, 0, 128), "X"); .appendField(new FieldSlider(0, 0, 127), "X");
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_display_printDisplay_y) .appendField(Blockly.Msg.senseBox_display_printDisplay_y)
.appendField(new FieldSlider(0, 0, 64), "Y"); .appendField(new FieldSlider(0, 0, 63), "Y");
this.appendValueInput("printDisplay") this.appendValueInput("printDisplay")
.appendField(Blockly.Msg.senseBox_display_printDisplay_value) .appendField(Blockly.Msg.senseBox_display_printDisplay_value)
.setCheck(null); .setCheck(null);

6
src/components/Blockly/generator/sensebox-sd.js
View File

@ -162,15 +162,15 @@ void addMeasurement(const char *sensorId, float value) {
} }
`; `;
Blockly.Arduino.functionNames_["writeMeasurementsToSdCard"] = ` Blockly.Arduino.functionNames_["writeMeasurementsToSdCard"] = `
void writeMeasurementsToSdCard(char* timeStamp, uint32_t latitudes, uint32_t longitudes) { void writeMeasurementsToSdCard(char* timeStamp, int32_t latitudes, int32_t longitudes) {
// iterate throug the measurements array // iterate throug the measurements array
for (uint8_t i = 0; i < num_measurements; i++) { for (uint8_t i = 0; i < num_measurements; i++) {
char lng[20]; char lng[20];
char lat[20]; char lat[20];
float longitude = longitudes / (float)10000000; float longitude = longitudes / (float)10000000;
float latitude = latitudes / (float)10000000; float latitude = latitudes / (float)10000000;
dtostrf(longitude, 2, 7, lng); dtostrf(longitude, 8, 7, lng);
dtostrf(latitude, 1, 7, lat); dtostrf(latitude, 8, 7, lat);
sprintf_P(buffer, PSTR("%s,%9.2f,%s,%02s,%02s"), measurements[i].sensorId, measurements[i].value, timeStamp, lng, lat); sprintf_P(buffer, PSTR("%s,%9.2f,%s,%02s,%02s"), measurements[i].sensorId, measurements[i].value, timeStamp, lng, lat);
// transmit buffer to client // transmit buffer to client
${filename}.println(buffer); ${filename}.println(buffer);