Quellcode durchsuchen

Fixed formatting for checksum

Garth Seale vor 3 Jahren
Ursprung
Commit
f141c0150b
4 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
  1. 1 1
      APP/maincpp.cpp
  2. 2 2
      Core/Src/Backup/tim.c.bak
  3. 1 1
      Core/Src/tim.c
  4. 1 1
      STM32F030_2CH_PULSEGEN.ioc

+ 1 - 1
APP/maincpp.cpp

@@ -151,7 +151,7 @@ uint8_t txdata(uint8_t * data) {
 	char s[64];
 	sprintf(s, "$FUNGEN,%u,%lu,%u,%lu", port1freq.portStat, port1freq.freq, port2freq.portStat, port2freq.freq);
 	char ch[6];
-	sprintf(ch,"*%x\r\n", chsum((uint8_t*)s));
+	sprintf(ch,"*%02x\r\n", chsum((uint8_t*)s));
 	strcat(s, ch);
 //	data[DATASIZE]	= STREAMLENTH;
 //	data[PORT1STAT]	= port1freq.portStat;

+ 2 - 2
Core/Src/Backup/tim.c.bak

@@ -70,7 +70,7 @@ void MX_TIM1_Init(void)
     Error_Handler();
   }
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 1800;
+  sConfigOC.Pulse = 0;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCNPolarity = TIM_OCNPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
@@ -138,7 +138,7 @@ void MX_TIM3_Init(void)
     Error_Handler();
   }
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 1800;
+  sConfigOC.Pulse = 0;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
   if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_4) != HAL_OK)

+ 1 - 1
Core/Src/tim.c

@@ -117,7 +117,7 @@ void MX_TIM3_Init(void)
   htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
   htim3.Init.Period = 3600;
   htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
-  htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE;
+  htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
   if (HAL_TIM_Base_Init(&htim3) != HAL_OK)
   {
     Error_Handler();

+ 1 - 1
STM32F030_2CH_PULSEGEN.ioc

@@ -140,7 +140,7 @@ TIM1.OCFastMode_PWM-PWM\ Generation1\ CH1=TIM_OCFAST_ENABLE
 TIM1.Period=3600
 TIM1.Prescaler=100-1
 TIM1.Pulse-PWM\ Generation1\ CH1=0
-TIM3.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE
+TIM3.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_DISABLE
 TIM3.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4
 TIM3.IPParameters=Channel-PWM Generation4 CH4,OCPolarity_4,Prescaler,Period,OCFastMode_PWM-PWM Generation4 CH4,Pulse-PWM Generation4 CH4,AutoReloadPreload
 TIM3.OCFastMode_PWM-PWM\ Generation4\ CH4=TIM_OCFAST_ENABLE