From: fdila <federicadilauro1998@gmail.com>
Date: Tue, 14 Apr 2020 12:43:16 +0000 (+0200)
Subject: fix style
X-Git-Url: http://git.leonardobizzoni.com/?a=commitdiff_plain;h=dad6c4766036dab490df8309cc425c090d319b6e;p=pioneer-stm32

fix style
---

diff --git a/otto_controller/.settings/language.settings.xml b/otto_controller/.settings/language.settings.xml
index c07f012..b57f601 100644
--- a/otto_controller/.settings/language.settings.xml
+++ b/otto_controller/.settings/language.settings.xml
@@ -6,7 +6,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1052066115134395671" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-977709318318761742" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -18,7 +18,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1052066115134395671" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-977709318318761742" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/otto_controller/Core/Inc/control/encoder.h b/otto_controller/Core/Inc/control/encoder.h
index 50004a6..8a262de 100644
--- a/otto_controller/Core/Inc/control/encoder.h
+++ b/otto_controller/Core/Inc/control/encoder.h
@@ -4,7 +4,7 @@
 #include "main.h"
 
 class Encoder {
- public:
+ private:
   TIM_HandleTypeDef *timer_;
   uint32_t previous_millis_;
   uint32_t current_millis_;
@@ -12,6 +12,7 @@ class Encoder {
   float wheel_circumference_;
   int ticks_per_revolution_;
 
+ public:
   Encoder() {
     timer_ = NULL;
     wheel_circumference_ = 0;
diff --git a/otto_controller/Core/Inc/control/motor_controller.h b/otto_controller/Core/Inc/control/motor_controller.h
index 19d283b..dd87ba8 100644
--- a/otto_controller/Core/Inc/control/motor_controller.h
+++ b/otto_controller/Core/Inc/control/motor_controller.h
@@ -4,7 +4,7 @@
 #include "main.h"
 
 class MotorController {
- public:
+ private:
   GPIO_TypeDef *sleep_gpio_port_;
   uint16_t sleep_pin_;
   GPIO_TypeDef *dir_gpio_port_;
@@ -13,6 +13,7 @@ class MotorController {
   uint32_t pwm_channel_;
   int32_t max_dutycycle_;
 
+ public:
   MotorController(GPIO_TypeDef *sleep_gpio_port, uint16_t sleep_pin,
                   GPIO_TypeDef *dir_gpio_port, uint16_t dir_pin,
                   TIM_HandleTypeDef *pwm_timer, uint32_t pwm_channel) {
@@ -25,12 +26,12 @@ class MotorController {
     this->max_dutycycle_ = 0;
   }
 
-  void setup() {
+  void Setup() {
     HAL_TIM_PWM_Start(pwm_timer_, pwm_channel_);
     this->max_dutycycle_ = pwm_timer_->Instance->ARR;
   }
 
-  void set_speed(int duty_cycle) {
+  void SetSpeed(int duty_cycle) {
     if (duty_cycle >= 0) {
       //set direction to forward
       HAL_GPIO_WritePin(dir_gpio_port_, dir_pin_, GPIO_PIN_SET);
@@ -57,12 +58,12 @@ class MotorController {
 
   }
 
-  void brake() {
+  void Brake() {
     HAL_GPIO_WritePin(sleep_gpio_port_, sleep_pin_, GPIO_PIN_SET);
     __HAL_TIM_SET_COMPARE(pwm_timer_, pwm_channel_, 0);
   }
 
-  void coast() {
+  void Coast() {
     HAL_GPIO_WritePin(sleep_gpio_port_, sleep_pin_, GPIO_PIN_RESET);
   }
 };
diff --git a/otto_controller/Core/Inc/control/pid.h b/otto_controller/Core/Inc/control/pid.h
index ee067fe..a47c0e7 100644
--- a/otto_controller/Core/Inc/control/pid.h
+++ b/otto_controller/Core/Inc/control/pid.h
@@ -2,7 +2,7 @@
 #define PID_H
 
 class Pid {
- public:
+ private:
   //PID constants
   float kp_;
   float ki_;
@@ -20,6 +20,7 @@ class Pid {
   int min_;
   int max_;
 
+ public:
   Pid(float kp, float ki, float kd, int min, int max) {
     this->kp_ = kp;
     this->ki_ = ki;
@@ -36,7 +37,7 @@ class Pid {
 
   }
 
-  void config(float kp, float ki, float kd, int min, int max) {
+  void Config(float kp, float ki, float kd, int min, int max) {
     this->kp_ = kp;
     this->ki_ = ki;
     this->kd_ = kd;
@@ -52,11 +53,11 @@ class Pid {
 
   }
 
-  void set(float setpoint) {
+  void Set(float setpoint) {
     this->setpoint_ = setpoint;
   }
 
-  int update(float measure) {
+  int Update(float measure) {
 
     this->error_ = this->setpoint_ - measure;
 
diff --git a/utils/pid_tuning/otto_pid_tuning/.settings/language.settings.xml b/utils/pid_tuning/otto_pid_tuning/.settings/language.settings.xml
index c67809c..b57f601 100644
--- a/utils/pid_tuning/otto_pid_tuning/.settings/language.settings.xml
+++ b/utils/pid_tuning/otto_pid_tuning/.settings/language.settings.xml
@@ -6,7 +6,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1436046405535356377" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-977709318318761742" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -18,7 +18,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1436046405535356377" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-977709318318761742" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>