diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 205f9d6..131c940 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Core/Src/tim.c b/Core/Src/tim.c
index 9a2c1df..4afdeb7 100644
--- a/Core/Src/tim.c
+++ b/Core/Src/tim.c
@@ -86,9 +86,9 @@ void MX_TIM2_Init(void)
/* USER CODE END TIM2_Init 1 */
htim2.Instance = TIM2;
- htim2.Init.Prescaler = 0;
+ htim2.Init.Prescaler = 143;
htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
- htim2.Init.Period = 4294967295;
+ htim2.Init.Period = 1000;
htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE;
if (HAL_TIM_PWM_Init(&htim2) != HAL_OK)
diff --git a/graphite_digester_io_board_v2.ioc b/graphite_digester_io_board_v2.ioc
index e414b1e..6408a4d 100644
--- a/graphite_digester_io_board_v2.ioc
+++ b/graphite_digester_io_board_v2.ioc
@@ -223,7 +223,7 @@ 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_DMA_Init-DMA-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_TIM3_Init-TIM3-false-HAL-true,6-MX_CRC_Init-CRC-false-HAL-true,7-MX_RNG_Init-RNG-false-HAL-true,8-MX_TIM7_Init-TIM7-false-HAL-true,9-MX_TIM6_Init-TIM6-false-HAL-true,10-MX_TIM1_Init-TIM1-false-HAL-true,11-MX_CAN1_Init-CAN1-false-HAL-true,12-MX_USART3_UART_Init-USART3-false-HAL-true,13-MX_ADC1_Init-ADC1-false-HAL-true
+ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_TIM3_Init-TIM3-false-HAL-true,6-MX_CRC_Init-CRC-false-HAL-true,7-MX_RNG_Init-RNG-false-HAL-true,8-MX_TIM7_Init-TIM7-false-HAL-true,9-MX_TIM6_Init-TIM6-false-HAL-true,10-MX_TIM1_Init-TIM1-false-HAL-true,11-MX_CAN1_Init-CAN1-false-HAL-true,12-MX_USART3_UART_Init-USART3-false-HAL-true,13-MX_ADC1_Init-ADC1-false-HAL-true,14-MX_TIM2_Init-TIM2-false-HAL-true
RCC.48MHZClocksFreq_Value=48000000
RCC.AHBFreq_Value=144000000
RCC.APB1CLKDivider=RCC_HCLK_DIV4
@@ -281,7 +281,9 @@ TIM1.Period=9999
TIM1.Prescaler=143
TIM2.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE
TIM2.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2
-TIM2.IPParameters=Channel-PWM Generation2 CH2,AutoReloadPreload
+TIM2.IPParameters=Channel-PWM Generation2 CH2,AutoReloadPreload,Period,Prescaler
+TIM2.Period=1000
+TIM2.Prescaler=143
TIM3.IPParameters=Prescaler,Period
TIM3.Period=9999
TIM3.Prescaler=71
@@ -313,4 +315,4 @@ VP_TIM7_VS_ClockSourceINT.Mode=Enable_Timer
VP_TIM7_VS_ClockSourceINT.Signal=TIM7_VS_ClockSourceINT
board=custom
rtos.0.ip=FREERTOS
-isbadioc=false
+isbadioc=true
diff --git a/sdk b/sdk
index 187b88d..eea27fc 160000
--- a/sdk
+++ b/sdk
@@ -1 +1 @@
-Subproject commit 187b88da24aed4d0c06bb06e3158b01c2612b57d
+Subproject commit eea27fc3eedd546c7aed47b9dcf0e9b2d9ed6fb2
diff --git a/usrc/main.cpp b/usrc/main.cpp
index 5bbd076..94d681f 100644
--- a/usrc/main.cpp
+++ b/usrc/main.cpp
@@ -53,9 +53,9 @@ static int32_t getDeviceId() {
*******************************************************************************/
class PWMCtrler : public ZIPWMCtrl {
ZPWMGenerator pwm;
- int32_t m_freq = 50000;
- int32_t m_duty = 50;
- int32_t m_state;
+ int32_t m_freq = 50000;
+ int32_t m_duty = 30;
+ int32_t m_state = 0;
public:
void initialize() {
@@ -106,9 +106,11 @@ PWMCtrler pwmCtrler;
void nvs_init_cb() {}
static void initsubmodule() {
- osDelay(1000);
- { pwmCtrler.initialize(); }
- {}
+ // osDelay(1000);
+ {
+ pwmCtrler.initialize();
+ pwmCtrler.pwm_set_state(0);
+ }
}
/*******************************************************************************
* MAIN *
@@ -162,9 +164,10 @@ void umain() {
},
.pwmctrl =
{
- &pwmCtrler,
+ // &pwmCtrler,
},
};
+
initer.init(&cfg);
initsubmodule();
initer.loop();