chris/Sliders_McGee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixed terminal.

Browse Source 
Increased max PWM to 5%.
This commit is contained in:
Chris Trimble 2024-07-12 09:28:52 -05:00
parent 9482e63d3e
commit ab5aff3282
3 changed files with 3729 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/Inc/version.h
View File

@ -3,7 +3,7 @@
#define _VERSION_H #define _VERSION_H
#define VERSION_MAJOR (1) #define VERSION_MAJOR (1)
#define VERSION_MINOR (0) #define VERSION_MINOR (0)
#define VERSION_PATCH (1) #define VERSION_PATCH (2)
#define VERSION_STR "V1.0.1" #define VERSION_STR "V1.0.2"
#endif #endif

17
Core/Src/main.c
View File

@ -138,6 +138,10 @@ int main(void)
MX_USART1_UART_Init(); MX_USART1_UART_Init();
MX_USB_Device_Init(); MX_USB_Device_Init();
/* USER CODE BEGIN 2 */ /* USER CODE BEGIN 2 */
// int len = snprintf(buf, 128, "Version: %s\r\n", VERSION_STR);
// CDC_Transmit_FS((uint8_t *)buf, len);
// Initialize EMA filters // Initialize EMA filters
for (uint32_t i = 0; i < NUM_SLIDERS; i++) for (uint32_t i = 0; i < NUM_SLIDERS; i++)
{ {
@ -202,10 +206,7 @@ int main(void)
{ {
prev_uart_tick = HAL_GetTick(); prev_uart_tick = HAL_GetTick();
int len = snprintf(buf, 128, "Version: %s\r\n", VERSION_STR); int len = snprintf(buf, 128, "Master\tCh1\tCh2\tCh3\tCh4\t\r\n");
CDC_Transmit_FS((uint8_t *)buf, len);
len = snprintf(buf, 128, "Master\tCh1\tCh2\tCh3\tCh4\t\r\n");
CDC_Transmit_FS((uint8_t *)buf, len); CDC_Transmit_FS((uint8_t *)buf, len);
len = snprintf(buf, 128, "%03.1f\t%03.1f\t%03.1f\t%03.1f\t%03.1f\t\r\n", len = snprintf(buf, 128, "%03.1f\t%03.1f\t%03.1f\t%03.1f\t%03.1f\t\r\n",
@ -328,10 +329,10 @@ void filter_adc2(void)
*/ */
void set_pwm_outputs(void) void set_pwm_outputs(void)
{ {
float ch1 = map_clamp(m_sliders[1], 0.0f, 100.0f, 0, MAX_PWM_VALUE * 0.02f); float ch1 = map_clamp(m_sliders[1], 0.0f, 100.0f, 0, (MAX_PWM_VALUE * 0.05f));
float ch2 = map_clamp(m_sliders[2], 0.0f, 100.0f, 0, MAX_PWM_VALUE * 0.02f); float ch2 = map_clamp(m_sliders[2], 0.0f, 100.0f, 0, (MAX_PWM_VALUE * 0.05f));
float ch3 = map_clamp(m_sliders[3], 0.0f, 100.0f, 0, MAX_PWM_VALUE * 0.02f); float ch3 = map_clamp(m_sliders[3], 0.0f, 100.0f, 0, (MAX_PWM_VALUE * 0.05f));
float ch4 = map_clamp(m_sliders[4], 0.0f, 100.0f, 0, MAX_PWM_VALUE * 0.02f); float ch4 = map_clamp(m_sliders[4], 0.0f, 100.0f, 0, (MAX_PWM_VALUE * 0.05f));
htim1.Instance->CCR1 = (uint32_t)(ch1); htim1.Instance->CCR1 = (uint32_t)(ch1);
htim1.Instance->CCR2 = (uint32_t)(ch2); htim1.Instance->CCR2 = (uint32_t)(ch2);

3718
Releases/FW_1-0-2.hex Normal file
View File

File diff suppressed because it is too large Load Diff