Przeglądaj źródła

set correct paths to submodules

Juraj Ďuďák 10 miesięcy temu
rodzic
commit
1b49a78942
4 zmienionych plików z 6 dodań i 203 usunięć
  1. 4 4
      .gitmodules
  2. BIN
      baModule-slave.pdf
  3. 0 197
      baModule-slaveL082.ioc
  4. 2 2
      test/app.py

+ 4 - 4
.gitmodules

@@ -1,12 +1,12 @@
 [submodule "Modules/dataframe"]
 	path = Modules/dataframe
-	url = git@gitlab.nsoric.com:mtf/stm32/librararies/dataframe.git
+	url = git@gnsoric.mtf.stuba.sk:mtf/stm32/librararies/dataframe.git
 [submodule "Modules/nbus"]
 	path = Modules/nbus
-	url = git@gitlab.nsoric.com:sensorical/fw/nbus.git
+	url = git@nsoric.mtf.stuba.sk:sensorical/fw/nbus.git
 [submodule "Modules/one-wire-memory"]
 	path = Modules/one-wire-memory
-	url = git@gitlab.nsoric.com:mtf/stm32/librararies/one-wire-memory.git
+	url = git@nsoric.mtf.stuba.sk:mtf/stm32/librararies/one-wire-memory.git
 [submodule "Modules/icm20948"]
 	path = Modules/icm20948
-	url = git@gitlab.nsoric.com:mtf/stm32/librararies/icm-20948-driver.git
+	url = git@nsoric.mtf.stuba.sk:mtf/stm32/librararies/icm-20948-driver.git

BIN
baModule-slave.pdf


+ 0 - 197
baModule-slaveL082.ioc

@@ -1,197 +0,0 @@
-#MicroXplorer Configuration settings - do not modify
-CAD.formats=
-CAD.pinconfig=
-CAD.provider=
-File.Version=6
-GPIO.groupedBy=
-KeepUserPlacement=false
-Mcu.CPN=STM32L082KZT6
-Mcu.Family=STM32L0
-Mcu.IP0=ADC
-Mcu.IP1=NVIC
-Mcu.IP2=RCC
-Mcu.IP3=SPI1
-Mcu.IP4=SYS
-Mcu.IP5=USART1
-Mcu.IPNb=6
-Mcu.Name=STM32L082K(B-Z)Tx
-Mcu.Package=LQFP32
-Mcu.Pin0=PA0
-Mcu.Pin1=PA1
-Mcu.Pin10=PA9
-Mcu.Pin11=PA10
-Mcu.Pin12=PA11
-Mcu.Pin13=PA12
-Mcu.Pin14=PA13
-Mcu.Pin15=PA14
-Mcu.Pin16=PA15
-Mcu.Pin17=PB3
-Mcu.Pin18=PB4
-Mcu.Pin19=PB5
-Mcu.Pin2=PA2
-Mcu.Pin20=PB6
-Mcu.Pin21=PB7
-Mcu.Pin22=VP_SYS_VS_Systick
-Mcu.Pin3=PA3
-Mcu.Pin4=PA4
-Mcu.Pin5=PA5
-Mcu.Pin6=PA6
-Mcu.Pin7=PA7
-Mcu.Pin8=PB1
-Mcu.Pin9=PA8
-Mcu.PinsNb=23
-Mcu.ThirdPartyNb=0
-Mcu.UserConstants=
-Mcu.UserName=STM32L082KZTx
-MxCube.Version=6.13.0
-MxDb.Version=DB.6.0.130
-NVIC.ForceEnableDMAVector=true
-NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
-NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
-NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
-NVIC.SVC_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true
-NVIC.SysTick_IRQn=true\:3\:0\:false\:false\:true\:false\:true\:false
-PA0.Mode=IN0
-PA0.Signal=ADC_IN0
-PA1.Mode=IN1
-PA1.Signal=ADC_IN1
-PA10.GPIOParameters=GPIO_Label
-PA10.GPIO_Label=VCP_RX
-PA10.Mode=Asynchronous
-PA10.Signal=USART1_RX
-PA11.GPIOParameters=GPIO_Label
-PA11.GPIO_Label=SPI_MISO
-PA11.Locked=true
-PA11.Mode=Full_Duplex_Master
-PA11.Signal=SPI1_MISO
-PA12.GPIOParameters=GPIO_Label
-PA12.GPIO_Label=VCP_DE
-PA12.Locked=true
-PA12.Signal=GPIO_Output
-PA13.Mode=Serial_Wire
-PA13.Signal=SYS_SWDIO
-PA14.Mode=Serial_Wire
-PA14.Signal=SYS_SWCLK
-PA15.GPIOParameters=GPIO_Label
-PA15.GPIO_Label=SPI_INT
-PA15.Locked=true
-PA15.Signal=GPXTI15
-PA2.Mode=IN2
-PA2.Signal=ADC_IN2
-PA3.Mode=IN3
-PA3.Signal=ADC_IN3
-PA4.Mode=IN4
-PA4.Signal=ADC_IN4
-PA5.Mode=IN5
-PA5.Signal=ADC_IN5
-PA6.Mode=IN6
-PA6.Signal=ADC_IN6
-PA7.Mode=IN7
-PA7.Signal=ADC_IN7
-PA8.GPIOParameters=GPIO_Label
-PA8.GPIO_Label=SPI_CS
-PA8.Locked=true
-PA8.Signal=GPIO_Output
-PA9.GPIOParameters=GPIO_Label
-PA9.GPIO_Label=VCP_TX
-PA9.Mode=Asynchronous
-PA9.Signal=USART1_TX
-PB1.GPIOParameters=GPIO_Label
-PB1.GPIO_Label=LED3
-PB1.Locked=true
-PB1.Signal=GPIO_Output
-PB3.GPIOParameters=GPIO_Label
-PB3.GPIO_Label=SPI_SCK
-PB3.Locked=true
-PB3.Mode=Full_Duplex_Master
-PB3.Signal=SPI1_SCK
-PB4.GPIOParameters=GPIO_Label
-PB4.GPIO_Label=ONE_WIRE
-PB4.Locked=true
-PB4.Signal=GPIO_Output
-PB5.GPIOParameters=GPIO_Label
-PB5.GPIO_Label=SPI_MOSI
-PB5.Locked=true
-PB5.Mode=Full_Duplex_Master
-PB5.Signal=SPI1_MOSI
-PB6.Locked=true
-PB6.Signal=I2C1_SCL
-PB7.Locked=true
-PB7.Signal=I2C1_SDA
-PinOutPanel.RotationAngle=0
-ProjectManager.AskForMigrate=true
-ProjectManager.BackupPrevious=false
-ProjectManager.CompilerOptimize=6
-ProjectManager.ComputerToolchain=false
-ProjectManager.CoupleFile=false
-ProjectManager.CustomerFirmwarePackage=
-ProjectManager.DefaultFWLocation=true
-ProjectManager.DeletePrevious=true
-ProjectManager.DeviceId=STM32L082KZTx
-ProjectManager.FirmwarePackage=STM32Cube FW_L0 V1.12.2
-ProjectManager.FreePins=false
-ProjectManager.HalAssertFull=false
-ProjectManager.HeapSize=0x200
-ProjectManager.KeepUserCode=true
-ProjectManager.LastFirmware=true
-ProjectManager.LibraryCopy=1
-ProjectManager.MainLocation=Core/Src
-ProjectManager.NoMain=false
-ProjectManager.PreviousToolchain=
-ProjectManager.ProjectBuild=false
-ProjectManager.ProjectFileName=baModule-slaveL082.ioc
-ProjectManager.ProjectName=baModule-slaveL082
-ProjectManager.ProjectStructure=
-ProjectManager.RegisterCallBack=
-ProjectManager.StackSize=0x400
-ProjectManager.TargetToolchain=STM32CubeIDE
-ProjectManager.ToolChainLocation=
-ProjectManager.UAScriptAfterPath=
-ProjectManager.UAScriptBeforePath=
-ProjectManager.UnderRoot=true
-ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_ADC_Init-ADC-false-HAL-true,4-MX_SPI1_Init-SPI1-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true
-RCC.48CLKFreq_Value=24000000
-RCC.AHBCLKDivider=RCC_SYSCLK_DIV2
-RCC.AHBFreq_Value=8000000
-RCC.APB1Freq_Value=8000000
-RCC.APB1TimFreq_Value=8000000
-RCC.APB2Freq_Value=8000000
-RCC.APB2TimFreq_Value=8000000
-RCC.FCLKCortexFreq_Value=8000000
-RCC.FamilyName=M
-RCC.HCLKFreq_Value=8000000
-RCC.HSI16_VALUE=16000000
-RCC.HSI48_VALUE=48000000
-RCC.HSI_VALUE=16000000
-RCC.I2C1Freq_Value=8000000
-RCC.I2C3Freq_Value=8000000
-RCC.IPParameters=48CLKFreq_Value,AHBCLKDivider,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSI16_VALUE,HSI48_VALUE,HSI_VALUE,I2C1Freq_Value,I2C3Freq_Value,LPTIMFreq_Value,LPUARTFreq_Value,LSE_VALUE,LSI_VALUE,MCOPinFreq_Value,MSIClockRange,MSI_VALUE,PLLCLKFreq_Value,RTCFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,TIMFreq_Value,TimerFreq_Value,USART1Freq_Value,USART2Freq_Value,VCOOutputFreq_Value,WatchDogFreq_Value
-RCC.LPTIMFreq_Value=8000000
-RCC.LPUARTFreq_Value=8000000
-RCC.LSE_VALUE=32768
-RCC.LSI_VALUE=37000
-RCC.MCOPinFreq_Value=16000000
-RCC.MSIClockRange=RCC_MSIRANGE_6
-RCC.MSI_VALUE=4194000
-RCC.PLLCLKFreq_Value=24000000
-RCC.RTCFreq_Value=37000
-RCC.SYSCLKFreq_VALUE=16000000
-RCC.SYSCLKSource=RCC_SYSCLKSOURCE_HSI
-RCC.TIMFreq_Value=8000000
-RCC.TimerFreq_Value=8000000
-RCC.USART1Freq_Value=8000000
-RCC.USART2Freq_Value=8000000
-RCC.VCOOutputFreq_Value=48000000
-RCC.WatchDogFreq_Value=37000
-SH.GPXTI15.0=GPIO_EXTI15
-SH.GPXTI15.ConfNb=1
-SPI1.CalculateBaudRate=4.0 MBits/s
-SPI1.Direction=SPI_DIRECTION_2LINES
-SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
-SPI1.Mode=SPI_MODE_MASTER
-SPI1.VirtualType=VM_MASTER
-USART1.IPParameters=VirtualMode-Asynchronous
-USART1.VirtualMode-Asynchronous=VM_ASYNC
-VP_SYS_VS_Systick.Mode=SysTick
-VP_SYS_VS_Systick.Signal=SYS_VS_Systick
-board=custom

+ 2 - 2
test/app.py

@@ -15,11 +15,11 @@ def show_data(data):
 
 if __name__ == "__main__":
 
-    nbus = NbusSystem(True)
+    nbus = NbusSystem(False)
     s1_adr = 5
     s2_adr = 6
     adrs = [s1_adr, s2_adr]
-    adrs = [200]
+    # adrs = [s1_adr]
 
     foundSlaves = {}
     for adr in adrs: