removing drm from 107_odin branch. saved in odin_drm branch

heliorc · Jun 17, 2018 · 3adb184 · 3adb184
1 parent 6b1a05c
commit 3adb184
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 102 deletions.
diff --git a/make.py b/make.py
@@ -189,7 +189,6 @@ def configure_target(TARGET):
         os.path.join("src", "imu"),
         os.path.join("src", "bootloader"),
         os.path.join("src", "filter"),
-        os.path.join("src", "drm"),
         LIBRARY_PATH + "/CMSIS_std/Device/ST/STM32F30x/Include",
         LIBRARY_PATH + "/STM32F30x_StdPeriph_Driver/inc",
         LIBRARY_PATH + "/CMSIS_std/Include"
@@ -200,7 +199,6 @@ def configure_target(TARGET):
         os.path.join("src", "stm32"),
         os.path.join("src", "target"),
         os.path.join("src", "board_comm"),
-        os.path.join("src", "drm"),
         LIBRARY_PATH + "/CMSIS_std/Device/ST/STM32F30x/Source",
         LIBRARY_PATH + "/STM32F30x_StdPeriph_Driver/src"
     ]

diff --git a/scripts/linker/stm32_flash_f30x_0x08002000_24k.ld b/scripts/linker/stm32_flash_f30x_0x08002000_24k.ld
@@ -13,7 +13,7 @@
 MEMORY
 {
   FLASH  (rx)     : ORIGIN = 0x08002000, LENGTH = 24K
-  RAM    (xrw)    : ORIGIN = 0x20000100, LENGTH = 16128
+  RAM    (xrw)    : ORIGIN = 0x20000000, LENGTH = 16K
   MEMORY_B1 (rx)  : ORIGIN = 0x60000000, LENGTH = 0K
 }
 

diff --git a/scripts/linker/stm32_flash_f30x_0x08003000_20k.ld b/scripts/linker/stm32_flash_f30x_0x08003000_20k.ld
@@ -13,7 +13,7 @@
 MEMORY
 {
   FLASH  (rx)     : ORIGIN = 0x08003000, LENGTH = 20K
-  RAM    (xrw)    : ORIGIN = 0x20000100, LENGTH = 16128
+  RAM    (xrw)    : ORIGIN = 0x20000000, LENGTH = 16K
   MEMORY_B1 (rx)  : ORIGIN = 0x60000000, LENGTH = 0K
 }
 

diff --git a/scripts/linker/stm32_flash_f30x_22k.ld b/scripts/linker/stm32_flash_f30x_22k.ld
@@ -13,7 +13,7 @@
 MEMORY
 {
   FLASH  (rx)     : ORIGIN = 0x08003000, LENGTH = 22K /* last 2kb used for config storage */
-  RAM    (xrw)    : ORIGIN = 0x20000100, LENGTH = 16128
+  RAM    (xrw)    : ORIGIN = 0x20000000, LENGTH = 16K
   MEMORY_B1 (rx)  : ORIGIN = 0x60000000, LENGTH = 0K
 }
 

diff --git a/src/drm/drm.c b/src/drm/drm.c
diff --git a/src/drm/drm.h b/src/drm/drm.h
diff --git a/src/imu/main.c b/src/imu/main.c
@@ -5,7 +5,6 @@
 #include "gyro.h"
 #include "filter.h"
 #include "crc.h"
-#include "drm.h"
 
 #include "scheduler.h"
 
@@ -22,8 +21,6 @@ int main(void)
     init_imu();
     //this makes the status light go red
     single_gpio_init(BOOTLOADER_CHECK_PORT, BOOTLOADER_CHECK_PIN_SRC, BOOTLOADER_CHECK_PIN, 0, GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL);
-    //init drm
-    prerun_check();
     //init gyro
     gyro_init();
 

diff --git a/src/imu/scheduler.c b/src/imu/scheduler.c
@@ -4,7 +4,6 @@
 #include "quaternions.h"
 #include "gyro.h"
 #include "filter.h"
-#include "drm.h"
 #include "gyro_device.h" //where gyroRxFrame lives
 
 inline void scheduler_run(void)
@@ -27,8 +26,4 @@ inline void scheduler_run(void)
     update_quaternions();
     gyroDataReadDone = 0; //reset read flag to prepare for next read
     fire_spi_send_ready();
-    if (!check_me())
-    {
-        delay_ms(42);
-    }
 }