- Correction for Zener Diode Voltage
- Changes to Header Files
This commit is contained in:
1 parent
ebdc57e90a
commit
594f693b9f
6 files changed
+39
-43
No files matched your search
+4
-1
@@ -21,7 +21,10 @@ add_compile_options(-Wall
|
|||||||
add_executable(
|
add_executable(
|
||||||
RP2040-Decoder
|
RP2040-Decoder
|
||||||
core0.c
|
core0.c
|
||||||
core1.c core1.h shared.h)
|
core0.h
|
||||||
|
core1.c
|
||||||
|
core1.h
|
||||||
|
shared.h)
|
||||||
|
|
||||||
|
|
||||||
# Add pico_multicore which is required for multicore functionality
|
# Add pico_multicore which is required for multicore functionality
|
||||||
|
|||||||
@@ -4,10 +4,7 @@
|
|||||||
// core0.c //
|
// core0.c //
|
||||||
//////////////////////////
|
//////////////////////////
|
||||||
|
|
||||||
#include "CV.h"
|
|
||||||
#include "core0.h"
|
#include "core0.h"
|
||||||
#include "shared.h"
|
|
||||||
|
|
||||||
bool target_direction = true;
|
bool target_direction = true;
|
||||||
uint target_speed_step = 128;
|
uint target_speed_step = 128;
|
||||||
const uint8_t *CV_ARRAY_FLASH = (const uint8_t *) (XIP_BASE + FLASH_TARGET_OFFSET);
|
const uint8_t *CV_ARRAY_FLASH = (const uint8_t *) (XIP_BASE + FLASH_TARGET_OFFSET);
|
||||||
@@ -71,7 +68,6 @@ void verify_cv_bit(uint16_t cv_address,bool bit_val, uint8_t bit_pos) {
|
|||||||
if (res) {
|
if (res) {
|
||||||
acknowledge();
|
acknowledge();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
void verify_cv_byte(uint16_t cv_address, uint8_t cv_data){
|
void verify_cv_byte(uint16_t cv_address, uint8_t cv_data){
|
||||||
if (CV_ARRAY_FLASH[cv_address] == cv_data) acknowledge();
|
if (CV_ARRAY_FLASH[cv_address] == cv_data) acknowledge();
|
||||||
|
|||||||
@@ -4,17 +4,9 @@
|
|||||||
// core0.h //
|
// core0.h //
|
||||||
//////////////////////////
|
//////////////////////////
|
||||||
|
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <stdio.h>
|
#include "shared.h"
|
||||||
#include "string.h"
|
#include "CV.h"
|
||||||
#include "pico/stdlib.h"
|
|
||||||
#include "pico/multicore.h"
|
|
||||||
#include "hardware/pwm.h"
|
|
||||||
#include "hardware/adc.h"
|
|
||||||
#include "hardware/flash.h"
|
|
||||||
#include "hardware/irq.h"
|
|
||||||
#include "stdint.h"
|
|
||||||
#define SIZE_BYTE_ARRAY 5
|
#define SIZE_BYTE_ARRAY 5
|
||||||
#define SIZE_ACTIVE_FUNCTIONS 32
|
#define SIZE_ACTIVE_FUNCTIONS 32
|
||||||
#define DCC_INPUT_PIN 11 //Custom: 11 Default: 14
|
#define DCC_INPUT_PIN 11 //Custom: 11 Default: 14
|
||||||
|
|||||||
@@ -4,9 +4,9 @@
|
|||||||
// core1.c //
|
// core1.c //
|
||||||
//////////////////////////
|
//////////////////////////
|
||||||
|
|
||||||
#include "inttypes.h"
|
|
||||||
#include "core1.h"
|
#include "core1.h"
|
||||||
#include "shared.h"
|
int msr_arr[10000] = {0};
|
||||||
|
|
||||||
uint current_target = 0;
|
uint current_target = 0;
|
||||||
struct repeating_timer pid_control_timer,speed_helper_timer;
|
struct repeating_timer pid_control_timer,speed_helper_timer;
|
||||||
|
|
||||||
@@ -23,6 +23,7 @@ typedef struct pid_params{
|
|||||||
int e_sum;
|
int e_sum;
|
||||||
}pid_params;
|
}pid_params;
|
||||||
pid_params pid;
|
pid_params pid;
|
||||||
|
|
||||||
typedef struct measure_params{
|
typedef struct measure_params{
|
||||||
uint8_t delay_in_us;
|
uint8_t delay_in_us;
|
||||||
uint8_t total_iterations;
|
uint8_t total_iterations;
|
||||||
@@ -106,22 +107,31 @@ int measure(){
|
|||||||
pwm_set_gpio_level(MOTOR_PWM_REVERSE,0);
|
pwm_set_gpio_level(MOTOR_PWM_REVERSE,0);
|
||||||
adc_select_input(!target_direction);
|
adc_select_input(!target_direction);
|
||||||
busy_wait_us(msr.delay_in_us);
|
busy_wait_us(msr.delay_in_us);
|
||||||
gpio_put(9,true);
|
//gpio_put(9,true);
|
||||||
int sum = 0;
|
uint32_t sum = 0;
|
||||||
uint16_t adc_values[msr.total_iterations];
|
uint16_t adc_values[msr.total_iterations];
|
||||||
for (int i = 0; i < msr.total_iterations; ++i) {
|
for (int i = 0; i < msr.total_iterations; ++i) {
|
||||||
adc_values[i] = adc_read();
|
adc_values[i] = adc_read();
|
||||||
}
|
}
|
||||||
gpio_put(9,false);
|
//gpio_put(9,false);
|
||||||
quicksort(adc_values, 0, msr.total_iterations - 1);
|
quicksort(adc_values, 0, msr.total_iterations - 1);
|
||||||
for (uint8_t i = msr.left_side_array_cutoff; i < msr.total_iterations - msr.right_side_array_cutoff ; ++i) {
|
for (uint8_t i = msr.left_side_array_cutoff; i < msr.total_iterations - msr.right_side_array_cutoff ; ++i) {
|
||||||
sum = sum+adc_values[i];
|
sum = sum+adc_values[i];
|
||||||
}
|
}
|
||||||
return sum/(msr.total_iterations - 20);
|
float result_f = (float)sum/(float)(msr.total_iterations - 20);
|
||||||
|
if(result_f>MEASURE_CORRECTION_THRESHOLD){
|
||||||
|
result_f = 11*result_f*result_f/(1241*1241) - 43*result_f/1241 + 45;
|
||||||
|
}
|
||||||
|
int result = (int)result_f;
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool pid_control(struct repeating_timer *t){
|
bool pid_control(struct repeating_timer *t){
|
||||||
pid.e = (int)current_target - measure();
|
static uint counter;
|
||||||
|
int msr_val = measure();
|
||||||
|
pid.e = (int)current_target - msr_val;
|
||||||
|
msr_arr[counter] = msr_val;
|
||||||
|
counter++;
|
||||||
pid.e_sum = pid.e_sum + pid.e;
|
pid.e_sum = pid.e_sum + pid.e;
|
||||||
if (pid.e_sum > pid.sum_limit_max) pid.e_sum = pid.sum_limit_max;
|
if (pid.e_sum > pid.sum_limit_max) pid.e_sum = pid.sum_limit_max;
|
||||||
else if (pid.e_sum < pid.sum_limit_min) pid.e_sum = pid.sum_limit_min;
|
else if (pid.e_sum < pid.sum_limit_min) pid.e_sum = pid.sum_limit_min;
|
||||||
@@ -141,10 +151,10 @@ void init_pid(){
|
|||||||
// pid.t_s = ((float)CV_ARRAY_FLASH[47] / 1000);
|
// pid.t_s = ((float)CV_ARRAY_FLASH[47] / 1000);
|
||||||
// pid.a_1 = ((float)CV_ARRAY_FLASH[49] / 64) * pid.t_s ; // k_i*t_s
|
// pid.a_1 = ((float)CV_ARRAY_FLASH[49] / 64) * pid.t_s ; // k_i*t_s
|
||||||
// pid.a_2 = ((float)CV_ARRAY_FLASH[50] / 4096) / pid.t_s; // k_d/t_s
|
// pid.a_2 = ((float)CV_ARRAY_FLASH[50] / 4096) / pid.t_s; // k_d/t_s
|
||||||
pid.k_p = 0.45f;
|
pid.k_p = 1.0f;
|
||||||
pid.t_s = 10.0f / 1000;
|
pid.t_s = 10.0f / 1000;
|
||||||
pid.a_1 = 1.6f * pid.t_s ; // k_i*t_s
|
pid.a_1 = 0.0f * pid.t_s ; // k_i*t_s
|
||||||
pid.a_2 = 0.03f / pid.t_s; // k_d/t_s
|
pid.a_2 = 0.0f / pid.t_s; // k_d/t_s
|
||||||
pid.sum_limit_max = CV_ARRAY_FLASH[51] * 10;
|
pid.sum_limit_max = CV_ARRAY_FLASH[51] * 10;
|
||||||
pid.sum_limit_min = CV_ARRAY_FLASH[52] * (-10);
|
pid.sum_limit_min = CV_ARRAY_FLASH[52] * (-10);
|
||||||
msr.total_iterations = 70;/*CV_ARRAY_FLASH[60];*/
|
msr.total_iterations = 70;/*CV_ARRAY_FLASH[60];*/
|
||||||
|
|||||||
@@ -4,22 +4,11 @@
|
|||||||
// core1.h //
|
// core1.h //
|
||||||
//////////////////////////
|
//////////////////////////
|
||||||
|
|
||||||
|
#pragma once
|
||||||
#ifndef RP2040_DECODER_CORE1_H
|
#include "shared.h"
|
||||||
#define RP2040_DECODER_CORE1_H
|
|
||||||
|
|
||||||
#endif //RP2040_DECODER_CORE1_H
|
|
||||||
#define V_EMF_ADC_PIN_FORWARD 26
|
#define V_EMF_ADC_PIN_FORWARD 26
|
||||||
#define V_EMF_ADC_PIN_REVERSE 27
|
#define V_EMF_ADC_PIN_REVERSE 27
|
||||||
#include <stdio.h>
|
#define MEASURE_CORRECTION_THRESHOLD 2271
|
||||||
#include "string.h"
|
|
||||||
#include "pico/stdlib.h"
|
|
||||||
#include "pico/multicore.h"
|
|
||||||
#include "hardware/pwm.h"
|
|
||||||
#include "hardware/adc.h"
|
|
||||||
#include "hardware/flash.h"
|
|
||||||
#include "hardware/irq.h"
|
|
||||||
#include "stdint.h"
|
|
||||||
void quicksort(uint16_t number[], int first, int last);
|
void quicksort(uint16_t number[], int first, int last);
|
||||||
uint calc_end_target();
|
uint calc_end_target();
|
||||||
bool speed_helper();
|
bool speed_helper();
|
||||||
|
|||||||
@@ -4,10 +4,16 @@
|
|||||||
// shared.h //
|
// shared.h //
|
||||||
//////////////////////////
|
//////////////////////////
|
||||||
|
|
||||||
|
#pragma once
|
||||||
#ifndef RP2040_DECODER_SHARED_VARS_H
|
#include <stdio.h>
|
||||||
#define RP2040_DECODER_SHARED_VARS_H
|
#include "string.h"
|
||||||
#endif //RP2040_DECODER_SHARED_VARS_H
|
#include "pico/stdlib.h"
|
||||||
|
#include "pico/multicore.h"
|
||||||
|
#include "hardware/pwm.h"
|
||||||
|
#include "hardware/adc.h"
|
||||||
|
#include "hardware/flash.h"
|
||||||
|
#include "hardware/irq.h"
|
||||||
|
#include "stdint.h"
|
||||||
#define MOTOR_PWM_FORWARD 10 //Custom: 10 Default: 12
|
#define MOTOR_PWM_FORWARD 10 //Custom: 10 Default: 12
|
||||||
#define MOTOR_PWM_REVERSE 13
|
#define MOTOR_PWM_REVERSE 13
|
||||||
extern repeating_timer_t pid_control_timer;
|
extern repeating_timer_t pid_control_timer;
|
||||||
|
|||||||
Reference in new issue
Block a user