Skip to content

Commit 92d70f5

Browse files
committed
Fixed Rust build
1 parent f89e0a9 commit 92d70f5

File tree

10 files changed

+6787
-6358
lines changed

10 files changed

+6787
-6358
lines changed

logs/libapp-demangle.S

Lines changed: 782 additions & 693 deletions
Large diffs are not rendered by default.

logs/libapp-expanded.rs

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,9 @@ mod app_network {
199199
"--------------------";
200200
{
201201
"begin json coap_item_int_val , c : COAP_CONTEXT , val : val";
202+
let geo = val.geo;
202203
if let SensorValueType::Uint(val) =
203-
val.val {
204+
val.value {
204205
{
205206
"begin json coap_item_int , key : val.key , value : val";
206207
{
@@ -241,6 +242,9 @@ mod app_network {
241242
value)
242243
};
243244
};
245+
if let SensorValueType::Geolocation {
246+
.. } = geo {
247+
};
244248
};
245249
{
246250
">>";
@@ -320,7 +324,7 @@ mod app_sensor {
320324
if !!sensor.is_null() {
321325
{
322326
::core::panicking::panic(&("no sensor",
323-
"rust\\app\\src\\app_sensor.rs",
327+
"rust/app/src/app_sensor.rs",
324328
54u32, 5u32))
325329
}
326330
};
@@ -355,7 +359,7 @@ mod app_sensor {
355359
if !!sensor.is_null() {
356360
{
357361
::core::panicking::panic(&("null sensor",
358-
"rust\\app\\src\\app_sensor.rs",
362+
"rust/app/src/app_sensor.rs",
359363
92u32, 5u32))
360364
}
361365
};
@@ -364,7 +368,7 @@ mod app_sensor {
364368
if !false {
365369
{
366370
::core::panicking::panic(&("bad type",
367-
"rust\\app\\src\\app_sensor.rs",
371+
"rust/app/src/app_sensor.rs",
368372
96u32, 57u32))
369373
}
370374
};
@@ -429,7 +433,7 @@ mod app_sensor {
429433
::core::fmt::ArgumentV1::new(arg2,
430434
::core::fmt::Display::fmt)],
431435
}),
432-
&("rust\\app\\src\\app_sensor.rs",
436+
&("rust/app/src/app_sensor.rs",
433437
130u32,
434438
17u32))
435439
}
@@ -467,7 +471,7 @@ mod app_sensor {
467471
::core::fmt::ArgumentV1::new(arg2,
468472
::core::fmt::Display::fmt)],
469473
}),
470-
&("rust\\app\\src\\app_sensor.rs",
474+
&("rust/app/src/app_sensor.rs",
471475
132u32,
472476
17u32))
473477
}
@@ -515,7 +519,7 @@ mod gps_sensor {
515519
if !!sensor.is_null() {
516520
{
517521
::core::panicking::panic(&("no gps",
518-
"rust\\app\\src\\gps_sensor.rs",
522+
"rust/app/src/gps_sensor.rs",
519523
53u32, 5u32))
520524
}
521525
};
@@ -543,7 +547,7 @@ mod gps_sensor {
543547
if !!sensor.is_null() {
544548
{
545549
::core::panicking::panic(&("null sensor",
546-
"rust\\app\\src\\gps_sensor.rs",
550+
"rust/app/src/gps_sensor.rs",
547551
80u32, 5u32))
548552
}
549553
};
@@ -563,7 +567,7 @@ mod gps_sensor {
563567
console::print("\n");
564568
console::flush();
565569
}
566-
aggregate_sensor_data(&sensor_value);
570+
aggregate_sensor_data(sensor_value);
567571
MynewtError::SYS_EOK
568572
}
569573
/// Convert the geolocation value received from Mynewt into a Geolocation `SensorValue` for transmission.
@@ -617,7 +621,7 @@ mod gps_sensor {
617621
::core::fmt::ArgumentV1::new(arg2,
618622
::core::fmt::Display::fmt)],
619623
}),
620-
&("rust\\app\\src\\gps_sensor.rs",
624+
&("rust/app/src/gps_sensor.rs",
621625
118u32,
622626
17u32))
623627
}
@@ -645,7 +649,12 @@ mod gps_sensor {
645649
fn aggregate_sensor_data(sensor_value: SensorValue) {
646650
if let SensorValueType::Geolocation { .. } = sensor_value.value {
647651
unsafe { current_geolocation = sensor_value.value };
648-
} else { sensor_value.geo = current_geolocation; }
652+
} else {
653+
let transmit_value =
654+
SensorValue{key: sensor_value.key,
655+
value: sensor_value.value,
656+
geo: unsafe { current_geolocation },};
657+
}
649658
}
650659
}
651660
use core::panic::PanicInfo;

0 commit comments

Comments
 (0)