Skip to content

GCC build #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fromeijn wants to merge 5 commits into
base: main
Choose a base branch
from
Open

GCC build #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46c875c
able to build with gcc
fromeijn Oct 31, 2023
98fac8e
fix build warnings
fromeijn Oct 31, 2023
48a464d
make flash
fromeijn Oct 31, 2023
0531b9f
fix encoding problem
fromeijn Oct 31, 2023
ab7a0af
Merge branch 'main' into surfdado-gcc-build
fromeijn Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
LCM/Project/MDK5/Objects/
LCM/Project/MDK5/LCM_Light_Control_IO_WS2812_New.uvguix.*
LCM/Project/MDK5/Listings/
LCM/Build/
89 changes: 44 additions & 45 deletions LCM/Code/App/task.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

/**************************************************
* @brie :KEY1_Task()
* @note :KEY1����
* @param :��
* @retval :��
* @note :KEY1任务
* @param :无
* @retval :无
**************************************************/
void KEY1_Task(void)
{
if(KEY1_State == 0)// || Power_Flag == 3) //��������簴����������
if(KEY1_State == 0)// || Power_Flag == 3) //充电器供电按键不起作用
{
return;
}
Expand Down Expand Up @@ -84,7 +84,6 @@ static void WS2812_Power_Display(uint8_t brightness)
**************************************************/
static void WS2812_VESC(void)
{
uint8_t i;
uint8_t pos, red;
uint8_t green = 0;
uint8_t blue = WS2812_Measure;
Expand Down Expand Up @@ -163,7 +162,7 @@ static void WS2812_VESC(void)
void WS2812_Boot(void)
{
uint8_t i;
uint8_t num = floor(Power_Time / 100) + 1;
uint8_t num = floorf(Power_Time / 100) + 1;
// Rainbow: uint8_t rgbMap[10][3] = {{255,0,0}, {255,127,0}, {255,255,0}, {127,255,0}, {0,255,0}, {0,255,127}, {0,255,255}, {0,127,255}, {0,0,255}, {127,0,255}};
// Red, White, Blue:
uint8_t rgbMap[10][3] = {{255,0,0}, {255,0,0}, {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {0,0,255}, {0,0,255}, {0,0,255}};
Expand Down Expand Up @@ -287,9 +286,9 @@ static void WS2812_Handtest(void)

/**************************************************
* @brie :WS2812_Task()
* @note :WS2812����
* @param :��
* @retval :��
* @note :WS2812任务
* @param :无
* @retval :无
**************************************************/
void WS2812_Task(void)
{
Expand Down Expand Up @@ -344,15 +343,15 @@ void WS2812_Task(void)
}
else switch(Gear_Position)
{
case 1: //1��
case 1: //1挡
WS2812_Measure = WS2812_1_BRIGHTNESS;
break;

case 2: //2��
case 2: //2挡
WS2812_Measure = WS2812_2_BRIGHTNESS;
break;

case 3: //3��
case 3: //3挡
WS2812_Measure = WS2812_3_BRIGHTNESS;
break;

Expand Down Expand Up @@ -433,9 +432,9 @@ void Power_Task(void)

/**************************************************
* @brie :Charge_Task()
* @note :�������
* @param :��
* @retval :��
* @note :充电任务
* @param :无
* @retval :无
**************************************************/
void Charge_Task(void)
{
Expand All @@ -454,14 +453,14 @@ void Charge_Task(void)
break;

case 1:
if(Charge_Time > 1000) //��ʱ1S
if(Charge_Time > 1000) //延时1S
{
charge_step = 2;
}
break;

case 2:
CHARGE_ON; //�򿪳����
CHARGE_ON; //打开充电器
Charge_Flag = 2;
charge_step = 3;
break;
Expand All @@ -476,7 +475,7 @@ void Charge_Task(void)
{
V_I = 1;
Charge_Time = 0;
LED1_ON; //�ɼ�����ѹ
LED1_ON; //采集充电电压
charge_step = 5;
}
break;
Expand All @@ -486,7 +485,7 @@ void Charge_Task(void)
{
V_I = 0;
Charge_Time = 0;
LED1_OFF; //�ɼ������
LED1_OFF; //采集充电流
charge_step = 4;
}
break;
Expand Down Expand Up @@ -558,25 +557,25 @@ void Headlights_Task(void)

/**************************************************
* @brie :Buzzer_Task()
* @note :����������
* @param :��
* @retval :��
* @note :蜂鸣器任务
* @param :无
* @retval :无
**************************************************/
void Buzzer_Task(void)
{
static uint8_t buzzer_step = 0;
static uint8_t gear_position_last = 0; //��һ�εĵ�λ
static uint8_t gear_position_last = 0; //上一次的档位
static uint8_t ring_frequency = 0;
static uint16_t sound_frequency = 0;

if(Power_Flag != 2 || Buzzer_Flag == 1) //VESC�ϵ��������ر�
if(Power_Flag != 2 || Buzzer_Flag == 1) //VESC断电或蜂鸣器关闭
{
BUZZER_OFF;
buzzer_step = 0;
return;
}

if(Buzzer_Frequency == 0 && gear_position_last == Gear_Position) //���������Ƶ��Ϊ0����һ�εĵ�λ������εĵ�λ
if(Buzzer_Frequency == 0 && gear_position_last == Gear_Position) //蜂鸣器响的频率为0或上一次的档位等于这次的档位
{
BUZZER_OFF;
buzzer_step = 0;
Expand Down Expand Up @@ -647,9 +646,9 @@ void Buzzer_Task(void)

/**************************************************
* @brie :Usart_Task()
* @note :��������
* @param :��
* @retval :��
* @note :串口任务
* @param :无
* @retval :无
**************************************************/
void Usart_Task(void)
{
Expand Down Expand Up @@ -701,16 +700,16 @@ void Usart_Task(void)
VESC_RX_Flag = 0;
result = Protocol_Parse(VESC_RX_Buff);

if(result == 0) //�����ɹ�
if(result == 0) //解析成功
{
//LED1_Filp_Time(500);
Usart_Flag = 1;
// Battery_Voltage = data.inpVoltage; //��ص�ѹ
// VESC_Rpm = data.rpm; //ת��
// AvgInputCurrent = data.avgInputCurrent; //ĸ�ߵ���
// DutyCycleNow = data.dutyCycleNow; //ռ�ձ�
// Battery_Voltage = data.inpVoltage; //电池电压
// VESC_Rpm = data.rpm; //转速
// AvgInputCurrent = data.avgInputCurrent; //母线电流
// DutyCycleNow = data.dutyCycleNow; //占空比
}
else //����ʧ��
else //解析失败
{
//LED1_Filp_Time(100);
Usart_Flag = 2;
Expand Down Expand Up @@ -753,9 +752,9 @@ void Usart_Task(void)
//float k = 0.15;
/**************************************************
* @brie :ADC_Task()
* @note :ADC����
* @param :��
* @retval :��
* @note :ADC任务
* @param :无
* @retval :无
**************************************************/
void ADC_Task(void)
{
Expand Down Expand Up @@ -802,7 +801,7 @@ void ADC_Task(void)
// V_I = 0;
// Charge_Time = 0;
// Sampling_Completion = 0;
// LED1_OFF; //�ɼ������
// LED1_OFF; //采集充电流
// Charge_Voltage = (float)(adc_charge_sum_ave*0.0257080078125);
//
// }
Expand All @@ -815,7 +814,7 @@ void ADC_Task(void)
//
// if(i == 10)
// {
// LED1_ON; //�ɼ����ѹ
// LED1_ON; //采集充电压
// Charge_Time = 0;
// Sampling_Completion = 1;
// V_I = 1;
Expand Down Expand Up @@ -925,9 +924,9 @@ void CheckPowerLevel(float battery_voltage)

/**************************************************
* @brie :Conditional_Judgment()
* @note :�����ж�
* @param :��
* @retval :��
* @note :条件判断
* @param :无
* @retval :无
**************************************************/
void Conditional_Judgment(void)
{
Expand Down Expand Up @@ -1044,8 +1043,8 @@ void Conditional_Judgment(void)
Charger_Detection_1ms = 0;
}
/*
��̤����»�ת�ٴ���1000��ʱ����
�����Ƚ�̤��ת�ٵ���1000��ʼ��ʱ�������ػ�ʱ��ػ�
脚踏板踩下或转速大于1000定时清零
即不踩脚踏板转速低于1000开始计时，超过关机时间关机
*/
if(ADC1_Val > 2.0 || ADC2_Val > 2.0 || data.rpm > 1000)
{
Expand Down Expand Up @@ -1084,7 +1083,7 @@ void Conditional_Judgment(void)
{
// Charge_Flag = 3;
Shutdown_Cnt = 0;
CHARGE_OFF; //�رճ����
CHARGE_OFF; //关闭充电器
}
}
else
Expand Down
Loading