feat: (bit band) A little bit enhancement

avem-labs · May 2, 2017 · 31242a5 · 31242a5
1 parent c1835e5
commit 31242a5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/libs/include/bit.h b/libs/include/bit.h
@@ -1,7 +1,7 @@
 #ifndef BIT_H
 #define BIT_H
 
-#define BITBAND(addr, bitnum) ((addr & 0xF0000000) + 0x2000000 + ((addr & 0xFFFFF) << 5) + (bitnum<<2))
-#define BIT_ADDR(addr, bitnum) *((volatile unsigned long *)(BITBAND(addr, bitnum)))
+#define BITBAND(addr, bitnum) (((addr) & 0xF0000000) + 0x2000000 + (((addr) & 0xFFFFF) << 5) + ((bitnum)<<2))
+#define BIT_ADDR(addr, bitnum) *((volatile unsigned long *)(BITBAND((unsigned int)(addr), bitnum)))
 
 #endif
diff --git a/libs/include/i2c.h b/libs/include/i2c.h
@@ -5,13 +5,12 @@
 
 #define SCL_PINNUM 15
 #define SDA_PINNUM 14
-#define SCL BIT_ADDR((GPIOB_BASE+12), SCL_PINNUM)
-#define SDA BIT_ADDR((GPIOB_BASE+12), SDA_PINNUM)
+#define SCL BIT_ADDR(&(GPIOB->ODR), SCL_PINNUM)
+#define SDA BIT_ADDR(&(GPIOB->ODR), SDA_PINNUM)
 //#define AD0 BIT_ADDR((GPIOC_BASE+12), 6)
 
 
-#define GPIOB_IDR_Addr (GPIOB_BASE + 8)
-#define READ_SDA BIT_ADDR(GPIOB_IDR_Addr, SDA_PINNUM)
+#define READ_SDA BIT_ADDR(&(GPIOB->IDR), SDA_PINNUM)
 
 #define IIC_DELAY() delay_us(1)
 

diff --git a/src/main.c b/src/main.c
@@ -146,7 +146,7 @@ int main() {
  uart_sendStr("MPU6050 Connect Success!");
  UART_CR();
 
- // xTaskCreate(uart_task, "UART_TASK", 100, NULL, 1, NULL);
+ xTaskCreate(uart_task, "UART_TASK", 100, NULL, 1, NULL);
  xTaskCreate(mpu_task, "MPU_TASK", 100, NULL, 3, NULL);
  xTaskCreate(pid_task, "PID_TASK", 100, NULL, 2, NULL);
  vTaskStartScheduler();