Skip to content

Commit 3adb184

Browse files
committed
removing drm from 107_odin branch. saved in odin_drm branch
1 parent 6b1a05c commit 3adb184

8 files changed

+3
-102
lines changed

make.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ def configure_target(TARGET):
189189
os.path.join("src", "imu"),
190190
os.path.join("src", "bootloader"),
191191
os.path.join("src", "filter"),
192-
os.path.join("src", "drm"),
193192
LIBRARY_PATH + "/CMSIS_std/Device/ST/STM32F30x/Include",
194193
LIBRARY_PATH + "/STM32F30x_StdPeriph_Driver/inc",
195194
LIBRARY_PATH + "/CMSIS_std/Include"
@@ -200,7 +199,6 @@ def configure_target(TARGET):
200199
os.path.join("src", "stm32"),
201200
os.path.join("src", "target"),
202201
os.path.join("src", "board_comm"),
203-
os.path.join("src", "drm"),
204202
LIBRARY_PATH + "/CMSIS_std/Device/ST/STM32F30x/Source",
205203
LIBRARY_PATH + "/STM32F30x_StdPeriph_Driver/src"
206204
]

scripts/linker/stm32_flash_f30x_0x08002000_24k.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
MEMORY
1414
{
1515
FLASH (rx) : ORIGIN = 0x08002000, LENGTH = 24K
16-
RAM (xrw) : ORIGIN = 0x20000100, LENGTH = 16128
16+
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 16K
1717
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
1818
}
1919

scripts/linker/stm32_flash_f30x_0x08003000_20k.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
MEMORY
1414
{
1515
FLASH (rx) : ORIGIN = 0x08003000, LENGTH = 20K
16-
RAM (xrw) : ORIGIN = 0x20000100, LENGTH = 16128
16+
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 16K
1717
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
1818
}
1919

scripts/linker/stm32_flash_f30x_22k.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
MEMORY
1414
{
1515
FLASH (rx) : ORIGIN = 0x08003000, LENGTH = 22K /* last 2kb used for config storage */
16-
RAM (xrw) : ORIGIN = 0x20000100, LENGTH = 16128
16+
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 16K
1717
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
1818
}
1919

src/drm/drm.c

Lines changed: 0 additions & 84 deletions
This file was deleted.

src/drm/drm.h

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/imu/main.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include "gyro.h"
66
#include "filter.h"
77
#include "crc.h"
8-
#include "drm.h"
98

109
#include "scheduler.h"
1110

@@ -22,8 +21,6 @@ int main(void)
2221
init_imu();
2322
//this makes the status light go red
2423
single_gpio_init(BOOTLOADER_CHECK_PORT, BOOTLOADER_CHECK_PIN_SRC, BOOTLOADER_CHECK_PIN, 0, GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL);
25-
//init drm
26-
prerun_check();
2724
//init gyro
2825
gyro_init();
2926

src/imu/scheduler.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "quaternions.h"
55
#include "gyro.h"
66
#include "filter.h"
7-
#include "drm.h"
87
#include "gyro_device.h" //where gyroRxFrame lives
98

109
inline void scheduler_run(void)
@@ -27,8 +26,4 @@ inline void scheduler_run(void)
2726
update_quaternions();
2827
gyroDataReadDone = 0; //reset read flag to prepare for next read
2928
fire_spi_send_ready();
30-
if (!check_me())
31-
{
32-
delay_ms(42);
33-
}
3429
}

0 commit comments

Comments
 (0)