jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-05 14:35:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:jankae/LibreVNA

Browse source
This commit is contained in:
Jan Käberich 2024-03-01 09:08:43 +01:00
commit b7c2bf7cdd
14 changed files with 130 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/deviceconfigurationdialogv1.ui
View file

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>497</width>
<height>297</height>
<width>488</width>
<height>364</height>
</rect>
</property>
<property name="windowTitle">

2
Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
View file

@ -395,5 +395,5 @@ QMAKE_CXXFLAGS += -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-c
CONFIG += c++17
REVISION = $$system(git rev-parse HEAD)
DEFINES += GITHASH=\\"\"$$REVISION\\"\"
DEFINES += FW_MAJOR=1 FW_MINOR=5 FW_PATCH=0 FW_SUFFIX=""
DEFINES += FW_MAJOR=1 FW_MINOR=5 FW_PATCH=1 FW_SUFFIX=""
DEFINES -= _UNICODE UNICODE

6
Software/VNA_embedded/.cproject
View file

@ -44,7 +44,7 @@
<listOptionValue builtIn="false" value="_SNK"/>
<listOptionValue builtIn="false" value="FW_MAJOR=1"/>
<listOptionValue builtIn="false" value="FW_MINOR=5"/>
<listOptionValue builtIn="false" value="FW_PATCH=0"/>
<listOptionValue builtIn="false" value="FW_PATCH=1"/>
<listOptionValue builtIn="false" value="HW_REVISION='B'"/>
<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@ -91,7 +91,7 @@
<listOptionValue builtIn="false" value="DEBUG"/>
<listOptionValue builtIn="false" value="FW_MAJOR=1"/>
<listOptionValue builtIn="false" value="FW_MINOR=5"/>
<listOptionValue builtIn="false" value="FW_PATCH=0"/>
<listOptionValue builtIn="false" value="FW_PATCH=1"/>
<listOptionValue builtIn="false" value="HW_REVISION='B'"/>
<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@ -302,4 +302,4 @@
<resource resourceType="PROJECT" workspacePath="/VNA_embedded"/>
</configuration>
</storageModule>
</cproject>
</cproject>

2
Software/VNA_embedded/Makefile
View file

@ -101,7 +101,7 @@ MCU = $(CPU) -mthumb $(FLOAT-ABI) $(FPU)
C_DEFS = \
-DFW_MAJOR=1 \
-DFW_MINOR=5 \
-DFW_PATCH=0 \
-DFW_PATCH=1 \
-DDEBUG \
-DUSE_FULL_LL_DRIVER \
-DHW_REVISION="'B'" \

2
Software/VNA_embedded/Src/main.c
View file

@ -111,7 +111,7 @@ int main(void)
/* USER CODE BEGIN SysInit */
MX_I2C2_Init();
uint8_t ctrl = 0x0A;
uint8_t ctrl = 0x09;
HAL_I2C_Mem_Write(&hi2c2, 0x42, 0x01, I2C_MEMADD_SIZE_8BIT, &ctrl, 1, 100);
/* USER CODE END SysInit */