12 Commits
Author SHA1 Message Date
gab-k 570401489b fixed wrong parameter in measure() function call 2023-10-15 14:46:59 +02:00
Gabriel Koppenstein 10fbcb5815 Merge pull request #10 from questor/main
- Printf debugging with different logging levels, disabled by default
- Disabled UART, USB by default
2023-07-15 11:27:28 +02:00
questor/Inter 562258e433 remove ALL logging if not enabled 2023-05-27 22:41:52 +02:00
questor/Inter 36f20a8ca3 some more comments 2023-05-27 22:04:56 +02:00
questor/Inter 8877e4862d disable logging by default, added comments how to enable it and what are the consequences 2023-05-12 21:05:48 +02:00
questor/Inter 995dca15c8 more debug printfs, disabled function usage of gpio0/1, disabled usb interface to save some 25kb in the firmware image 2023-05-08 22:50:19 +02:00
questor/Inter 23b69d6823 more debug output 2023-04-27 23:07:19 +02:00
questor a0408c28ed some refactoring 2023-04-27 15:53:59 +02:00
Gabriel Koppenstein a57295817e Merge pull request #2 from WolfgangGitHub/main
Fix writing CV_1 - The default case was missing - Thank you Wolfgang
2023-01-11 22:28:15 +01:00
Wolfgang 3a3dbb4b63 fix writing CV_1 - the default case was missing 2023-01-08 22:07:59 -05:00
Gabriel Koppenstein 39056097d9 Update README.md 2022-08-11 23:25:32 +02:00
1nct 8f1f5cf915 - added/changed files for documentation
- added comment regarding CV array addresses
2022-08-06 13:54:26 +02:00
9 changed files with 131 additions and 43 deletions

No files matched your search

+6 -4
View File
@@ -43,9 +43,11 @@ target_link_libraries(
pico_multicore
)
# enable usb output, disable uart output
pico_enable_stdio_usb(RP2040-Decoder 1)
pico_enable_stdio_uart(RP2040-Decoder 1)
# disable usb stack
pico_enable_stdio_usb(RP2040-Decoder 0)
# disable uart output (to enable put a 1 instead of the 0)
pico_enable_stdio_uart(RP2040-Decoder 0)
# create map/bin/hex file etc.
pico_add_extra_outputs(RP2040-Decoder)
#pico_add_extra_outputs(RP2040-Decoder)
+2 -2
View File
@@ -203,8 +203,8 @@ uint8_t CV_ARRAY_DEFAULT [CV_ARRAY_SIZE] = {
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//Offset adjustment for ADC //
//If CV_172 = 0xFF = 255 there will be a measurement procedure on startup //
0b11111111, //CV_172 - ADC offset Default: 255 //
0b01111111, //CV_173 - ADC offset measurement cycles Default: 127 //
0b11111111, //CV_172 - ADC offset Default: 255 (triggers new measurement!) //
0b01111111, //CV_173 - ADC offset measurement cycles Default: 127 //
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
0b00000001, //CV_174 - Additional motor-PWM clock divider.
0b00000111, //CV_175 - speed_helper timer delay - can be used to adjust accel/decel rate
+2 -2
View File
@@ -17,8 +17,8 @@ Features
Getting Started
------------
The [Wiki - Getting started](https://github.com/gab-k/RP2040-Decoder/wiki/Getting-started) page provides a brief overview.
A Description on how to compile and flash the decoder using Windows can be found [here](https://github.com/gab-k/RP2040-Decoder/wiki/Quick-start-guide-(Windows)).
The ["Getting Started"](https://github.com/gab-k/RP2040-Decoder/wiki/Getting-started) page provides an overview of the steps required to use the decoder as well as brief instructions for all the necessary steps.
License
+62 -22
View File
@@ -5,7 +5,7 @@
//////////////////////////
#include "core0.h"
// XIP_BASE + FLASH_TARGET_OFFSET = "0x101FF000"
// XIP_BASE + FLASH_TARGET_OFFSET = "0x101FF000" <- This address need to be smaller than __flash_binary_end stored in RP2040-Decoder.elf.map
const uint8_t *CV_ARRAY_FLASH = (const uint8_t *) (XIP_BASE + FLASH_TARGET_OFFSET);
uint64_t input_bit_buffer = 0;
uint16_t level_table[32] = {0};
@@ -45,6 +45,8 @@ float two_std_dev(const float arr[], uint32_t length){
// Measures constant adc offset and programs the offset into flash
void adc_offset_adjustment(uint32_t n){
LOG(1, "adc_offset_adjustment\n");
float offsets_fwd[n];
float offsets_rev[n];
// Set PWM level to 0 just to be sure
@@ -77,6 +79,8 @@ void adc_offset_adjustment(uint32_t n){
float overall_avg = (offset_avg_fwd+offset_avg_rev)/2;
uint8_t offset = (uint8_t)roundf(overall_avg);
LOG(1, "new adc offset CV[171] (%f): (uint8_t)%d\n", overall_avg, offset);
// Create temporary array -> change CV 172 in temp array -> erase flash -> write temp array to flash
uint8_t CV_ARRAY_TEMP[CV_ARRAY_SIZE];
memcpy(CV_ARRAY_TEMP, CV_ARRAY_FLASH, sizeof(CV_ARRAY_TEMP));
@@ -131,16 +135,24 @@ void write_cv_handler(uint16_t cv_index, uint8_t cv_data){
switch (cv_index) {
case 0: //CV_1
// CV_1 => Value = 0 is not allowed
if (cv_data == 0 || cv_data > 127) break;
if (cv_data == 0 || cv_data > 127)
break;
else
regular_cv_write(cv_index,cv_data);
break;
case 6: //CV_7
// Read only (CV_7 - Version no.)
// ADC offset Adjustment (CV_7; Value = 7);
if (cv_data == 7) adc_offset_adjustment(8192);
if (cv_data == 7) {
LOG(1, "trigger adc offset adjustment via cv7 => 7\n");
adc_offset_adjustment(8192);
}
break;
case 7: //CV_8
// Read only (CV_8 - Manufacturer ID)
// Reset all CVs to Default (CV_8; Value = 8)
if (cv_data == 8){
LOG(1, "reset of flash triggered via cv8 => 8\n");
flash_range_erase(FLASH_TARGET_OFFSET, FLASH_SECTOR_SIZE);
flash_range_program(FLASH_TARGET_OFFSET, CV_ARRAY_DEFAULT, FLASH_PAGE_SIZE * 2);
}
@@ -148,12 +160,16 @@ void write_cv_handler(uint16_t cv_index, uint8_t cv_data){
// CV_17 must have a value between 11000000->(192dec) and 11100111->(231dec) inclusive
// CV_17 == 192 && CV_18 == 0 -> Address = 0 is also not valid and therefore shall not be set
case 16: //CV_17
if ( (cv_data < 192 || cv_data > 231) || (CV_ARRAY_FLASH[17] == 0 && cv_data == 192) ) break;
else regular_cv_write(cv_index,cv_data);
if ( (cv_data < 192 || cv_data > 231) || (CV_ARRAY_FLASH[17] == 0 && cv_data == 192) )
break;
else
regular_cv_write(cv_index,cv_data);
break;
case 17: //CV_18
if(CV_ARRAY_FLASH[16] == 192 && cv_data == 0) break;
else regular_cv_write(cv_index,cv_data);
if(CV_ARRAY_FLASH[16] == 192 && cv_data == 0)
break;
else
regular_cv_write(cv_index,cv_data);
break;
// CV_31 & CV_32 Index high byte isn't implemented and shall not be set
case 30: //CV_31
@@ -167,9 +183,9 @@ void write_cv_handler(uint16_t cv_index, uint8_t cv_data){
// CV Programming function resets core1 and evaluates the type of programming instruction (e.g. write byte)
void program_mode(uint8_t number_of_bytes, const uint8_t * const byte_array){
void program_mode(uint8_t number_of_bytes, const uint8_t * const byte_array) {
//First check for valid programming command ("address" 112-127)
if (byte_array[number_of_bytes - 1]<128 && byte_array[number_of_bytes - 1]>111){
if (byte_array[number_of_bytes - 1]<128 && byte_array[number_of_bytes - 1]>111) {
uint8_t instruction_type_mask = 0b00001100;
uint8_t instruction_type = instruction_type_mask & byte_array[number_of_bytes - 1];
uint8_t cv_address_ms_bits_mask = 0b00000011;
@@ -177,9 +193,13 @@ void program_mode(uint8_t number_of_bytes, const uint8_t * const byte_array){
uint16_t cv_address = byte_array[number_of_bytes - 2] + (cv_address_ms_bits << 8);
// Before accessing flash, timers and interrupts need to be disabled and core1 needs to be shut down.
if(pid_control_timer.pool)alarm_pool_destroy(pid_control_timer.pool);
if(speed_helper_timer.pool)alarm_pool_destroy(speed_helper_timer.pool);
if(pid_control_timer.pool)
alarm_pool_destroy(pid_control_timer.pool);
if(speed_helper_timer.pool)
alarm_pool_destroy(speed_helper_timer.pool);
multicore_reset_core1();
uint32_t saved_interrupts = save_and_disable_interrupts();
// Verify CV bit instruction
@@ -344,7 +364,9 @@ void instruction_evaluation(uint8_t number_of_bytes,const uint8_t * const byte_a
if (command_byte_n == 0b00111111){
static bool prev_dir;
uint32_t speed_step = byte_array[command_byte_start_index - 1];
// LOG(1, "new speed %d", speed_step);
multicore_fifo_push_blocking(speed_step);
// LOG(1, " submitted to list\n");
// In case of a direction change, functions need to be updated because functions might depend on direction state
if (get_direction(0) != prev_dir) {
update_active_functions(0,0,true);
@@ -521,6 +543,7 @@ uint16_t measure_base_pwm(bool direction, uint8_t iterations){
for (int i = 0; i < iterations; ++i) {
uint16_t max_level = _125M/(CV_ARRAY_FLASH[8]*100+10000);
uint16_t level = max_level/20;
LOG(3, "iteration %d: maxlevel %d level %d\n", i, max_level, level);
float measurement;
do {
pwm_set_gpio_level(gpio, level);
@@ -531,15 +554,21 @@ uint16_t measure_base_pwm(bool direction, uint8_t iterations){
CV_ARRAY_FLASH[62],
CV_ARRAY_FLASH[63],
direction);
// Abort measurement and write default value of 0 to flash
if (level > max_level) return 0;
}
while((measurement - (float)CV_ARRAY_FLASH[171]) < 5.0f);
LOG(3, "level %d measurement %f loop-cond: %f\n", level, measurement, measurement-(float)CV_ARRAY_FLASH[171]);
if (level > max_level) {
// Abort measurement and write default value of 0 to flash
LOG(1, "measure_base_pwm: abort measurement and return 0\n");
return 0;
}
} while((measurement - (float)CV_ARRAY_FLASH[171]) < 5.0f);
LOG(3, "level_arr[%d] = %f\n", i, level);
level_arr[i] = (float)level;
busy_wait_ms(100);
}
// Find and return overall average discarding outliers in measurement - multiply with 0.9
return (uint16_t)(0.9f*two_std_dev(level_arr,5));
float retVal = 0.9f*two_std_dev(level_arr,5);
LOG(1, "measure_base_pwm: %d(%f)\n", (uint16_t)retVal, retVal);
return (uint16_t)(retVal);
}
@@ -547,15 +576,16 @@ uint16_t measure_base_pwm(bool direction, uint8_t iterations){
// When factory condition is found the CV_ARRAY_DEFAULT will be written into flash
// When ADC Setup is not configured run adc offset adjustment function and write adc offset into flash
void cv_setup_check(){
// Check for flash factory setting and set CV_FLASH_ARRAY to default values when factory condition ("0xFF") is found.
if ( CV_ARRAY_FLASH[64] == 0xFF ){
if ( CV_ARRAY_FLASH[64] == 0xFF ){
LOG(1, "found cv[64] equals to 0xff, reseting CVs (and CV[8] = 8)\n");
uint8_t arr[4] = {125,8,7,124};
program_mode(4,arr); //reset to CV_ARRAY_DEFAULT (write CV_8 = 8)
}
// Check for adc offset setup
if ( CV_ARRAY_FLASH[171] == 0xFF ){
LOG(1, "found cv[171] equals to 0xff, adc offset adjstments (and cr[7] = 7)\n");
uint8_t arr[4] = {125,7,6,124};
program_mode(4,arr); //ADC offset adjustment (write CV_7 = 7)
}
@@ -563,6 +593,7 @@ void cv_setup_check(){
// Check for base PWM configuration - used for feed-forward
// Forward Direction
if (get_16bit_CV(175) == 0){
LOG(1, "found cv[175] equals to 0, forward direction\n");
uint16_t base_pwm_fwd = measure_base_pwm(true,10);
uint8_t base_pwm_fwd_high_byte = base_pwm_fwd>>8;
uint8_t base_pwm_fwd_low_byte = base_pwm_fwd&0x00FF;
@@ -573,6 +604,7 @@ void cv_setup_check(){
}
// Reverse Direction
if (get_16bit_CV(177) == 0){
LOG(1, "found cv[177] equals to 0, reverse direction\n");
uint16_t base_pwm_rev = measure_base_pwm(false,10);
uint8_t base_pwm_rev_high_byte = base_pwm_rev>>8;
uint8_t base_pwm_rev_low_byte = base_pwm_rev&0x00FF;
@@ -581,6 +613,8 @@ void cv_setup_check(){
uint8_t arr1[4] = {125,base_pwm_rev_low_byte,178,124};
program_mode(4,arr1);
}
LOG(1, "int_lim_max %d\n", CV_ARRAY_FLASH[51]);
LOG(1, "int_lim_min %d\n", CV_ARRAY_FLASH[52]);
}
@@ -605,11 +639,13 @@ void init_motor_pwm(uint8_t gpio) {
pwm_set_wrap(slice_num, wrap_counter);
pwm_set_gpio_level(gpio,0);
pwm_set_enabled(slice_num, true);
LOG(2, "init motor(%d): wrapCounter %d clkdiv %d\n", gpio, wrap_counter, CV_ARRAY_FLASH[173]);
}
// Main initialization - GPIO Config / ADC Config
void init_main(){
void init_gpio_adc(){
if(gpio_get_function(MOTOR_FWD_PIN) != 4){
gpio_set_function(MOTOR_FWD_PIN, GPIO_FUNC_PWM);
gpio_set_function(MOTOR_REV_PIN, GPIO_FUNC_PWM);
@@ -623,16 +659,20 @@ void init_main(){
int main() {
stdio_init_all();
printf("core0 init...\n");
init_main();
LOG(1, "\n\n======\ncore0 init\n");
init_gpio_adc();
LOG(1, "init motor pwms\n");
init_motor_pwm(MOTOR_FWD_PIN);
init_motor_pwm(MOTOR_REV_PIN);
LOG(1, "check cvs\n");
cv_setup_check();
LOG(1, "init outputs\n");
init_outputs();
LOG(1, "init gpios\n");
gpio_init(DCC_INPUT_PIN);
gpio_set_dir(DCC_INPUT_PIN, GPIO_IN);
gpio_pull_up(DCC_INPUT_PIN);
gpio_set_irq_enabled_with_callback(DCC_INPUT_PIN, GPIO_IRQ_EDGE_RISE, true, &track_signal_rise);
printf("core0 done\n");
LOG(1, "core0 done\n");
while (1);
}
+8 -1
View File
@@ -30,6 +30,13 @@ void verify_cv_bit(uint16_t cv_address,bool bit_val, uint8_t bit_pos);
void verify_cv_byte(uint16_t cv_address, uint8_t cv_data);
void regular_cv_write(uint16_t cv_index, uint8_t cv_data);
void write_cv_handler(uint16_t cv_index, uint8_t cv_data);
#define ProgramInstrVerifyBit 0b10
#define ProgramInstrVerifyByte 0b01
#define ProgramInstrWriteByte 0b11
#define ProgramCmd(instr, adrmsbits) ((instr<<2) | (adrmsbits))
void program_mode(uint8_t number_of_bytes, const uint8_t byte_array[]);
void set_outputs(uint32_t functions_to_set_bitmask);
void update_active_functions(uint32_t byte, uint8_t clr_bit_ind,bool direction_change);
@@ -48,4 +55,4 @@ uint16_t measure_base_pwm(bool direction, uint8_t iterations);
void cv_setup_check();
bool get_direction(bool *direction_ptr);
void init_motor_pwm(uint8_t gpio);
void init_main();
void init_gpio_adc();
+24 -8
View File
@@ -16,14 +16,18 @@ void update_speed_dir(pid_params *pid, uint32_t speed_step_target){
// Forward
if(speed_step_target > 127) {
pid->direction = true^reverse_dir;
if (pid->speed_step_target == 128) pid->end_target_index = 0;
else pid->end_target_index = (pid->speed_step_target-129);
if (pid->speed_step_target == 128)
pid->end_target_index = 0;
else
pid->end_target_index = (pid->speed_step_target-129);
}
// Reverse
else {
pid->direction = false^reverse_dir;
if (pid->speed_step_target == 0) pid->end_target_index = 0;
else pid->end_target_index = (pid->speed_step_target-1);
if (pid->speed_step_target == 0)
pid->end_target_index = 0;
else
pid->end_target_index = (pid->speed_step_target-1);
}
}
@@ -172,7 +176,7 @@ bool pid_control(struct repeating_timer *t){
// Measure BEMF voltage and compute error
pid->measurement = measure(pid->msr_total_iterations,
pid->msr_total_iterations,
pid->msr_delay_in_us,
pid->l_side_arr_cutoff,
pid->r_side_arr_cutoff,
pid->direction);
@@ -192,6 +196,15 @@ bool pid_control(struct repeating_timer *t){
if (output < 0 || !pid->setpoint) output = 0.0f;
else if (output > pid->max_output) output = pid->max_output;
if(LOGLEVEL >= 1) {
static int counter = 0;
counter++;
if(counter > 100) {
LOG(1, "pid error(%f) output(%f)\n", e, output);
counter = 0;
}
}
// Set PWM Level and discard results in adc fifo
adjust_pwm_level((uint16_t)roundf(output),pid);
adc_fifo_drain();
@@ -226,6 +239,9 @@ void init_pid(pid_params *pid){
double v_min = (double)CV_ARRAY_FLASH[1];
double v_mid = (double)CV_ARRAY_FLASH[5]*16;
double v_max = (double)CV_ARRAY_FLASH[4]*16;
LOG(1, "speedtable min(%f) mid(%f) max(%f)\n", v_min, v_mid, v_max);
double delta_x = 63;
double m_1 = (v_mid-v_min)/delta_x;
double m_2 = (v_max-v_mid)/delta_x;
@@ -284,7 +300,7 @@ void init_pid(pid_params *pid){
void core1_entry() {
printf("core1 init...\n");
LOG(1, "core1 init...\n");
pid_params pid_parameters;
pid_params *pid = &pid_parameters;
init_pid(pid);
@@ -305,7 +321,7 @@ void core1_entry() {
multicore_fifo_push_blocking((uint32_t) &(pid->direction));
uint64_t packet_timeout_threshold_in_us = CV_ARRAY_FLASH[10]*1000000;
absolute_time_t time_last_update = get_absolute_time();
printf("core1 done\n");
// printf("core1 done\n");
while (1){
// Check for time difference between last packet and current time (Packet Timeout)
absolute_time_t current_time = get_absolute_time();
@@ -318,4 +334,4 @@ void core1_entry() {
time_last_update = get_absolute_time();
}
}
}
}
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Do not edit this file with editors other than diagrams.net -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="2551px" height="1551px" viewBox="-0.5 -0.5 2551 1551" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2022-08-05T21:46:24.297Z&quot; agent=&quot;5.0 (X11)&quot; etag=&quot;3xPXZ7MIIq7wi2-Z9Vb2&quot; version=&quot;20.2.2&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;fYnpBcbPwy3h1yrhEr7x&quot; name=&quot;Page-1&quot;&gt;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 truncated
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="2037px" height="1191px" viewBox="-0.5 -0.5 2037 1191" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2022-08-06T10:29:12.145Z&quot; agent=&quot;5.0 (X11)&quot; etag=&quot;IjcCWwMyXrMXf420IuKe&quot; version=&quot;20.2.3&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;fYnpBcbPwy3h1yrhEr7x&quot; name=&quot;Page-1&quot;&gt;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 truncated

Before

Width:  |  Height:  |  Size: 521 KiB

After

Width:  |  Height:  |  Size: 521 KiB

+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Do not edit this file with editors other than diagrams.net -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="1507px" height="895px" viewBox="-0.5 -0.5 1507 895" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2022-08-06T11:02:18.786Z&quot; agent=&quot;5.0 (X11)&quot; etag=&quot;NKSu-nPPOk6CyOgIXUhc&quot; version=&quot;20.2.3&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;fYnpBcbPwy3h1yrhEr7x&quot; name=&quot;Page-1&quot;&gt;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 truncated

After

Width:  |  Height:  |  Size: 524 KiB

+22 -3
View File
@@ -15,6 +15,18 @@
#include "hardware/flash.h"
#include "hardware/irq.h"
// here you can enable printf debugging (needs extra soldering and you have to enable uart in the cmake configuration)
// please note
// - if it's disabled it will be compiled completely out
// - be careful that printf debugging can change your timing behavior, for example in the pid controller limit the outputs
// like already done (only print every 100th iteration for example!)
// - also note that with logging enabled GPIO0/1 are DISABLED from decoder functions because they are used for uart to the
// outside world (this is configure automatically for you below!)
// - IMPORTANT: you have to enable uart in the cmakelists.txt to enable logging!
#define LOGLEVEL 0
#define LOG(level, ...) { if(level <= LOGLEVEL) {printf(__VA_ARGS__);}}
// Constant Value of 125 x 10⁶
#define _125M 125000000
@@ -25,8 +37,15 @@
#define FWD_V_EMF_ADC_PIN 28u
#define REV_V_EMF_ADC_PIN 29u
// GPIO used directly (GPIO 0-5 incl.) as outputs or to switch auxiliary output transistors (GPIO 24-27 incl.)
#define GPIO_OUTPUT_PIN_MASK (1u<<24) | (1u<<25) | (1u<<26) | (1u<<27) | (1u<<5) | (1u<<4) | (1u<<3) | (1u<<2) | (1u<<1) | (1u<<0)
// if logging is enabled do NOT use gpio0/1 for functions in the decoder
#if LOGLEVEL != 0
// GPIO used directly (GPIO 2-5 incl.) as outputs or to switch auxiliary output transistors (GPIO 24-27 incl.)
#define GPIO_OUTPUT_PIN_MASK (1u<<24) | (1u<<25) | (1u<<26) | (1u<<27) | (1u<<5) | (1u<<4) | (1u<<3) | (1u<<2)
#else
// GPIO used directly (GPIO 0-5 incl.) as outputs or to switch auxiliary output transistors (GPIO 24-27 incl.)
#define GPIO_OUTPUT_PIN_MASK (1u<<24) | (1u<<25) | (1u<<26) | (1u<<27) | (1u<<5) | (1u<<4) | (1u<<3) | (1u<<2) | (1u<<1) | (1u<<0)
#endif
// GPIO pin mask to prevent setting illegal GPIOs (ADC, Motor, DCC Input Pin)
#define GPIO_ILLEGAL_MASK (1u<<DCC_INPUT_PIN) | (1u<<MOTOR_FWD_PIN) | (1u<<MOTOR_REV_PIN) | (1u<<FWD_V_EMF_ADC_PIN) | (1u<<REV_V_EMF_ADC_PIN)
@@ -46,4 +65,4 @@ float measure(uint8_t total_iterations,
uint8_t r_side_arr_cutoff,
bool direction);
uint32_t get_32bit_CV (uint16_t CV_start_index);
uint16_t get_16bit_CV (uint16_t CV_start_index);
uint16_t get_16bit_CV (uint16_t CV_start_index);