优化
This commit is contained in:
+1
-1
@@ -48,7 +48,7 @@ extern "C" {
|
|||||||
|
|
||||||
/* Exported macro ------------------------------------------------------------*/
|
/* Exported macro ------------------------------------------------------------*/
|
||||||
/* USER CODE BEGIN EM */
|
/* USER CODE BEGIN EM */
|
||||||
#define VERSION_STR "V1.0.0"
|
#define VERSION_STR "V1.1.0"
|
||||||
#ifdef BOOTLOADER
|
#ifdef BOOTLOADER
|
||||||
#define SW_VER "BL for " VERSION_STR
|
#define SW_VER "BL for " VERSION_STR
|
||||||
#else
|
#else
|
||||||
|
|||||||
+4
-4
@@ -151,9 +151,9 @@ int main(void)
|
|||||||
{
|
{
|
||||||
|
|
||||||
/* USER CODE BEGIN 1 */
|
/* USER CODE BEGIN 1 */
|
||||||
// #ifndef BOOTLOADER
|
#ifndef BOOTLOADER
|
||||||
// SCB->VTOR = 0x30000000;
|
SCB->VTOR = 0x30000000;
|
||||||
// #endif
|
#endif
|
||||||
/* USER CODE END 1 */
|
/* USER CODE END 1 */
|
||||||
|
|
||||||
/* MPU Configuration--------------------------------------------------------*/
|
/* MPU Configuration--------------------------------------------------------*/
|
||||||
@@ -542,7 +542,7 @@ static void MX_SPI1_Init(void)
|
|||||||
hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
|
hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
|
||||||
hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
|
hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
|
||||||
hspi1.Init.CRCPolynomial = 0x0;
|
hspi1.Init.CRCPolynomial = 0x0;
|
||||||
hspi1.Init.NSSPMode = SPI_NSS_PULSE_ENABLE;
|
hspi1.Init.NSSPMode = SPI_NSS_PULSE_DISABLE;
|
||||||
hspi1.Init.NSSPolarity = SPI_NSS_POLARITY_LOW;
|
hspi1.Init.NSSPolarity = SPI_NSS_POLARITY_LOW;
|
||||||
hspi1.Init.FifoThreshold = SPI_FIFO_THRESHOLD_01DATA;
|
hspi1.Init.FifoThreshold = SPI_FIFO_THRESHOLD_01DATA;
|
||||||
hspi1.Init.TxCRCInitializationPattern = SPI_CRC_INITIALIZATION_ALL_ZERO_PATTERN;
|
hspi1.Init.TxCRCInitializationPattern = SPI_CRC_INITIALIZATION_ALL_ZERO_PATTERN;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
#include "Param/param.h"
|
#include "Param/param.h"
|
||||||
#include "Filament/filament.h"
|
#include "Filament/filament.h"
|
||||||
#include "IAP/iap.h"
|
#include "IAP/iap.h"
|
||||||
|
#include "OSU/osu.h"
|
||||||
|
|
||||||
char gacVersionBuf[32];
|
char gacVersionBuf[32];
|
||||||
|
|
||||||
@@ -40,7 +41,7 @@ static uint16_t crc16(const uint8_t *data, uint16_t len) {
|
|||||||
|
|
||||||
static int check_packet(cpy_prot_packet_t *packet) {
|
static int check_packet(cpy_prot_packet_t *packet) {
|
||||||
if (packet->header != CPY_PROT_HEADER) {
|
if (packet->header != CPY_PROT_HEADER) {
|
||||||
printf("header error, 0x%04X\r\n", packet->header);
|
// printf("header error, 0x%04X\r\n", packet->header);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,9 +71,9 @@ void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart)
|
|||||||
|
|
||||||
void HAL_UARTEx_RxEventCallback_UART4(UART_HandleTypeDef *huart, uint16_t Size)
|
void HAL_UARTEx_RxEventCallback_UART4(UART_HandleTypeDef *huart, uint16_t Size)
|
||||||
{
|
{
|
||||||
if ((huart->Instance == huart4.Instance) && (huart->RxEventType == HAL_UART_RXEVENT_IDLE)) {
|
if ((huart->Instance == huart4.Instance && huart->RxEventType == HAL_UART_RXEVENT_IDLE)) {
|
||||||
//SCB_InvalidateDCache_by_Addr((volatile void *)rx_packet_buf, Size);
|
//SCB_InvalidateDCache_by_Addr((volatile void *)rx_packet_buf, Size);
|
||||||
printf("rx packet %d\r\n", Size);
|
// printf("rx packet %d\r\n", Size);
|
||||||
// for (int i = 0; i < Size; i++) {
|
// for (int i = 0; i < Size; i++) {
|
||||||
// printf("%02X ", ((uint8_t *)rx_packet_buf)[i]);
|
// printf("%02X ", ((uint8_t *)rx_packet_buf)[i]);
|
||||||
// }
|
// }
|
||||||
@@ -99,9 +100,7 @@ static int start_send(const char *data, size_t len) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int start_recv(char *data, size_t len) {
|
static int start_recv(char *data, size_t len) {
|
||||||
if (huart4.gState != HAL_UART_STATE_READY) {
|
HAL_UART_AbortReceive(&huart4);
|
||||||
HAL_UART_AbortReceive(&huart4);
|
|
||||||
}
|
|
||||||
|
|
||||||
return HAL_UARTEx_ReceiveToIdle_DMA(&huart4, (uint8_t *)data, len);
|
return HAL_UARTEx_ReceiveToIdle_DMA(&huart4, (uint8_t *)data, len);
|
||||||
}
|
}
|
||||||
@@ -141,13 +140,15 @@ int cpyProtPacketHandle(uint8_t cmd, const uint8_t *data, uint16_t len) {
|
|||||||
case CPY_PROT_CMD_HEARTBEAT:
|
case CPY_PROT_CMD_HEARTBEAT:
|
||||||
{
|
{
|
||||||
extern uint16_t gusTempVal;
|
extern uint16_t gusTempVal;
|
||||||
uint8_t aucRspData[13];
|
uint8_t aucRspData[16];
|
||||||
*((uint32_t *)&aucRspData[0]) = osKernelGetTickCount();
|
*((uint32_t *)&aucRspData[0]) = osKernelGetTickCount();
|
||||||
*((uint16_t *)&aucRspData[4]) = gusTempVal;
|
*((uint16_t *)&aucRspData[4]) = gusTempVal;
|
||||||
*((uint16_t *)&aucRspData[6]) = gusFilamentCurrent;
|
*((uint16_t *)&aucRspData[6]) = gusFilamentCurrent;
|
||||||
*((uint16_t *)&aucRspData[8]) = gusFilamentVoltage;
|
*((uint16_t *)&aucRspData[8]) = gusFilamentVoltage;
|
||||||
*((uint16_t *)&aucRspData[10]) = gusXrayCurrent;
|
*((uint16_t *)&aucRspData[10]) = gusXrayCurrent;
|
||||||
aucRspData[12] = gucWorkState;
|
*((uint16_t *)&aucRspData[12]) = gusOsuTemp;
|
||||||
|
aucRspData[14] = gusOsuLevel;
|
||||||
|
aucRspData[15] = gucWorkState;
|
||||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, aucRspData, sizeof(aucRspData));
|
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, aucRspData, sizeof(aucRspData));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -102,8 +102,6 @@ static void filamentThread(void *arg)
|
|||||||
|
|
||||||
HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t *)gausAdcBuf, ADC_CHNL_NUM);
|
HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t *)gausAdcBuf, ADC_CHNL_NUM);
|
||||||
|
|
||||||
debug("ADC_CHNL_NUM = %d\n", ADC_CHNL_NUM);
|
|
||||||
|
|
||||||
__HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, 0);
|
__HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, 0);
|
||||||
|
|
||||||
HAL_TIM_PWM_Start(&htim1, TIM_CHANNEL_1);
|
HAL_TIM_PWM_Start(&htim1, TIM_CHANNEL_1);
|
||||||
@@ -125,8 +123,8 @@ static void filamentThread(void *arg)
|
|||||||
iWorkCmd = 3;
|
iWorkCmd = 3;
|
||||||
if (gucWorkState == 1) {
|
if (gucWorkState == 1) {
|
||||||
gucWorkState = 2;
|
gucWorkState = 2;
|
||||||
if (gusNormalDuty == 0) {
|
if (gusNormalDuty < gusPreheatDuty * 1.5 ) {
|
||||||
gusNormalDuty = gusPreheatDuty * 2;
|
gusNormalDuty = gusPreheatDuty * 1.5;
|
||||||
}
|
}
|
||||||
gusDuty = gusNormalDuty;
|
gusDuty = gusNormalDuty;
|
||||||
__HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, gusDuty);
|
__HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, gusDuty);
|
||||||
@@ -158,8 +156,10 @@ static void filamentThread(void *arg)
|
|||||||
}
|
}
|
||||||
iCnt = 0;
|
iCnt = 0;
|
||||||
|
|
||||||
|
printf("\n");
|
||||||
|
printf("\n");
|
||||||
printf("ADC: %d,%d,%d\n", gausAdcBuf[0], gausAdcBuf[1], gausAdcBuf[2]);
|
printf("ADC: %d,%d,%d\n", gausAdcBuf[0], gausAdcBuf[1], gausAdcBuf[2]);
|
||||||
printf("duty:%d%%,I:%.3fA,V:%.2fV\n", gusDuty, gusFilamentCurrent/1000.0, gusFilamentVoltage/1000.0);
|
printf("workState:%d,duty:%d%%,I:%.3fA,V:%.2fV\n", gucWorkState, gusDuty * 100 / 2400, gusFilamentCurrent/1000.0, gusFilamentVoltage/1000.0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,9 @@
|
|||||||
#include "cmsis_os.h"
|
#include "cmsis_os.h"
|
||||||
#include "osu.h"
|
#include "osu.h"
|
||||||
|
|
||||||
|
uint16_t gusOsuLevel = 0;
|
||||||
|
uint16_t gusOsuTemp = 0;
|
||||||
|
|
||||||
extern UART_HandleTypeDef huart3;
|
extern UART_HandleTypeDef huart3;
|
||||||
static uint8_t gausRcvBuf[100];
|
static uint8_t gausRcvBuf[100];
|
||||||
static int rx_packet_ready = 0;
|
static int rx_packet_ready = 0;
|
||||||
@@ -39,6 +42,8 @@ static void osuDataProcess(void) {
|
|||||||
int level = gausRcvBuf[4];
|
int level = gausRcvBuf[4];
|
||||||
int temp = gausRcvBuf[5] * 256 + gausRcvBuf[6];
|
int temp = gausRcvBuf[5] * 256 + gausRcvBuf[6];
|
||||||
printf("osu packet level, %d, temp, %.1f\r\n", level, temp / 10.0);
|
printf("osu packet level, %d, temp, %.1f\r\n", level, temp / 10.0);
|
||||||
|
gusOsuLevel = level;
|
||||||
|
gusOsuTemp = temp;
|
||||||
}
|
}
|
||||||
|
|
||||||
void HAL_UARTEx_RxEventCallback_UART3(UART_HandleTypeDef *huart, uint16_t Size)
|
void HAL_UARTEx_RxEventCallback_UART3(UART_HandleTypeDef *huart, uint16_t Size)
|
||||||
|
|||||||
@@ -6,6 +6,9 @@
|
|||||||
#include "main.h"
|
#include "main.h"
|
||||||
/* Exported types ------------------------------------------------------------*/
|
/* Exported types ------------------------------------------------------------*/
|
||||||
|
|
||||||
|
extern uint16_t gusOsuLevel;
|
||||||
|
extern uint16_t gusOsuTemp;
|
||||||
|
|
||||||
void osuInit(void);
|
void osuInit(void);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,8 @@ static HAL_StatusTypeDef SPI_Transmit(uint8_t* send_buf, uint16_t size)
|
|||||||
*/
|
*/
|
||||||
static HAL_StatusTypeDef SPI_Receive(uint8_t* recv_buf, uint16_t size)
|
static HAL_StatusTypeDef SPI_Receive(uint8_t* recv_buf, uint16_t size)
|
||||||
{
|
{
|
||||||
return HAL_SPI_Receive(&hspi1, recv_buf, size, 100);
|
memset(recv_buf, 0xFF, size);
|
||||||
|
return HAL_SPI_TransmitReceive(&hspi1, recv_buf, recv_buf, size, 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -135,10 +136,13 @@ AGAIN:
|
|||||||
{
|
{
|
||||||
HAL_GPIO_WritePin(FLASH_CS_GPIO_Port, FLASH_CS_Pin, GPIO_PIN_SET);
|
HAL_GPIO_WritePin(FLASH_CS_GPIO_Port, FLASH_CS_Pin, GPIO_PIN_SET);
|
||||||
return 0;
|
return 0;
|
||||||
|
} else {
|
||||||
|
debug("spi read data %d bytes failed:%d", nbytes, ret);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
debug("spi read cmd failed:%d", ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
debug("spi read failed:%d", ret);
|
|
||||||
if (iCnt < 3) {
|
if (iCnt < 3) {
|
||||||
iCnt++;
|
iCnt++;
|
||||||
goto AGAIN;
|
goto AGAIN;
|
||||||
|
|||||||
+64
-28
@@ -248,7 +248,7 @@
|
|||||||
<GroupNumber>2</GroupNumber>
|
<GroupNumber>2</GroupNumber>
|
||||||
<FileNumber>2</FileNumber>
|
<FileNumber>2</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>1</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
<bDave2>0</bDave2>
|
<bDave2>0</bDave2>
|
||||||
<PathWithFileName>../Core/Src/main.c</PathWithFileName>
|
<PathWithFileName>../Core/Src/main.c</PathWithFileName>
|
||||||
@@ -588,6 +588,30 @@
|
|||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<bShared>0</bShared>
|
<bShared>0</bShared>
|
||||||
</File>
|
</File>
|
||||||
|
<File>
|
||||||
|
<GroupNumber>3</GroupNumber>
|
||||||
|
<FileNumber>30</FileNumber>
|
||||||
|
<FileType>1</FileType>
|
||||||
|
<tvExp>0</tvExp>
|
||||||
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
|
<bDave2>0</bDave2>
|
||||||
|
<PathWithFileName>..\Drivers\STM32H7xx_HAL_Driver\Src\stm32h7xx_hal_adc.c</PathWithFileName>
|
||||||
|
<FilenameWithoutPath>stm32h7xx_hal_adc.c</FilenameWithoutPath>
|
||||||
|
<RteFlg>0</RteFlg>
|
||||||
|
<bShared>0</bShared>
|
||||||
|
</File>
|
||||||
|
<File>
|
||||||
|
<GroupNumber>3</GroupNumber>
|
||||||
|
<FileNumber>31</FileNumber>
|
||||||
|
<FileType>1</FileType>
|
||||||
|
<tvExp>0</tvExp>
|
||||||
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
|
<bDave2>0</bDave2>
|
||||||
|
<PathWithFileName>..\Drivers\STM32H7xx_HAL_Driver\Src\stm32h7xx_hal_adc_ex.c</PathWithFileName>
|
||||||
|
<FilenameWithoutPath>stm32h7xx_hal_adc_ex.c</FilenameWithoutPath>
|
||||||
|
<RteFlg>0</RteFlg>
|
||||||
|
<bShared>0</bShared>
|
||||||
|
</File>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
<Group>
|
<Group>
|
||||||
@@ -598,7 +622,7 @@
|
|||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>4</GroupNumber>
|
<GroupNumber>4</GroupNumber>
|
||||||
<FileNumber>30</FileNumber>
|
<FileNumber>32</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -618,7 +642,7 @@
|
|||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>5</GroupNumber>
|
<GroupNumber>5</GroupNumber>
|
||||||
<FileNumber>31</FileNumber>
|
<FileNumber>33</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -630,7 +654,7 @@
|
|||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>5</GroupNumber>
|
<GroupNumber>5</GroupNumber>
|
||||||
<FileNumber>32</FileNumber>
|
<FileNumber>34</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -642,7 +666,7 @@
|
|||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>5</GroupNumber>
|
<GroupNumber>5</GroupNumber>
|
||||||
<FileNumber>33</FileNumber>
|
<FileNumber>35</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -654,7 +678,7 @@
|
|||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>5</GroupNumber>
|
<GroupNumber>5</GroupNumber>
|
||||||
<FileNumber>34</FileNumber>
|
<FileNumber>36</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -666,7 +690,7 @@
|
|||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>5</GroupNumber>
|
<GroupNumber>5</GroupNumber>
|
||||||
<FileNumber>35</FileNumber>
|
<FileNumber>37</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -678,7 +702,7 @@
|
|||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>5</GroupNumber>
|
<GroupNumber>5</GroupNumber>
|
||||||
<FileNumber>36</FileNumber>
|
<FileNumber>38</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -690,7 +714,7 @@
|
|||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>5</GroupNumber>
|
<GroupNumber>5</GroupNumber>
|
||||||
<FileNumber>37</FileNumber>
|
<FileNumber>39</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -702,7 +726,7 @@
|
|||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>5</GroupNumber>
|
<GroupNumber>5</GroupNumber>
|
||||||
<FileNumber>38</FileNumber>
|
<FileNumber>40</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -714,7 +738,7 @@
|
|||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>5</GroupNumber>
|
<GroupNumber>5</GroupNumber>
|
||||||
<FileNumber>39</FileNumber>
|
<FileNumber>41</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -726,7 +750,7 @@
|
|||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>5</GroupNumber>
|
<GroupNumber>5</GroupNumber>
|
||||||
<FileNumber>40</FileNumber>
|
<FileNumber>42</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -746,7 +770,7 @@
|
|||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>6</GroupNumber>
|
<GroupNumber>6</GroupNumber>
|
||||||
<FileNumber>41</FileNumber>
|
<FileNumber>43</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -758,7 +782,7 @@
|
|||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>6</GroupNumber>
|
<GroupNumber>6</GroupNumber>
|
||||||
<FileNumber>42</FileNumber>
|
<FileNumber>44</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -770,7 +794,7 @@
|
|||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>6</GroupNumber>
|
<GroupNumber>6</GroupNumber>
|
||||||
<FileNumber>43</FileNumber>
|
<FileNumber>45</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -782,19 +806,7 @@
|
|||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>6</GroupNumber>
|
<GroupNumber>6</GroupNumber>
|
||||||
<FileNumber>44</FileNumber>
|
<FileNumber>46</FileNumber>
|
||||||
<FileType>1</FileType>
|
|
||||||
<tvExp>0</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<bDave2>0</bDave2>
|
|
||||||
<PathWithFileName>..\Drivers\User\ADS8321\ads8321.c</PathWithFileName>
|
|
||||||
<FilenameWithoutPath>ads8321.c</FilenameWithoutPath>
|
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<bShared>0</bShared>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<GroupNumber>6</GroupNumber>
|
|
||||||
<FileNumber>45</FileNumber>
|
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
@@ -804,6 +816,30 @@
|
|||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<bShared>0</bShared>
|
<bShared>0</bShared>
|
||||||
</File>
|
</File>
|
||||||
|
<File>
|
||||||
|
<GroupNumber>6</GroupNumber>
|
||||||
|
<FileNumber>47</FileNumber>
|
||||||
|
<FileType>1</FileType>
|
||||||
|
<tvExp>0</tvExp>
|
||||||
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
|
<bDave2>0</bDave2>
|
||||||
|
<PathWithFileName>..\Drivers\User\Filament\filament.c</PathWithFileName>
|
||||||
|
<FilenameWithoutPath>filament.c</FilenameWithoutPath>
|
||||||
|
<RteFlg>0</RteFlg>
|
||||||
|
<bShared>0</bShared>
|
||||||
|
</File>
|
||||||
|
<File>
|
||||||
|
<GroupNumber>6</GroupNumber>
|
||||||
|
<FileNumber>48</FileNumber>
|
||||||
|
<FileType>1</FileType>
|
||||||
|
<tvExp>0</tvExp>
|
||||||
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
|
<bDave2>0</bDave2>
|
||||||
|
<PathWithFileName>..\Drivers\User\OSU\osu.c</PathWithFileName>
|
||||||
|
<FilenameWithoutPath>osu.c</FilenameWithoutPath>
|
||||||
|
<RteFlg>0</RteFlg>
|
||||||
|
<bShared>0</bShared>
|
||||||
|
</File>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
<Group>
|
<Group>
|
||||||
|
|||||||
@@ -742,6 +742,16 @@
|
|||||||
</FileArmAds>
|
</FileArmAds>
|
||||||
</FileOption>
|
</FileOption>
|
||||||
</File>
|
</File>
|
||||||
|
<File>
|
||||||
|
<FileName>stm32h7xx_hal_adc.c</FileName>
|
||||||
|
<FileType>1</FileType>
|
||||||
|
<FilePath>..\Drivers\STM32H7xx_HAL_Driver\Src\stm32h7xx_hal_adc.c</FilePath>
|
||||||
|
</File>
|
||||||
|
<File>
|
||||||
|
<FileName>stm32h7xx_hal_adc_ex.c</FileName>
|
||||||
|
<FileType>1</FileType>
|
||||||
|
<FilePath>..\Drivers\STM32H7xx_HAL_Driver\Src\stm32h7xx_hal_adc_ex.c</FilePath>
|
||||||
|
</File>
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
<Group>
|
||||||
@@ -827,16 +837,21 @@
|
|||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<FilePath>..\Drivers\User\Param\param.c</FilePath>
|
<FilePath>..\Drivers\User\Param\param.c</FilePath>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
|
||||||
<FileName>ads8321.c</FileName>
|
|
||||||
<FileType>1</FileType>
|
|
||||||
<FilePath>..\Drivers\User\ADS8321\ads8321.c</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
<File>
|
||||||
<FileName>cpy_prot.c</FileName>
|
<FileName>cpy_prot.c</FileName>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<FilePath>..\Drivers\User\CPY_PROT\cpy_prot.c</FilePath>
|
<FilePath>..\Drivers\User\CPY_PROT\cpy_prot.c</FilePath>
|
||||||
</File>
|
</File>
|
||||||
|
<File>
|
||||||
|
<FileName>filament.c</FileName>
|
||||||
|
<FileType>1</FileType>
|
||||||
|
<FilePath>..\Drivers\User\Filament\filament.c</FilePath>
|
||||||
|
</File>
|
||||||
|
<File>
|
||||||
|
<FileName>osu.c</FileName>
|
||||||
|
<FileType>1</FileType>
|
||||||
|
<FilePath>..\Drivers\User\OSU\osu.c</FilePath>
|
||||||
|
</File>
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
<Group>
|
||||||
|
|||||||
@@ -206,11 +206,11 @@
|
|||||||
<Ro2Chk>0</Ro2Chk>
|
<Ro2Chk>0</Ro2Chk>
|
||||||
<Ro3Chk>0</Ro3Chk>
|
<Ro3Chk>0</Ro3Chk>
|
||||||
<Ir1Chk>1</Ir1Chk>
|
<Ir1Chk>1</Ir1Chk>
|
||||||
<Ir2Chk>1</Ir2Chk>
|
<Ir2Chk>0</Ir2Chk>
|
||||||
<Ra1Chk>0</Ra1Chk>
|
<Ra1Chk>0</Ra1Chk>
|
||||||
<Ra2Chk>0</Ra2Chk>
|
<Ra2Chk>0</Ra2Chk>
|
||||||
<Ra3Chk>0</Ra3Chk>
|
<Ra3Chk>0</Ra3Chk>
|
||||||
<Im1Chk>1</Im1Chk>
|
<Im1Chk>0</Im1Chk>
|
||||||
<Im2Chk>1</Im2Chk>
|
<Im2Chk>1</Im2Chk>
|
||||||
<OnChipMemories>
|
<OnChipMemories>
|
||||||
<Ocm1>
|
<Ocm1>
|
||||||
@@ -275,8 +275,8 @@
|
|||||||
</OCR_RVCT3>
|
</OCR_RVCT3>
|
||||||
<OCR_RVCT4>
|
<OCR_RVCT4>
|
||||||
<Type>1</Type>
|
<Type>1</Type>
|
||||||
<StartAddress>0x8000000</StartAddress>
|
<StartAddress>0x30000000</StartAddress>
|
||||||
<Size>0x100000</Size>
|
<Size>0x20000</Size>
|
||||||
</OCR_RVCT4>
|
</OCR_RVCT4>
|
||||||
<OCR_RVCT5>
|
<OCR_RVCT5>
|
||||||
<Type>1</Type>
|
<Type>1</Type>
|
||||||
@@ -285,11 +285,11 @@
|
|||||||
</OCR_RVCT5>
|
</OCR_RVCT5>
|
||||||
<OCR_RVCT6>
|
<OCR_RVCT6>
|
||||||
<Type>0</Type>
|
<Type>0</Type>
|
||||||
<StartAddress>0x30000000</StartAddress>
|
<StartAddress>0x0</StartAddress>
|
||||||
<Size>0x48000</Size>
|
<Size>0x0</Size>
|
||||||
</OCR_RVCT6>
|
</OCR_RVCT6>
|
||||||
<OCR_RVCT7>
|
<OCR_RVCT7>
|
||||||
<Type>0</Type>
|
<Type>1</Type>
|
||||||
<StartAddress>0x38000000</StartAddress>
|
<StartAddress>0x38000000</StartAddress>
|
||||||
<Size>0x10000</Size>
|
<Size>0x10000</Size>
|
||||||
</OCR_RVCT7>
|
</OCR_RVCT7>
|
||||||
|
|||||||
+2
-1
@@ -489,8 +489,9 @@ SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_16
|
|||||||
SPI1.CalculateBaudRate=7.8125 MBits/s
|
SPI1.CalculateBaudRate=7.8125 MBits/s
|
||||||
SPI1.DataSize=SPI_DATASIZE_8BIT
|
SPI1.DataSize=SPI_DATASIZE_8BIT
|
||||||
SPI1.Direction=SPI_DIRECTION_2LINES
|
SPI1.Direction=SPI_DIRECTION_2LINES
|
||||||
SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,DataSize,BaudRatePrescaler
|
SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,DataSize,BaudRatePrescaler,NSSPMode
|
||||||
SPI1.Mode=SPI_MODE_MASTER
|
SPI1.Mode=SPI_MODE_MASTER
|
||||||
|
SPI1.NSSPMode=SPI_NSS_PULSE_DISABLE
|
||||||
SPI1.VirtualType=VM_MASTER
|
SPI1.VirtualType=VM_MASTER
|
||||||
TIM1.BreakPolarity=TIM_BREAKPOLARITY_LOW
|
TIM1.BreakPolarity=TIM_BREAKPOLARITY_LOW
|
||||||
TIM1.BreakState=TIM_BREAK_DISABLE
|
TIM1.BreakState=TIM_BREAK_DISABLE
|
||||||
|
|||||||
Reference in New Issue
Block a user