Переместил экспериментальные файлы

imaks79 · Dec 14, 2022 · 4501d19 · 4501d19
1 parent be7be84
commit 4501d19
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 42 deletions.
diff --git a/dataloader/parse_cfg.py → dataloader/experimental/parse_cfg.py b/dataloader/parse_cfg.py → dataloader/experimental/parse_cfg.py
diff --git a/dataloader/parse_tlv.py → dataloader/experimental/parse_tlv.py b/dataloader/parse_tlv.py → dataloader/experimental/parse_tlv.py
@@ -22,15 +22,15 @@ def getMesseges(byteBuffer, idX):
 
 
 def get_TLV_packet(Header, byteBuffer, detObj, configParameters, idX, tlv_type):
-    if tlv_type == MMWDEMO_UART_MSG_DETECTED_POINTS: detObj, dataOK = get_DETECTED_POINTS(Header, byteBuffer, detObj, idX);
-    elif tlv_type == MMWDEMO_UART_MSG_RANGE_PROFILE: detObj, dataOK = get_RANGE_PROFILE(byteBuffer, configParameters, detObj, idX);
-    elif tlv_type == MMWDEMO_OUTPUT_MSG_NOISE_PROFILE: detObj, dataOK = get_NOISE_PROFILE(byteBuffer, configParameters, detObj, idX);
-    elif tlv_type == MMWDEMO_OUTPUT_MSG_AZIMUT_STATIC_HEAT_MAP: detObj, dataOK = get_AZIMUT_STATIC_HEAT_MAP(byteBuffer, configParameters, detObj, idX);
-    elif tlv_type == MMWDEMO_OUTPUT_MSG_RANGE_DOPPLER_HEAT_MAP: detObj, dataOK = get_RANGE_DOPPLER_HEAT_MAP(byteBuffer, configParameters, detObj, idX);
+    if tlv_type == MMWDEMO_UART_MSG_DETECTED_POINTS: detObj, dataOK, idX = get_DETECTED_POINTS(Header, byteBuffer, detObj, idX);
+    elif tlv_type == MMWDEMO_UART_MSG_RANGE_PROFILE: detObj, dataOK, idX = get_RANGE_PROFILE(byteBuffer, configParameters, detObj, idX);
+    elif tlv_type == MMWDEMO_OUTPUT_MSG_NOISE_PROFILE: detObj, dataOK, idX = get_NOISE_PROFILE(byteBuffer, configParameters, detObj, idX);
+    elif tlv_type == MMWDEMO_OUTPUT_MSG_AZIMUT_STATIC_HEAT_MAP: detObj, dataOK, idX = get_AZIMUT_STATIC_HEAT_MAP(byteBuffer, configParameters, detObj, idX);
+    elif tlv_type == MMWDEMO_OUTPUT_MSG_RANGE_DOPPLER_HEAT_MAP: detObj, dataOK, idX = get_RANGE_DOPPLER_HEAT_MAP(byteBuffer, configParameters, detObj, idX);
     elif tlv_type == MMWDEMO_OUTPUT_MSG_STATS: pass; 
     elif tlv_type == MMWDEMO_OUTPUT_MSG_DETECTED_POINTS_SIDE_INFO: pass; # get_DETECTED_POINTS_SIDE_INFO(Header, byteBuffer, idX);
     elif tlv_type == MMWDEMO_OUTPUT_MSG_MAX: pass; 
-    return detObj, dataOK;
+    return detObj, dataOK, idX;
 
 
 def readAndParseTLVData(Data, configParameters, frames = 1):
@@ -55,7 +55,7 @@ def readAndParseTLVData(Data, configParameters, frames = 1):
                 tlv_type, tlv_length, idX = getMesseges(byteBuffer, idX);
                 if DEBUG: debug_message(tlv_type, tlv_length, tlvIdx, Header);
                 ## Чтение данных по TLV сообщению
-                get_TLV_packet(Header, byteBuffer, detObj, configParameters, idX, tlv_type);
+                detObj, dataOK, idX = get_TLV_packet(Header, byteBuffer, detObj, configParameters, idX, tlv_type);
             ## Удаление уже обработанных данных
             byteBuffer, byteBufferLength = clear_old_data(byteBuffer, totalPacketLen, idX)
             if dataOK:

diff --git a/dataloader/setting_ports.py → dataloader/experimental/setting_ports.py b/dataloader/setting_ports.py → dataloader/experimental/setting_ports.py
@@ -3,10 +3,7 @@
 
 
 def serialConfig(configFileName, DATAPORT_NAME = 'COM4', CLIPORT_NAME = 'COM3', CLI_BAUD = 115200, DATA_BAUD = 921600):
-        '''
-        Открывает порт конфигурации и порт данных
-        Windows
-        '''
+        '''Открывает порт конфигурации и порт данных'''
         CLIport = serial.Serial(CLIPORT_NAME, CLI_BAUD); 
         Dataport = serial.Serial(DATAPORT_NAME, DATA_BAUD); 
         ''' Read the configuration file and send it to the board '''

diff --git a/dataloader/utils.py → dataloader/experimental/utils.py b/dataloader/utils.py → dataloader/experimental/utils.py
@@ -1,6 +1,30 @@
 import numpy as np
 
-from params import *
+import time
+
+DEBUG = False;
+
+current_time = '[' + time.strftime("%H:%M:%S", time.localtime()) + ']'; 
+
+# Код синхронизации
+magicWord = [2, 1, 4, 3, 6, 5, 8, 7]; 
+
+# Перевод байтов
+word = [1, 2 ** 8, 2 ** 16, 2 ** 24]; 
+
+# Размеры
+OBJ_STRUCT_SIZE_BYTES = 12; 
+BYTE_VEC_ACC_MAX_SIZE = 2 ** 15; 
+
+# Сообщения TLV
+MMWDEMO_UART_MSG_DETECTED_POINTS = 1; 
+MMWDEMO_UART_MSG_RANGE_PROFILE   = 2; 
+MMWDEMO_OUTPUT_MSG_NOISE_PROFILE = 3; 
+MMWDEMO_OUTPUT_MSG_AZIMUT_STATIC_HEAT_MAP = 4; 
+MMWDEMO_OUTPUT_MSG_RANGE_DOPPLER_HEAT_MAP = 5; 
+MMWDEMO_OUTPUT_MSG_STATS = 6; 
+MMWDEMO_OUTPUT_MSG_DETECTED_POINTS_SIDE_INFO  = 7; 
+MMWDEMO_OUTPUT_MSG_MAX = 8; 
 
 
 def readdata(Data):
@@ -175,23 +199,23 @@ def get_DETECTED_POINTS(Header, byteBuffer, detObj, idX):
     # detObj['detectedAzimuth'] = detectedAzimuth; 
     # detObj['detectedElevAngle'] = detectedElevAngle; 
     dataOK = 1; 
-    return detObj, dataOK;
+    return detObj, dataOK, idX;
 def get_RANGE_PROFILE(byteBuffer, configParameters, detObj, idX):
     numBytes = configParameters['numRangeBins'] * 2; 
     payload = byteBuffer[idX:idX + numBytes]; 
     idX += numBytes; 
     range_profile = payload.view(dtype=np.int16); 
     detObj['range_profile'] = range_profile; 
     dataOK = 1; 
-    return detObj, dataOK;
+    return detObj, dataOK, idX;
 def get_NOISE_PROFILE(byteBuffer, configParameters, detObj, idX):
     numBytes = configParameters['numRangeBins'] * 2; 
     payload = byteBuffer[idX:idX + numBytes]; 
     idX += numBytes; 
     noise_profile = payload.view(dtype=np.int16); 
     detObj['noise_profile'] = noise_profile; 
     dataOK = 1; 
-    return detObj, dataOK;
+    return detObj, dataOK, idX;
 def get_AZIMUT_STATIC_HEAT_MAP(byteBuffer, configParameters, detObj, idX):
     numVirtualAntennas = 4 * 2; 
     numBytes =  configParameters['numRangeBins'] * numVirtualAntennas; 
@@ -201,7 +225,7 @@ def get_AZIMUT_STATIC_HEAT_MAP(byteBuffer, configParameters, detObj, idX):
     # Список в матрицу TODO
     detObj['azimuthDoppler'] = AzimuthDoppler; 
     dataOK = 1;
-    return detObj, dataOK;
+    return detObj, dataOK, idX;
 def get_RANGE_DOPPLER_HEAT_MAP(byteBuffer, configParameters, detObj, idX):
     numBytes = configParameters['numRangeBins'] * configParameters['numDopplerBins'] * 2; 
     payload = byteBuffer[idX:idX + int(numBytes)]; 
@@ -214,7 +238,7 @@ def get_RANGE_DOPPLER_HEAT_MAP(byteBuffer, configParameters, detObj, idX):
     detObj['rangeArray'] = np.array(range(configParameters['numRangeBins'])) * configParameters['rangeIdxToMeters']; 
     detObj['dopplerArray'] = np.multiply(np.arange(-configParameters['numDopplerBins']/2, configParameters['numDopplerBins']/2), configParameters['dopplerResolutionMps']); 
     dataOK = 1; 
-    return detObj, dataOK;
+    return detObj, dataOK, idX;
 def get_STATS():
     pass;
 def get_DETECTED_POINTS_SIDE_INFO(Header, byteBuffer, idX):

diff --git a/dataloader/params.py b/dataloader/params.py