Skip to content

Commit

Permalink
BITS radio working again
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Shipman committed Mar 10, 2024
1 parent 4944534 commit d50f3f6
Show file tree
Hide file tree
Showing 16 changed files with 17,631 additions and 17,467 deletions.
Binary file modified ...rs/michaelshipman/Developer/command_module/Code/libraries/rp2040-config/MB85RS1MT.cpp.obj
View file
Binary file not shown.
Binary file modified Code/BITS/BITSv5/logging/build/CMakeFiles/log.dir/log.cpp.obj
View file
Binary file not shown.
Binary file modified Code/BITS/BITSv5/logging/build/log.bin
View file
Binary file not shown.
29,231 changes: 14,677 additions & 14,554 deletions Code/BITS/BITSv5/logging/build/log.dis
View file

Large diffs are not rendered by default.

Binary file modified Code/BITS/BITSv5/logging/build/log.elf
View file
Binary file not shown.
1,034 changes: 517 additions & 517 deletions Code/BITS/BITSv5/logging/build/log.elf.map
View file

Large diffs are not rendered by default.

4,559 changes: 2,295 additions & 2,264 deletions Code/BITS/BITSv5/logging/build/log.hex
View file

Large diffs are not rendered by default.

Binary file modified Code/BITS/BITSv5/logging/build/log.uf2
View file
Binary file not shown.
22 changes: 17 additions & 5 deletions Code/BITS/BITSv5/logging/log.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,28 @@ int main() {
sizeof(test_config.name), &mem);
printf("DEVICE NAME: %s\n", test_config.name);

printf("\nPress \"d\" to dump memory, \"w\" to write memory\n");
while (true) {
c = getchar_timeout_us(0);
printf("Press \"d\" to dump memory, \"w\" to write memory\n");

if (c == 'd') {
sleep_ms(1000);
sleep_ms(500);
printf("BITSv5 Test (Compiled %s %s)\n", __DATE__, __TIME__);
printf("Device ID: %d\n", mem.device_id);
read_config(NAME, test_config, (uint8_t *)test_config.name,
sizeof(test_config.name), &mem);
printf("DEVICE NAME: %s\n", test_config.name);
dump_fram();
printf(
"\nDump complete, press \"d\" to dump memory, \"w\" to write "
"memory\n");
} else if (c == 'w') {
sleep_ms(1000);
sleep_ms(500);
write_name_config();
write_fram();
printf(
"\nWrite complete, press \"d\" to dump memory, \"w\" to write "
"memory\n");
}
}
}
Expand Down Expand Up @@ -97,8 +110,7 @@ void write_fram() {
printf("\n\nWriting FRAM\n");
mem.write_memory(log_addr, (uint8_t *)log_str, sizeof(log_str));
printf("%d - %s\n", log_addr, log_str);
for (log_addr = LOG_INIT_ADDR + sizeof(log_str);
log_addr <= LOG_INIT_ADDR + 1 + 20 * (sizeof(log_str1));
for (log_addr = LOG_INIT_ADDR + sizeof(log_str); log_addr <= LOG_MAX_ADDR;
log_addr = log_addr + sizeof(log_str1)) {
// printf("%d\n", log_addr);

Expand Down
Binary file modified Code/BITS/BITSv5/radio-test/build/CMakeFiles/radio-test.dir/radio_test.cpp.obj
View file
Binary file not shown.
Binary file modified Code/BITS/BITSv5/radio-test/build/radio-test.bin
View file
Binary file not shown.
138 changes: 69 additions & 69 deletions Code/BITS/BITSv5/radio-test/build/radio-test.dis
View file

Large diffs are not rendered by default.

Binary file modified Code/BITS/BITSv5/radio-test/build/radio-test.elf
View file
Binary file not shown.
14 changes: 6 additions & 8 deletions Code/BITS/BITSv5/radio-test/build/radio-test.elf.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ Discarded input sections
0x00000000 0x34 CMakeFiles/radio-test.dir/radio_test.cpp.obj
.text._Z7rx_testv
0x00000000 0xbc CMakeFiles/radio-test.dir/radio_test.cpp.obj
.text._Z9setup_spiv
0x00000000 0x40 CMakeFiles/radio-test.dir/radio_test.cpp.obj
.bss.rx_done 0x00000000 0x1 CMakeFiles/radio-test.dir/radio_test.cpp.obj
.bss.radio_ack_buf
0x00000000 0x64 CMakeFiles/radio-test.dir/radio_test.cpp.obj
Expand Down Expand Up @@ -1305,9 +1303,9 @@ Discarded input sections
.comment 0x00000000 0x45 CMakeFiles/radio-test.dir/Users/michaelshipman/Developer/command_module/Code/BITS/BITSv5/pico-sdk/src/rp2_common/hardware_i2c/i2c.c.obj
.ARM.attributes
0x00000000 0x2c CMakeFiles/radio-test.dir/Users/michaelshipman/Developer/command_module/Code/BITS/BITSv5/pico-sdk/src/rp2_common/hardware_i2c/i2c.c.obj
.text 0x00000000 0x0 /var/folders/n7/t1959y0j4_gczygmz5tcw0qc0000gn/T//cc1XMrWt.o
.data 0x00000000 0x0 /var/folders/n7/t1959y0j4_gczygmz5tcw0qc0000gn/T//cc1XMrWt.o
.bss 0x00000000 0x0 /var/folders/n7/t1959y0j4_gczygmz5tcw0qc0000gn/T//cc1XMrWt.o
.text 0x00000000 0x0 /var/folders/n7/t1959y0j4_gczygmz5tcw0qc0000gn/T//cclz3Mg9.o
.data 0x00000000 0x0 /var/folders/n7/t1959y0j4_gczygmz5tcw0qc0000gn/T//cclz3Mg9.o
.bss 0x00000000 0x0 /var/folders/n7/t1959y0j4_gczygmz5tcw0qc0000gn/T//cclz3Mg9.o
.data 0x00000000 0x0 /Applications/ArmGNUToolchain/13.2.Rel1/arm-none-eabi/bin/../lib/gcc/arm-none-eabi/13.2.1/thumb/v6-m/nofp/libgcc.a(_dvmd_tls.o)
.bss 0x00000000 0x0 /Applications/ArmGNUToolchain/13.2.Rel1/arm-none-eabi/bin/../lib/gcc/arm-none-eabi/13.2.1/thumb/v6-m/nofp/libgcc.a(_dvmd_tls.o)
.text 0x00000000 0x0 /Applications/ArmGNUToolchain/13.2.Rel1/arm-none-eabi/bin/../lib/gcc/arm-none-eabi/13.2.1/../../../../arm-none-eabi/lib/thumb/v6-m/nofp/libc.a(libc_a-calloc.o)
Expand Down Expand Up @@ -1633,7 +1631,7 @@ LOAD /Applications/ArmGNUToolchain/13.2.Rel1/arm-none-eabi/bin/../lib/gcc/arm-no
.boot2 0x10000000 0x100
0x10000000 __boot2_start__ = .
*(.boot2)
.boot2 0x10000000 0x100 /var/folders/n7/t1959y0j4_gczygmz5tcw0qc0000gn/T//cc1XMrWt.o
.boot2 0x10000000 0x100 /var/folders/n7/t1959y0j4_gczygmz5tcw0qc0000gn/T//cclz3Mg9.o
0x10000100 __boot2_end__ = .
0x00000001 ASSERT (((__boot2_end__ - __boot2_start__) == 0x100), ERROR: Pico second stage bootloader must be 256 bytes in size)

Expand Down Expand Up @@ -3029,7 +3027,7 @@ LOAD CMakeFiles/radio-test.dir/Users/michaelshipman/Developer/command_module/Cod
LOAD CMakeFiles/radio-test.dir/Users/michaelshipman/Developer/command_module/Code/BITS/BITSv5/pico-sdk/src/rp2_common/hardware_spi/spi.c.obj
LOAD CMakeFiles/radio-test.dir/Users/michaelshipman/Developer/command_module/Code/BITS/BITSv5/pico-sdk/src/rp2_common/pico_rand/rand.c.obj
LOAD CMakeFiles/radio-test.dir/Users/michaelshipman/Developer/command_module/Code/BITS/BITSv5/pico-sdk/src/rp2_common/hardware_i2c/i2c.c.obj
LOAD /var/folders/n7/t1959y0j4_gczygmz5tcw0qc0000gn/T//cc1XMrWt.o
LOAD /var/folders/n7/t1959y0j4_gczygmz5tcw0qc0000gn/T//cclz3Mg9.o
LOAD /Applications/ArmGNUToolchain/13.2.Rel1/arm-none-eabi/bin/../lib/gcc/arm-none-eabi/13.2.1/../../../../arm-none-eabi/lib/thumb/v6-m/nofp/libstdc++.a
LOAD /Applications/ArmGNUToolchain/13.2.Rel1/arm-none-eabi/bin/../lib/gcc/arm-none-eabi/13.2.1/../../../../arm-none-eabi/lib/thumb/v6-m/nofp/libm.a
START GROUP
Expand Down Expand Up @@ -3153,7 +3151,7 @@ LOAD linker stubs
.ARM.attributes
0x00000852 0x2c CMakeFiles/radio-test.dir/Users/michaelshipman/Developer/command_module/Code/BITS/BITSv5/pico-sdk/src/rp2_common/pico_rand/rand.c.obj
.ARM.attributes
0x0000087e 0x22 /var/folders/n7/t1959y0j4_gczygmz5tcw0qc0000gn/T//cc1XMrWt.o
0x0000087e 0x22 /var/folders/n7/t1959y0j4_gczygmz5tcw0qc0000gn/T//cclz3Mg9.o
.ARM.attributes
0x000008a0 0x1e /Applications/ArmGNUToolchain/13.2.Rel1/arm-none-eabi/bin/../lib/gcc/arm-none-eabi/13.2.1/thumb/v6-m/nofp/libgcc.a(_dvmd_tls.o)
.ARM.attributes
Expand Down
Loading

0 comments on commit d50f3f6

Please sign in to comment.