Explorar o código

first version

Jackistang %!s(int64=4) %!d(string=hai) anos
pai
achega
73ee4111ed
Modificáronse 2 ficheiros con 32 adicións e 31 borrados
  1. 31 28
      SConscript
  2. 1 3
      platform/rtthread/btstack_run_loop_rtthread.c

+ 31 - 28
SConscript

@@ -6,14 +6,6 @@ cwd = GetCurrentDir()
 
 
 # add file
 # add file
 src = Split('''
 src = Split('''
-platform/posix/btstack_stdin_posix.c
-platform/posix/btstack_uart_block_posix.c
-platform/posix/btstack_tlv_posix.c
-platform/posix/btstack_run_loop_posix.c
-
-chipset/bcm/btstack_chipset_bcm.c
-chipset/bcm/btstack_chipset_bcm_download_firmware.c
-
 src/btstack_util.c
 src/btstack_util.c
 src/btstack_run_loop.c
 src/btstack_run_loop.c
 src/btstack_tlv.c
 src/btstack_tlv.c
@@ -29,11 +21,7 @@ src/l2cap.c
 src/l2cap_signaling.c
 src/l2cap_signaling.c
 src/btstack_memory.c
 src/btstack_memory.c
 src/btstack_memory_pool.c
 src/btstack_memory_pool.c
-src/hci_transport_h4.c
 
 
-src/classic/btstack_link_key_db_tlv.c
-
-src/ble/le_device_db_tlv.c
 src/ble/att_server.c
 src/ble/att_server.c
 src/ble/sm.c
 src/ble/sm.c
 src/ble/att_dispatch.c
 src/ble/att_dispatch.c
@@ -41,29 +29,44 @@ src/ble/att_db.c
 
 
 src/ble/gatt-service/battery_service_server.c
 src/ble/gatt-service/battery_service_server.c
 src/ble/gatt-service/device_information_service_server.c
 src/ble/gatt-service/device_information_service_server.c
-
-port/posix-h4-bcm/btstack_main.c
-rtt_adapter/rtt_btstack_adapter.c
-
-src/btstack_crypto.c
-
-
-
-
-
-
 ''')
 ''')
 
 
 
 
 path =  [cwd]
 path =  [cwd]
 path += [cwd + '/src']
 path += [cwd + '/src']
-
-path += [cwd + '/platform/posix']
-path += [cwd + '/chipset/bcm']
-path += [cwd + '/port/posix-h4-bcm']
-path += [cwd + '/rtt_adapter']
 path += [cwd + '/src/ble/gatt-service']
 path += [cwd + '/src/ble/gatt-service']
 
 
+# Adapt for HM package
+if not GetDepend(['PKG_BTSTACK_USING_HM']):
+    src += Split("""
+        platform/posix/btstack_stdin_posix.c
+        platform/posix/btstack_uart_block_posix.c
+        platform/posix/btstack_tlv_posix.c
+        platform/posix/btstack_run_loop_posix.c
+
+        src/hci_transport_h4.c
+        src/classic/btstack_link_key_db_tlv.c
+        src/ble/le_device_db_tlv.c
+        port/posix-h4-bcm/btstack_main.c
+        rtt_adapter/rtt_btstack_adapter.c
+        chipset/bcm/btstack_chipset_bcm.c
+        chipset/bcm/btstack_chipset_bcm_download_firmware.c
+    """)
+    path += [cwd + '/platform/posix']
+    path += [cwd + '/chipset/bcm']
+    path += [cwd + '/port/posix-h4-bcm']
+    path += [cwd + '/rtt_adapter']
+
+if GetDepend(['PKG_BTSTACK_USING_HM']):
+    src += Split("""
+        platform/rtthread/btstack_run_loop_rtthread.c
+        platform/rtthread/hci_dump_rtthread_stdout.c
+        src/ble/le_device_db_memory.c
+        3rd-party/micro-ecc/uECC.c
+    """)
+    path += [cwd + '/platform/rtthread']
+    path += [cwd + '/3rd-party/micro-ecc']
+
 #CLASS
 #CLASS
 if GetDepend(['ENABLE_CLASSIC']):
 if GetDepend(['ENABLE_CLASSIC']):
      path += [cwd + '/src/class']
      path += [cwd + '/src/class']

+ 1 - 3
platform/rtthread/btstack_run_loop_rtthread.c

@@ -63,10 +63,8 @@ static rt_event_t   btstack_run_loop_event_group;
 static rt_thread_t  btstack_run_loop_task;
 static rt_thread_t  btstack_run_loop_task;
 
 
 static uint32_t btstack_run_loop_rtthread_get_time_ms(void) {
 static uint32_t btstack_run_loop_rtthread_get_time_ms(void) {
-    btstack_assert(RT_TICK_PER_SECOND >= 1000);
-
     rt_tick_t ticks = rt_tick_get();
     rt_tick_t ticks = rt_tick_get();
-    uint32_t ms = ticks / (RT_TICK_PER_SECOND / 1000);
+    uint32_t ms = ticks * 1000 / RT_TICK_PER_SECOND;
     return ms;
     return ms;
 }
 }