Skip to content

Commit d689355

Browse files
tridgetridge
committed
global reformat
1 parent f444fe8 commit d689355

File tree

124 files changed

+14328
-14184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+14328
-14184
lines changed

‎Inc/common.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,26 @@ extern volatile char input_ready;
6767
// }PID;
6868

6969
typedef struct fastPID {
70-
int32_t error;
71-
uint32_t Kp;
72-
uint32_t Ki;
73-
uint32_t Kd;
74-
int32_t integral;
75-
int32_t derivative;
76-
int32_t last_error;
77-
int32_t pid_output;
78-
int32_t integral_limit;
79-
int32_t output_limit;
70+
int32_t error;
71+
uint32_t Kp;
72+
uint32_t Ki;
73+
uint32_t Kd;
74+
int32_t integral;
75+
int32_t derivative;
76+
int32_t last_error;
77+
int32_t pid_output;
78+
int32_t integral_limit;
79+
int32_t output_limit;
8080
} fastPID;
8181

8282
/*
8383
input signal types
8484
*/
8585
enum inputType {
86-
AUTO_IN = 0,
87-
DSHOT_IN = 1,
88-
SERVO_IN = 2,
89-
SERIAL_IN = 3,
90-
EDTARM_IN = 4,
91-
DRONECAN_IN = 5,
86+
AUTO_IN = 0,
87+
DSHOT_IN = 1,
88+
SERVO_IN = 2,
89+
SERIAL_IN = 3,
90+
EDTARM_IN = 4,
91+
DRONECAN_IN = 5,
9292
};

‎Inc/eeprom.h‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,64 +3,64 @@
33
#pragma once
44

55
typedef union EEprom_u {
6+
struct {
7+
uint8_t reserved_0; //0
8+
uint8_t eeprom_version; //1
9+
uint8_t reserved_1; //2
610
struct {
7-
uint8_t reserved_0; //0
8-
uint8_t eeprom_version; //1
9-
uint8_t reserved_1; //2
10-
struct {
11-
uint8_t major; //3
12-
uint8_t minor; //4
13-
} version;
14-
char firmware_name[12]; //5-16
15-
uint8_t dir_reversed; // 17
16-
uint8_t bi_direction; // 18
17-
uint8_t use_sine_start; // 19
18-
uint8_t comp_pwm; // 20
19-
uint8_t variable_pwm; // 21
20-
uint8_t stuck_rotor_protection; // 22
21-
uint8_t advance_level; // 23
22-
uint8_t pwm_frequency; // 24
23-
uint8_t startup_power; // 25
24-
uint8_t motor_kv; // 26
25-
uint8_t motor_poles; // 27
26-
uint8_t brake_on_stop; // 28
27-
uint8_t stall_protection; // 29
28-
uint8_t beep_volume; // 30
29-
uint8_t telemetry_on_interval; // 31
30-
struct {
31-
uint8_t low_threshold; // 32
32-
uint8_t high_threshold; // 33
33-
uint8_t neutral; // 34
34-
uint8_t dead_band; // 35
35-
} servo;
36-
uint8_t low_voltage_cut_off; // 36
37-
uint8_t low_cell_volt_cutoff; // 37
38-
uint8_t rc_car_reverse; // 38
39-
uint8_t use_hall_sensors; // 39
40-
uint8_t sine_mode_changeover_thottle_level; // 40
41-
uint8_t drag_brake_strength; // 41
42-
uint8_t driving_brake_strength; // 42
43-
struct {
44-
uint8_t temperature; // 43
45-
uint8_t current; // 44
46-
} limits;
47-
uint8_t sine_mode_power; // 45
48-
uint8_t input_type; // 46
49-
uint8_t auto_advance; // 47
50-
uint8_t tune[128]; // 48-175
51-
struct {
52-
uint8_t can_node; // 176
53-
uint8_t esc_index; // 177
54-
uint8_t require_arming; // 178
55-
uint8_t telem_rate; // 179
56-
uint8_t require_zero_throttle; // 180
57-
uint8_t filter_hz; // 181
58-
uint8_t debug_rate; // 182
59-
uint8_t term_enable; // 183
60-
uint8_t reserved[8]; // 184-191
61-
} can;
62-
};
63-
uint8_t buffer[192];
11+
uint8_t major; //3
12+
uint8_t minor; //4
13+
} version;
14+
char firmware_name[12]; //5-16
15+
uint8_t dir_reversed; // 17
16+
uint8_t bi_direction; // 18
17+
uint8_t use_sine_start; // 19
18+
uint8_t comp_pwm; // 20
19+
uint8_t variable_pwm; // 21
20+
uint8_t stuck_rotor_protection; // 22
21+
uint8_t advance_level; // 23
22+
uint8_t pwm_frequency; // 24
23+
uint8_t startup_power; // 25
24+
uint8_t motor_kv; // 26
25+
uint8_t motor_poles; // 27
26+
uint8_t brake_on_stop; // 28
27+
uint8_t stall_protection; // 29
28+
uint8_t beep_volume; // 30
29+
uint8_t telemetry_on_interval; // 31
30+
struct {
31+
uint8_t low_threshold; // 32
32+
uint8_t high_threshold; // 33
33+
uint8_t neutral; // 34
34+
uint8_t dead_band; // 35
35+
} servo;
36+
uint8_t low_voltage_cut_off; // 36
37+
uint8_t low_cell_volt_cutoff; // 37
38+
uint8_t rc_car_reverse; // 38
39+
uint8_t use_hall_sensors; // 39
40+
uint8_t sine_mode_changeover_thottle_level; // 40
41+
uint8_t drag_brake_strength; // 41
42+
uint8_t driving_brake_strength; // 42
43+
struct {
44+
uint8_t temperature; // 43
45+
uint8_t current; // 44
46+
} limits;
47+
uint8_t sine_mode_power; // 45
48+
uint8_t input_type; // 46
49+
uint8_t auto_advance; // 47
50+
uint8_t tune[128]; // 48-175
51+
struct {
52+
uint8_t can_node; // 176
53+
uint8_t esc_index; // 177
54+
uint8_t require_arming; // 178
55+
uint8_t telem_rate; // 179
56+
uint8_t require_zero_throttle; // 180
57+
uint8_t filter_hz; // 181
58+
uint8_t debug_rate; // 182
59+
uint8_t term_enable; // 183
60+
uint8_t reserved[8]; // 184-191
61+
} can;
62+
};
63+
uint8_t buffer[192];
6464
} EEprom_t;
6565

6666
extern EEprom_t eepromBuffer;

‎Inc/functions.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ void delayMillis(uint32_t millis);
1717
long map(long x, long in_min, long in_max, long out_min, long out_max);
1818
#ifdef ARTERY
1919
void gpio_mode_QUICK(gpio_type* gpio_periph, uint32_t mode,
20-
uint32_t pull_up_down, uint32_t pin);
20+
uint32_t pull_up_down, uint32_t pin);
2121
void gpio_mode_set(gpio_type* gpio_periph, uint32_t mode, uint32_t pull_up_down,
22-
uint32_t pin);
22+
uint32_t pin);
2323
#endif
2424
#endif /* FUNCTIONS_H_ */

‎Inc/kiss_telemetry.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55

66
typedef struct __attribute__((packed))
77
{
8-
uint8_t temperature; // temperature in Celcius
9-
uint8_t voltage_h; // voltage in centivolts
10-
uint8_t voltage_l;
11-
uint8_t current_h; // current in centiamps
12-
uint8_t current_l;
13-
uint8_t consumption_h; // accumulated current consumption in mAH
14-
uint8_t consumption_l;
15-
uint8_t erpm_h; // eRPM * 100, so 1 in the packet means 100 eRPM
16-
uint8_t erpm_l;
17-
uint8_t crc;
8+
uint8_t temperature; // temperature in Celcius
9+
uint8_t voltage_h; // voltage in centivolts
10+
uint8_t voltage_l;
11+
uint8_t current_h; // current in centiamps
12+
uint8_t current_l;
13+
uint8_t consumption_h; // accumulated current consumption in mAH
14+
uint8_t consumption_l;
15+
uint8_t erpm_h; // eRPM * 100, so 1 in the packet means 100 eRPM
16+
uint8_t erpm_l;
17+
uint8_t crc;
1818
}
1919
kiss_telem_pkt_t; // sizeof(kiss_telem_pkt_t) = 10
2020

‎Inc/signal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ extern char crawler_mode;
1818
extern uint16_t ADC_raw_volts;
1919
extern uint16_t servo_low_threshold; // anything below this point considered 0
2020
extern uint16_t
21-
servo_high_threshold; // anything above this point considered 2000 (max)
21+
servo_high_threshold; // anything above this point considered 2000 (max)
2222
extern uint16_t servo_neutral;
2323
extern uint8_t servo_dead_band;
2424
extern char inputSet;

‎Inc/targets.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,7 +1753,7 @@
17531753
#define MILLIVOLT_PER_AMP 16
17541754
#endif
17551755

1756-
#ifdef YYRC_F60MINI_F051
1756+
#ifdef YYRC_F60MINI_F051
17571757
#define FILE_NAME "YYRC_F60MINI_F051"
17581758
#define FIRMWARE_NAME "YYRC_F60MINI"
17591759
#define DEAD_TIME 20
@@ -2700,12 +2700,12 @@
27002700

27012701
#endif
27022702

2703-
#ifdef HARDWARE_GROUP_F0_045
2703+
#ifdef HARDWARE_GROUP_F0_045
27042704
#define PHASE_A_COMP COMP_PA0 // pa0
27052705
#define PHASE_B_COMP COMP_PA4 // pa4
27062706
#define PHASE_C_COMP COMP_PA5 // pa5
27072707
#endif
2708-
#ifdef HARDWARE_GROUP_F0_504
2708+
#ifdef HARDWARE_GROUP_F0_504
27092709
#define PHASE_A_COMP COMP_PA5 // pa5
27102710
#define PHASE_B_COMP COMP_PA0 // pa0
27112711
#define PHASE_C_COMP COMP_PA4 // pa4
@@ -2725,7 +2725,7 @@
27252725
#define PHASE_B_COMP COMP_PA0 // pa0
27262726
#define PHASE_C_COMP COMP_PA5 // pa5
27272727
#endif
2728-
#ifdef HARDWARE_GROUP_F0_540
2728+
#ifdef HARDWARE_GROUP_F0_540
27292729
#define PHASE_A_COMP COMP_PA5 // pa5
27302730
#define PHASE_B_COMP COMP_PA4 // pa4
27312731
#define PHASE_C_COMP COMP_PA0 // pa0
@@ -4391,7 +4391,7 @@
43914391
#define INTERVAL_TIMER TIM4
43924392
#define TEN_KHZ_TIMER SysTick
43934393
#define UTILITY_TIMER TIM4
4394-
#define COM_TIMER TIM3
4394+
#define COM_TIMER TIM3
43954395
#define TIM1_AUTORELOAD 1999
43964396
#define APPLICATION_ADDRESS 0x08001000
43974397

@@ -4401,10 +4401,10 @@
44014401
#define COM_TIMER_IRQ TIM3_IRQn
44024402

44034403
#ifndef USE_PA2_AS_COMP
4404-
#define COMPARATOR_IRQ EXTI3_IRQn
4405-
#define COMPARATOR_IRQ_2 EXTI4_IRQn
4404+
#define COMPARATOR_IRQ EXTI3_IRQn
4405+
#define COMPARATOR_IRQ_2 EXTI4_IRQn
44064406
#else
4407-
#define COMPARATOR_IRQ EXTI2_IRQn
4407+
#define COMPARATOR_IRQ EXTI2_IRQn
44084408
#endif
44094409

44104410
#endif

‎Mcu/e230/Inc/IO.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ extern uint8_t degrees_celsius;
3333
extern uint16_t ADC_raw_volts;
3434
extern uint16_t servo_low_threshold; // anything below this point considered 0
3535
extern uint16_t
36-
servo_high_threshold; // anything above this point considered 2000 (max)
36+
servo_high_threshold; // anything above this point considered 2000 (max)
3737
extern uint16_t servo_neutral;
3838
extern uint8_t servo_dead_band;

0 commit comments

Comments
 (0)