me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #231

Browse Source
This commit is contained in:
Ben V. Brown
2018-03-23 13:14:59 +11:00
parent 37d5cf1e70
commit 03b2bede4d
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workspace/TS100/src/Setup.c
View File

@@ -236,7 +236,7 @@ static void MX_TIM2_Init(void) {
htim2.Instance = TIM2; htim2.Instance = TIM2;
htim2.Init.Prescaler = 2000; // pwm out is 10k, we want to run our PWM at around 100hz htim2.Init.Prescaler = 2000; // pwm out is 10k, we want to run our PWM at around 100hz
htim2.Init.CounterMode = TIM_COUNTERMODE_UP; htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
htim2.Init.Period = 120; htim2.Init.Period = 122;
htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4; //4mhz before divide htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4; //4mhz before divide
htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE; htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
HAL_TIM_Base_Init(&htim2); HAL_TIM_Base_Init(&htim2);

13
workspace/TS100/src/gui.cpp
View File

@@ -387,6 +387,19 @@ static void settings_displayScrollSpeed(void) {
static void settings_setDisplayRotation(void) { static void settings_setDisplayRotation(void) {
systemSettings.OrientationMode++; systemSettings.OrientationMode++;
systemSettings.OrientationMode = systemSettings.OrientationMode % 3; systemSettings.OrientationMode = systemSettings.OrientationMode % 3;
switch (systemSettings.OrientationMode) {
case 0:
lcd.setRotation(false);
break;
case 1:
lcd.setRotation(true);
break;
case 2:
//do nothing on auto
break;
default:
break;
}
} }
static void settings_displayDisplayRotation(void) { static void settings_displayDisplayRotation(void) {

10
workspace/TS100/src/main.cpp
View File

@@ -57,10 +57,8 @@ int main(void) {
PCBVersion = 2; PCBVersion = 2;
//Setup the ST Accelerometer //Setup the ST Accelerometer
accel2.initalize(); //startup the accelerometer accel2.initalize(); //startup the accelerometer
} } else {
{
PCBVersion = 3; PCBVersion = 3;
} }
HAL_IWDG_Refresh(&hiwdg); HAL_IWDG_Refresh(&hiwdg);
restoreSettings(); // load the settings from flash restoreSettings(); // load the settings from flash
@@ -843,9 +841,9 @@ void startPIDTask(void const *argument) {
int32_t integralCount = 0; int32_t integralCount = 0;
int32_t derivativeLastValue = 0; int32_t derivativeLastValue = 0;
int32_t kp, ki, kd; int32_t kp, ki, kd;
kp = 80; kp = 30;
ki = 120; ki = 60;
kd = 60; kd = 20;
// REMEBER ^^^^ These constants are backwards // REMEBER ^^^^ These constants are backwards
// They act as dividers, so to 'increase' a P term, you make the number // They act as dividers, so to 'increase' a P term, you make the number
// smaller. // smaller.