Skip to content
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

Jump to bottom

whitespace and formatting #114

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

whitespace and formatting #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
15eed95
1st run of style tool, preview for developers
frank26080115 Jul 29, 2023
7cfcab6
targets.h whitespace neat
frank26080115 Jul 30, 2023
6ae376c
ran style tool on MCU dir, only some files
frank26080115 Jul 30, 2023
6b62903
fixed all the include-guards
frank26080115 Jul 30, 2023
3bca0f9
ran style on the rest of mcu dir
frank26080115 Aug 1, 2023
a0cb56b
a few more manual whitespace changes
frank26080115 Aug 1, 2023
823ca51
removed astyle files
frank26080115 Aug 1, 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
48 changes: 23 additions & 25 deletions Inc/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ extern char play_tone_flag;
extern uint32_t current_GPIO_PIN;
extern GPIO_TypeDef* current_GPIO_PORT;
#ifndef MCU_F031
extern COMP_TypeDef* active_COMP;
extern COMP_TypeDef* active_COMP;
#endif
extern uint32_t current_EXTI_LINE;
extern char dshot_extended_telemetry;
Expand All @@ -30,29 +30,27 @@ extern char use_sin_start;
extern char brake_on_stop;
extern char RC_CAR_REVERSE;
//typedef struct PID{
// float error;
// float Kp;
// float Ki;
// float Kd;
// float integral;
// float derivative;
// float last_error;
// float pid_output;
// int16_t integral_limit;
// int16_t output_limit;
// float error;
// float Kp;
// float Ki;
// float Kd;
// float integral;
// float derivative;
// float last_error;
// float pid_output;
// int16_t integral_limit;
// int16_t output_limit;
//}PID;

typedef struct fastPID{
int32_t error;
uint32_t Kp;
uint32_t Ki;
uint32_t Kd;
int32_t integral;
int32_t derivative;
int32_t last_error;
int32_t pid_output;
int32_t integral_limit;
int32_t output_limit;
}fastPID;


typedef struct fastPID {
int32_t error;
uint32_t Kp;
uint32_t Ki;
uint32_t Kd;
int32_t integral;
int32_t derivative;
int32_t last_error;
int32_t pid_output;
int32_t integral_limit;
int32_t output_limit;
} fastPID;
1 change: 0 additions & 1 deletion Inc/crsf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

#include "main.h"


void setChannels();

#endif /* CRSF_H_ */
8 changes: 1 addition & 7 deletions Inc/dshot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,14 @@
* Author: Alka
*/

#include "main.h"

#ifndef INC_DSHOT_H_
#define INC_DSHOT_H_




#include "main.h"

void computeDshotDMA(void);
void make_dshot_package();


extern char EDT_ARM_ENABLE;
extern char EDT_ARMED;
extern void saveEEpromSettings(void);
Expand All @@ -32,5 +27,4 @@ extern uint16_t commutation_interval;

//int e_com_time;


#endif /* INC_DSHOT_H_ */
7 changes: 2 additions & 5 deletions Inc/functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@
#ifndef FUNCTIONS_H_
#define FUNCTIONS_H_



#endif /* FUNCTIONS_H_ */

#include "main.h"


int getAbsDif(int number1, int number2);
void delayMicros(uint32_t micros);
void delayMillis(uint32_t millis);
long map(long x, long in_min, long in_max, long out_min, long out_max);

#endif /* FUNCTIONS_H_ */
2 changes: 1 addition & 1 deletion Inc/phaseouts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "main.h"

void allOff();
void comStep (int newStep);
void comStep(int newStep);
void fullBrake();
void allpwm();
void proportionalBrake();
Expand Down
7 changes: 5 additions & 2 deletions Inc/signal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* IO.h
* signal.h
*
* Created on: Sep. 26, 2020
* Author: Alka
*/

#ifndef INC_SIGNAL_H_
#define INC_SIGNAL_H_

#include "main.h"

extern char out_put;
Expand All @@ -22,4 +25,4 @@ extern uint16_t servo_high_threshold; // anything above this point considered 2
extern uint16_t servo_neutral;
extern uint8_t servo_dead_band;


#endif /* INC_SIGNAL_H_ */
7 changes: 0 additions & 7 deletions Inc/sounds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,4 @@ void setVolume(uint8_t volume);

extern void delayMillis();




#endif /* SOUNDS_H_ */




Loading