Skip to content

Commit c1acd0d

Browse files
lupyuenlupyuen
committed
Flash OK after replacing jumper cable
1 parent 4bed98c commit c1acd0d

File tree

11 files changed

+139
-144
lines changed

11 files changed

+139
-144
lines changed

‎logs/libapp-demangle.S‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,18 +1061,18 @@ SYMBOL TABLE:
10611061
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.1 0000000e .Lanon.a1ce8d617669cf2f75141f25115b0b98.1
10621062
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.10 00000007 .Lanon.a1ce8d617669cf2f75141f25115b0b98.10
10631063
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.11 00000001 .Lanon.a1ce8d617669cf2f75141f25115b0b98.11
1064-
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.12 00000012 .Lanon.a1ce8d617669cf2f75141f25115b0b98.12
1065-
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.13 00000024 .Lanon.a1ce8d617669cf2f75141f25115b0b98.13
1064+
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.12 00000014 .Lanon.a1ce8d617669cf2f75141f25115b0b98.12
1065+
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.13 0000002a .Lanon.a1ce8d617669cf2f75141f25115b0b98.13
10661066
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.15 0000000c .Lanon.a1ce8d617669cf2f75141f25115b0b98.15
10671067
00000000 l O .rodata.cst4 00000004 .Lanon.a1ce8d617669cf2f75141f25115b0b98.16
10681068
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.20 00000018 .Lanon.a1ce8d617669cf2f75141f25115b0b98.20
10691069
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.22 00000008 .Lanon.a1ce8d617669cf2f75141f25115b0b98.22
10701070
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.23 00000000 .Lanon.a1ce8d617669cf2f75141f25115b0b98.23
10711071
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.24 00000010 .Lanon.a1ce8d617669cf2f75141f25115b0b98.24
10721072
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.4 00000018 .Lanon.a1ce8d617669cf2f75141f25115b0b98.4
1073-
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.5 0000001c .Lanon.a1ce8d617669cf2f75141f25115b0b98.5
1073+
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.5 0000001f .Lanon.a1ce8d617669cf2f75141f25115b0b98.5
10741074
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.7 00000018 .Lanon.a1ce8d617669cf2f75141f25115b0b98.7
1075-
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.8 0000000d .Lanon.a1ce8d617669cf2f75141f25115b0b98.8
1075+
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.8 0000000f .Lanon.a1ce8d617669cf2f75141f25115b0b98.8
10761076
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.9 00000007 .Lanon.a1ce8d617669cf2f75141f25115b0b98.9
10771077
00000000 l O .rodata._ZN3app10gps_sensor10GPS_DEVICE17h9632919ea1cd25c6E 0000000c app::gps_sensor::GPS_DEVICE
10781078
00000000 l F .text._ZN3app10gps_sensor15handle_gps_data17hd01302e5f121f8abE 00000144 app::gps_sensor::handle_gps_data
@@ -1361,10 +1361,10 @@ extern fn handle_gps_data(sensor: sensor_ptr, _arg: sensor_arg,
13611361
18: f8cd c020 str.w ip, [sp, #32]
13621362
/Users/Luppy/mynewt/stm32bluepill-mynewt-sensor/rust/app/src/gps_sensor.rs:76
13631363
sensor_data: sensor_data_ptr, sensor_type: sensor_type_t) -> MynewtError {
1364-
console::print("*** Rust handle_sensor_data\n");
1364+
console::print("\nInfo: Rust handle_sensor_data\n");
13651365
1c: f240 0000 movw r0, #0
13661366
20: f2c0 0000 movt r0, #0
1367-
24: 211c movs r1, #28
1367+
24: 211f movs r1, #31
13681368
26: f8cd e010 str.w lr, [sp, #16]
13691369
2a: 9403 str r4, [sp, #12]
13701370
2c: 9502 str r5, [sp, #8]
@@ -1426,10 +1426,10 @@ extern fn handle_gps_data(sensor: sensor_ptr, _arg: sensor_arg,
14261426
8a: d10c bne.n a6 <app::gps_sensor::handle_gps_data+0xa6>
14271427
8c: e7ff b.n 8e <app::gps_sensor::handle_gps_data+0x8e>
14281428
/Users/Luppy/mynewt/stm32bluepill-mynewt-sensor/rust/app/src/gps_sensor.rs:85
1429-
console::print("*** GPS not ready\n");
1429+
console::print("Warn: GPS not ready\n");
14301430
8e: f240 0000 movw r0, #0
14311431
92: f2c0 0000 movt r0, #0
1432-
96: 2112 movs r1, #18
1432+
96: 2114 movs r1, #20
14331433
98: f7ff fffe bl 0 <mynewt::sys::console::print>
14341434
9c: e7ff b.n 9e <app::gps_sensor::handle_gps_data+0x9e>
14351435
9e: f06f 0001 mvn.w r0, #1
@@ -1450,10 +1450,10 @@ extern fn handle_gps_data(sensor: sensor_ptr, _arg: sensor_arg,
14501450
be: ed9d 0b12 vldr d0, [sp, #72] ; 0x48
14511451
c2: ed8d 0b1a vstr d0, [sp, #104] ; 0x68
14521452
/Users/Luppy/mynewt/stm32bluepill-mynewt-sensor/rust/app/src/gps_sensor.rs:91
1453-
console::print("*** GPS lat: "); console::printdouble(latitude);
1453+
console::print("Info: GPS lat: "); console::printdouble(latitude);
14541454
c6: f240 0000 movw r0, #0
14551455
ca: f2c0 0000 movt r0, #0
1456-
ce: 210d movs r1, #13
1456+
ce: 210f movs r1, #15
14571457
d0: f7ff fffe bl 0 <mynewt::sys::console::print>
14581458
d4: e7ff b.n d6 <app::gps_sensor::handle_gps_data+0xd6>
14591459
d6: ed9d 0b16 vldr d0, [sp, #88] ; 0x58
@@ -1523,10 +1523,10 @@ fn convert_gps_data(sensor_data: sensor_data_ptr, sensor_type: sensor_type_t) ->
15231523
c: 9315 str r3, [sp, #84] ; 0x54
15241524
e: 9214 str r2, [sp, #80] ; 0x50
15251525
/Users/Luppy/mynewt/stm32bluepill-mynewt-sensor/rust/app/src/gps_sensor.rs:108
1526-
console::print("GPS listener converting geolocation\n");
1526+
console::print("Info: GPS listener converting geolocation\n");
15271527
10: f240 0100 movw r1, #0
15281528
14: f2c0 0100 movt r1, #0
1529-
18: 2224 movs r2, #36 ; 0x24
1529+
18: 222a movs r2, #42 ; 0x2a
15301530
1a: 900b str r0, [sp, #44] ; 0x2c
15311531
1c: 4608 mov r0, r1
15321532
1e: 4611 mov r1, r2

‎logs/libapp-expanded.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ mod gps_sensor {
537537
extern "C" fn handle_gps_data(sensor: sensor_ptr, _arg: sensor_arg,
538538
sensor_data: sensor_data_ptr,
539539
sensor_type: sensor_type_t) -> MynewtError {
540-
console::print("*** Rust handle_sensor_data\n");
540+
console::print("\nInfo: Rust handle_sensor_data\n");
541541
if sensor_data.is_null() { return MynewtError::SYS_EINVAL; }
542542
if !!sensor.is_null() {
543543
{
@@ -548,12 +548,12 @@ mod gps_sensor {
548548
};
549549
let sensor_value = convert_gps_data(sensor_data, sensor_type);
550550
if let SensorValueType::None = sensor_value.val {
551-
console::print("*** GPS not ready\n");
551+
console::print("Warn: GPS not ready\n");
552552
return MynewtError::SYS_EINVAL;
553553
}
554554
if let SensorValueType::Geolocation { latitude, longitude, altitude }
555555
= sensor_value.val {
556-
console::print("*** GPS lat: ");
556+
console::print("Info: GPS lat: ");
557557
console::printdouble(latitude);
558558
console::print(", lng: ");
559559
console::printdouble(longitude);
@@ -570,7 +570,7 @@ mod gps_sensor {
570570
#[allow(non_snake_case, unused_variables)]
571571
fn convert_gps_data(sensor_data: sensor_data_ptr,
572572
sensor_type: sensor_type_t) -> SensorValue {
573-
console::print("GPS listener converting geolocation\n");
573+
console::print("Info: GPS listener converting geolocation\n");
574574
SensorValue{key: &GPS_SENSOR_KEY,
575575
val:
576576
match sensor_type {

‎logs/libapp.S‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,18 +1061,18 @@ SYMBOL TABLE:
10611061
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.1 0000000e .Lanon.a1ce8d617669cf2f75141f25115b0b98.1
10621062
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.10 00000007 .Lanon.a1ce8d617669cf2f75141f25115b0b98.10
10631063
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.11 00000001 .Lanon.a1ce8d617669cf2f75141f25115b0b98.11
1064-
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.12 00000012 .Lanon.a1ce8d617669cf2f75141f25115b0b98.12
1065-
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.13 00000024 .Lanon.a1ce8d617669cf2f75141f25115b0b98.13
1064+
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.12 00000014 .Lanon.a1ce8d617669cf2f75141f25115b0b98.12
1065+
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.13 0000002a .Lanon.a1ce8d617669cf2f75141f25115b0b98.13
10661066
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.15 0000000c .Lanon.a1ce8d617669cf2f75141f25115b0b98.15
10671067
00000000 l O .rodata.cst4 00000004 .Lanon.a1ce8d617669cf2f75141f25115b0b98.16
10681068
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.20 00000018 .Lanon.a1ce8d617669cf2f75141f25115b0b98.20
10691069
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.22 00000008 .Lanon.a1ce8d617669cf2f75141f25115b0b98.22
10701070
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.23 00000000 .Lanon.a1ce8d617669cf2f75141f25115b0b98.23
10711071
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.24 00000010 .Lanon.a1ce8d617669cf2f75141f25115b0b98.24
10721072
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.4 00000018 .Lanon.a1ce8d617669cf2f75141f25115b0b98.4
1073-
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.5 0000001c .Lanon.a1ce8d617669cf2f75141f25115b0b98.5
1073+
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.5 0000001f .Lanon.a1ce8d617669cf2f75141f25115b0b98.5
10741074
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.7 00000018 .Lanon.a1ce8d617669cf2f75141f25115b0b98.7
1075-
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.8 0000000d .Lanon.a1ce8d617669cf2f75141f25115b0b98.8
1075+
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.8 0000000f .Lanon.a1ce8d617669cf2f75141f25115b0b98.8
10761076
00000000 l O .rodata..Lanon.a1ce8d617669cf2f75141f25115b0b98.9 00000007 .Lanon.a1ce8d617669cf2f75141f25115b0b98.9
10771077
00000000 l O .rodata._ZN3app10gps_sensor10GPS_DEVICE17h9632919ea1cd25c6E 0000000c _ZN3app10gps_sensor10GPS_DEVICE17h9632919ea1cd25c6E
10781078
00000000 l F .text._ZN3app10gps_sensor15handle_gps_data17hd01302e5f121f8abE 00000144 _ZN3app10gps_sensor15handle_gps_data17hd01302e5f121f8abE
@@ -1361,10 +1361,10 @@ extern fn handle_gps_data(sensor: sensor_ptr, _arg: sensor_arg,
13611361
18: f8cd c020 str.w ip, [sp, #32]
13621362
/Users/Luppy/mynewt/stm32bluepill-mynewt-sensor/rust/app/src/gps_sensor.rs:76
13631363
sensor_data: sensor_data_ptr, sensor_type: sensor_type_t) -> MynewtError {
1364-
console::print("*** Rust handle_sensor_data\n");
1364+
console::print("\nInfo: Rust handle_sensor_data\n");
13651365
1c: f240 0000 movw r0, #0
13661366
20: f2c0 0000 movt r0, #0
1367-
24: 211c movs r1, #28
1367+
24: 211f movs r1, #31
13681368
26: f8cd e010 str.w lr, [sp, #16]
13691369
2a: 9403 str r4, [sp, #12]
13701370
2c: 9502 str r5, [sp, #8]
@@ -1426,10 +1426,10 @@ extern fn handle_gps_data(sensor: sensor_ptr, _arg: sensor_arg,
14261426
8a: d10c bne.n a6 <_ZN3app10gps_sensor15handle_gps_data17hd01302e5f121f8abE+0xa6>
14271427
8c: e7ff b.n 8e <_ZN3app10gps_sensor15handle_gps_data17hd01302e5f121f8abE+0x8e>
14281428
/Users/Luppy/mynewt/stm32bluepill-mynewt-sensor/rust/app/src/gps_sensor.rs:85
1429-
console::print("*** GPS not ready\n");
1429+
console::print("Warn: GPS not ready\n");
14301430
8e: f240 0000 movw r0, #0
14311431
92: f2c0 0000 movt r0, #0
1432-
96: 2112 movs r1, #18
1432+
96: 2114 movs r1, #20
14331433
98: f7ff fffe bl 0 <_ZN6mynewt3sys7console5print17h0f65bc3b0e739871E>
14341434
9c: e7ff b.n 9e <_ZN3app10gps_sensor15handle_gps_data17hd01302e5f121f8abE+0x9e>
14351435
9e: f06f 0001 mvn.w r0, #1
@@ -1450,10 +1450,10 @@ extern fn handle_gps_data(sensor: sensor_ptr, _arg: sensor_arg,
14501450
be: ed9d 0b12 vldr d0, [sp, #72] ; 0x48
14511451
c2: ed8d 0b1a vstr d0, [sp, #104] ; 0x68
14521452
/Users/Luppy/mynewt/stm32bluepill-mynewt-sensor/rust/app/src/gps_sensor.rs:91
1453-
console::print("*** GPS lat: "); console::printdouble(latitude);
1453+
console::print("Info: GPS lat: "); console::printdouble(latitude);
14541454
c6: f240 0000 movw r0, #0
14551455
ca: f2c0 0000 movt r0, #0
1456-
ce: 210d movs r1, #13
1456+
ce: 210f movs r1, #15
14571457
d0: f7ff fffe bl 0 <_ZN6mynewt3sys7console5print17h0f65bc3b0e739871E>
14581458
d4: e7ff b.n d6 <_ZN3app10gps_sensor15handle_gps_data17hd01302e5f121f8abE+0xd6>
14591459
d6: ed9d 0b16 vldr d0, [sp, #88] ; 0x58
@@ -1523,10 +1523,10 @@ fn convert_gps_data(sensor_data: sensor_data_ptr, sensor_type: sensor_type_t) ->
15231523
c: 9315 str r3, [sp, #84] ; 0x54
15241524
e: 9214 str r2, [sp, #80] ; 0x50
15251525
/Users/Luppy/mynewt/stm32bluepill-mynewt-sensor/rust/app/src/gps_sensor.rs:108
1526-
console::print("GPS listener converting geolocation\n");
1526+
console::print("Info: GPS listener converting geolocation\n");
15271527
10: f240 0100 movw r1, #0
15281528
14: f2c0 0100 movt r1, #0
1529-
18: 2224 movs r2, #36 ; 0x24
1529+
18: 222a movs r2, #42 ; 0x2a
15301530
1a: 900b str r0, [sp, #44] ; 0x2c
15311531
1c: 4608 mov r0, r1
15321532
1e: 4611 mov r1, r2

0 commit comments

Comments
 (0)