From df9a1848e4478306a4df6cf243591e95ad598de4 Mon Sep 17 00:00:00 2001 From: GabrielKoppenstein Date: Fri, 24 Sep 2021 12:56:28 +0200 Subject: [PATCH] Updated CV_ARRAY, added save to Flash function, changed various small things --- CMakeLists.txt | 1 + CV.h | 293 +++++++++++++++++++++++++++++++++++++++++++------ multicore.c | 101 +++++++++++------ multicore.h | 16 ++- 4 files changed, 339 insertions(+), 72 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a121be0..4ffcadd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,7 @@ target_link_libraries( hardware_pio hardware_pwm hardware_adc + hardware_flash pico_multicore ) diff --git a/CV.h b/CV.h index 06f6181..b6ea54a 100644 --- a/CV.h +++ b/CV.h @@ -1,25 +1,262 @@ //All CVs are 8-bit numbers (range 0 - 255) -#define CV_1 5 //Address - Basic Address -#define CV_2 1 //V_min - Minimum Speed -#define CV_3 1 //Acceleration Rate - Acceleration formula: (CV_3*0.896)/(number of speed steps in use) -> CV_3*7ms/Speed Step -#define CV_4 1 //Deceleration Rate - Deceleration formula: (CV_4*0.896)/(number of speed steps in use) -> CV_4*7ms/Speed Step -#define CV_5 255 //V_max - Maximum Speed -#define CV_6 127 //V_mid - Middle Speed -#define CV_7 13 //Version No. - Decoder-Software version -#define CV_8 13 //Manufacturer - Manufacturer Identification (13 == "Public Domain & Do-It-Yourself Decoders"). -// PWM Period Frequency Calculation: pwm_period = ( CV_9*CV_5 ) * 8ns -// The reciprocal of the period is the PWM frequency divided by CV_10 -#define CV_9 255 //PWM-Period - Defines the Motor PWM-Period -#define CV_10 1 //PWM Clock Divider - Additional Clock Divider for PWM-Signal -#define CV_47 255 //V_EMF Measure Period duration - Time between measurements of Back-EMF Voltage in ms -#define CV_48 50 //V_EMF Measure Delay - Measure delay time after falling edge of Motor-PWM in us -#define CV_49 10 //PID Control P_Factor -#define CV_50 0 //PID Control I_Factor -#define CV_51 0 //PID Control D_Factor - - - -const uint8_t CV_FUNCTION_ARRAY [256] = { +uint8_t CV_ARRAY [512] = { + 0b00000111, //CV_1 - Basic Address + 0b00000000, //CV_2 - Minimum Speed + 0b00000000, //CV_3 - Acceleration Rate + 0b00000000, //CV_4 - Deceleration Rate + 0b11111111, //CV_5 - V_max + 0b01111111, //CV_6 - V_mid + 0b00000001, //CV_7 - Version No. + 0b00001101, //CV_8 - Manufacturer + 0b00000000, //CV_9 - PWM-Period + 0b00000001, //CV_10 - PWM Clock Divider + 0b11111111, //CV_11 - Packet Timeout in seconds + 0b00000000, //CV_12 - + 0b00000000, //CV_13 - + 0b00000000, //CV_14 - + 0b00000000, //CV_15 - + 0b00000000, //CV_16 - + 0b00000000, //CV_17 - + 0b00000000, //CV_18 - + 0b00000000, //CV_19 - + 0b00000000, //CV_20 - + 0b00000000, //CV_21 - + 0b00000000, //CV_22 - + 0b00000000, //CV_23 - + 0b00000000, //CV_24 - + 0b00000000, //CV_25 - + 0b00000000, //CV_26 - + 0b00000000, //CV_27 - + 0b00000000, //CV_28 - + 0b00000000, //CV_29 - + 0b00000000, //CV_30 - + 0b00000000, //CV_31 - + 0b00000000, //CV_32 - + 0b00000000, //CV_33 - + 0b00000000, //CV_34 - + 0b00000000, //CV_35 - + 0b00000000, //CV_36 - + 0b00000000, //CV_37 - + 0b00000000, //CV_38 - + 0b00000000, //CV_39 - + 0b00000000, //CV_40 - + 0b00000000, //CV_41 - + 0b00000000, //CV_42 - + 0b00000000, //CV_43 - + 0b00000000, //CV_44 - + 0b00000000, //CV_45 - + 0b00000000, //CV_46 - + 0b00000000, //CV_47 - V_EMF Measure Period duration + 0b00000000, //CV_48 - V_EMF Measure Delay + 0b00000000, //CV_49 - PID Control P_Factor + 0b00000000, //CV_50 - PID Control I_Factor + 0b00000000, //CV_51 - PID Control D_Factor + 0b00000000, //CV_52 - + 0b00000000, //CV_53 - + 0b00000000, //CV_54 - + 0b00000000, //CV_55 - + 0b00000000, //CV_56 - + 0b00000000, //CV_57 - + 0b00000000, //CV_58 - + 0b00000000, //CV_59 - + 0b00000000, //CV_60 - + 0b00000000, //CV_61 - + 0b00000000, //CV_62 - + 0b00000000, //CV_63 - + 0b00000000, //CV_64 - + 0b00000000, //CV_65 - + 0b00000000, //CV_66 - + 0b00000000, //CV_67 - + 0b00000000, //CV_68 - + 0b00000000, //CV_69 - + 0b00000000, //CV_70 - + 0b00000000, //CV_71 - + 0b00000000, //CV_72 - + 0b00000000, //CV_73 - + 0b00000000, //CV_74 - + 0b00000000, //CV_75 - + 0b00000000, //CV_76 - + 0b00000000, //CV_77 - + 0b00000000, //CV_78 - + 0b00000000, //CV_79 - + 0b00000000, //CV_80 - + 0b00000000, //CV_81 - + 0b00000000, //CV_82 - + 0b00000000, //CV_83 - + 0b00000000, //CV_84 - + 0b00000000, //CV_85 - + 0b00000000, //CV_86 - + 0b00000000, //CV_87 - + 0b00000000, //CV_88 - + 0b00000000, //CV_89 - + 0b00000000, //CV_90 - + 0b00000000, //CV_91 - + 0b00000000, //CV_92 - + 0b00000000, //CV_93 - + 0b00000000, //CV_94 - + 0b00000000, //CV_95 - + 0b00000000, //CV_96 - + 0b00000000, //CV_97 - + 0b00000000, //CV_98 - + 0b00000000, //CV_99 - + 0b00000000, //CV_100 - + 0b00000000, //CV_101 - + 0b00000000, //CV_102 - + 0b00000000, //CV_103 - + 0b00000000, //CV_104 - + 0b00000000, //CV_105 - + 0b00000000, //CV_106 - + 0b00000000, //CV_107 - + 0b00000000, //CV_108 - + 0b00000000, //CV_109 - + 0b00000000, //CV_110 - + 0b00000000, //CV_111 - + 0b00000000, //CV_112 - + 0b00000000, //CV_113 - + 0b00000000, //CV_114 - + 0b00000000, //CV_115 - + 0b00000000, //CV_116 - + 0b00000000, //CV_117 - + 0b00000000, //CV_118 - + 0b00000000, //CV_119 - + 0b00000000, //CV_120 - + 0b00000000, //CV_121 - + 0b00000000, //CV_122 - + 0b00000000, //CV_123 - + 0b00000000, //CV_124 - + 0b00000000, //CV_125 - + 0b00000000, //CV_126 - + 0b00000000, //CV_127 - + 0b00000000, //CV_128 - + 0b00000000, //CV_129 - + 0b00000000, //CV_130 - + 0b00000000, //CV_131 - + 0b00000000, //CV_132 - + 0b00000000, //CV_133 - + 0b00000000, //CV_134 - + 0b00000000, //CV_135 - + 0b00000000, //CV_136 - + 0b00000000, //CV_137 - + 0b00000000, //CV_138 - + 0b00000000, //CV_139 - + 0b00000000, //CV_140 - + 0b00000000, //CV_141 - + 0b00000000, //CV_142 - + 0b00000000, //CV_143 - + 0b00000000, //CV_144 - + 0b00000000, //CV_145 - + 0b00000000, //CV_146 - + 0b00000000, //CV_147 - + 0b00000000, //CV_148 - + 0b00000000, //CV_149 - + 0b00000000, //CV_150 - + 0b00000000, //CV_151 - + 0b00000000, //CV_152 - + 0b00000000, //CV_153 - + 0b00000000, //CV_154 - + 0b00000000, //CV_155 - + 0b00000000, //CV_156 - + 0b00000000, //CV_157 - + 0b00000000, //CV_158 - + 0b00000000, //CV_159 - + 0b00000000, //CV_160 - + 0b00000000, //CV_161 - + 0b00000000, //CV_162 - + 0b00000000, //CV_163 - + 0b00000000, //CV_164 - + 0b00000000, //CV_165 - + 0b00000000, //CV_166 - + 0b00000000, //CV_167 - + 0b00000000, //CV_168 - + 0b00000000, //CV_169 - + 0b00000000, //CV_170 - + 0b00000000, //CV_171 - + 0b00000000, //CV_172 - + 0b00000000, //CV_173 - + 0b00000000, //CV_174 - + 0b00000000, //CV_175 - + 0b00000000, //CV_176 - + 0b00000000, //CV_177 - + 0b00000000, //CV_178 - + 0b00000000, //CV_179 - + 0b00000000, //CV_180 - + 0b00000000, //CV_181 - + 0b00000000, //CV_182 - + 0b00000000, //CV_183 - + 0b00000000, //CV_184 - + 0b00000000, //CV_185 - + 0b00000000, //CV_186 - + 0b00000000, //CV_187 - + 0b00000000, //CV_188 - + 0b00000000, //CV_189 - + 0b00000000, //CV_190 - + 0b00000000, //CV_191 - + 0b00000000, //CV_192 - + 0b00000000, //CV_193 - + 0b00000000, //CV_194 - + 0b00000000, //CV_195 - + 0b00000000, //CV_196 - + 0b00000000, //CV_197 - + 0b00000000, //CV_198 - + 0b00000000, //CV_199 - + 0b00000000, //CV_200 - + 0b00000000, //CV_201 - + 0b00000000, //CV_202 - + 0b00000000, //CV_203 - + 0b00000000, //CV_204 - + 0b00000000, //CV_205 - + 0b00000000, //CV_206 - + 0b00000000, //CV_207 - + 0b00000000, //CV_208 - + 0b00000000, //CV_209 - + 0b00000000, //CV_210 - + 0b00000000, //CV_211 - + 0b00000000, //CV_212 - + 0b00000000, //CV_213 - + 0b00000000, //CV_214 - + 0b00000000, //CV_215 - + 0b00000000, //CV_216 - + 0b00000000, //CV_217 - + 0b00000000, //CV_218 - + 0b00000000, //CV_219 - + 0b00000000, //CV_220 - + 0b00000000, //CV_221 - + 0b00000000, //CV_222 - + 0b00000000, //CV_223 - + 0b00000000, //CV_224 - + 0b00000000, //CV_225 - + 0b00000000, //CV_226 - + 0b00000000, //CV_227 - + 0b00000000, //CV_228 - + 0b00000000, //CV_229 - + 0b00000000, //CV_230 - + 0b00000000, //CV_231 - + 0b00000000, //CV_232 - + 0b00000000, //CV_233 - + 0b00000000, //CV_234 - + 0b00000000, //CV_235 - + 0b00000000, //CV_236 - + 0b00000000, //CV_237 - + 0b00000000, //CV_238 - + 0b00000000, //CV_239 - + 0b00000000, //CV_240 - + 0b00000000, //CV_241 - + 0b00000000, //CV_242 - + 0b00000000, //CV_243 - + 0b00000000, //CV_244 - + 0b00000000, //CV_245 - + 0b00000000, //CV_246 - + 0b00000000, //CV_247 - + 0b00000000, //CV_248 - + 0b00000000, //CV_249 - + 0b00000000, //CV_250 - + 0b00000000, //CV_251 - + 0b00000000, //CV_252 - + 0b00000000, //CV_253 - + 0b00000000, //CV_254 - + 0b00000000, //CV_255 - + 0b00000000, //CV_256 - +//FUNCTION MAPPING CVS: // 31 30 29 28 - 27 26 25 24 -- 23 22 21 20 - 19 18 17 16 -- 15 14 13 12 - 11 10 9 8 -- 7 6 5 4 - 3 2 1 0 <- GPIO // byte_3 -- byte_2 -- byte_1 -- byte_0 // X X X X - X X X X -- X X X X - X X X X -- X X X X - X X X X -- X X X X - X X X X @@ -344,17 +581,3 @@ const uint8_t CV_FUNCTION_ARRAY [256] = { 0b00000000, //byte 2 - CV_511 - Array Index: 254 0b00000000, //byte 3 - CV_512 - Array Index: 255 }; -// #define CV_33 0b00000001 //F0 (Licht) vorwärts (MSB) A8 - A1 (LSB) -// #define CV_34 0b00000010 //F0 (Licht) rückwärts (MSB) A8 - A1 (LSB) -// #define CV_35 0b00000100 //F1 (MSB) A8 - A1 (LSB) -// #define CV_36 0b00001000 //F2 (MSB) A8 - A1 (LSB) -// #define CV_37 0b00010000 //F3 (MSB) A8 - A1 (LSB) -// #define CV_38 0b00000100 //F4 (MSB) A11 - A4 (LSB) -// #define CV_39 0b00001000 //F5 (MSB) A11 - A4 (LSB) -// #define CV_40 0b00010000 //F6 (MSB) A11 - A4 (LSB) -// #define CV_41 0b00100000 //F7 (MSB) A11 - A4 (LSB) -// #define CV_42 0b01000000 //F8 (MSB) A11 - A4 (LSB) -// #define CV_43 0b00010000 //F9 (MSB) A14 - A9 (LSB) -// #define CV_44 0b00100000 //F10 (MSB) A14 - A9 (LSB) -// #define CV_45 0b01000000 //F11 (MSB) A14 - A9 (LSB) -// #define CV_46 0b10000000 //F12 (MSB) A14 - A9 (LSB) diff --git a/multicore.c b/multicore.c index 8b071c6..124d334 100644 --- a/multicore.c +++ b/multicore.c @@ -1,29 +1,13 @@ #include -#include -#include #include "pico/stdlib.h" #include "pico/multicore.h" -#include "hardware/gpio.h" #include "hardware/irq.h" -#include "hardware/pio.h" #include "hardware/pwm.h" #include "hardware/adc.h" -#include "pwm.pio.h" -#include "automat.h" +#include "hardware/flash.h" #include "CV.h" #include "multicore.h" -#define SIZE_BYTE_ARRAY 5 -#define SIZE_ACTIVE_FUNCTIONS 69 -#define DCC_INPUT_PIN 17 -#define MOTOR_PWM_FORWARD 21 -#define MOTOR_PWM_REVERSE 22 -#define PACKAGE_3_BYTES 0b11111111110000000000000000000000000001 -#define PACKAGE_MASK_3_BYTES 0b11111111111000000001000000001000000001 -#define PACKAGE_4_BYTES 0b11111111110000000000000000000000000000000000001 -#define PACKAGE_MASK_4_BYTES 0b11111111111000000001000000001000000001000000001 -#define PACKAGE_5_BYTES 0b11111111110000000000000000000000000000000000000000000001 -#define PACKAGE_MASK_5_BYTES 0b11111111111000000001000000001000000001000000001000000001 -#define N_MEASUREMENTS 50 +const uint8_t *CV_ARRAY_FLASH = (const uint8_t *) (XIP_BASE + FLASH_TARGET_OFFSET); uint64_t last_bits = 0; bool active_functions[SIZE_ACTIVE_FUNCTIONS] = {false}; uint32_t target_speed_step = 128; @@ -40,6 +24,7 @@ float k_d = 0.008f; float output = 0; uint target_v_emf = 0; uint measurement; +bool program_mode_flag = false; int8_t check_for_package() //function returns number of bytes if valid bit-pattern is found. Otherwise -1 is returned { @@ -90,6 +75,10 @@ void interp_speed_step(uint8_t speed_byte){ if (speed_byte == 128 || speed_byte==0) target_v_emf = 0; } +void program_mode(){ + +} + void set_outputs() { uint32_t GPIO_to_be_set = 0; //ensures that GPIO's that are used for inputs or PWM (motor) cannot be set HIGH @@ -97,10 +86,10 @@ void set_outputs() { for (uint8_t i = 0; i < SIZE_ACTIVE_FUNCTIONS; i++) { if (active_functions[i]) { printf("F%u == 1\n",i); - uint8_t func_cv_0 = CV_FUNCTION_ARRAY[4 + i * 8 - 4 * target_direction]; - uint8_t func_cv_1 = CV_FUNCTION_ARRAY[5 + i * 8 - 4 * target_direction]; - uint8_t func_cv_2 = CV_FUNCTION_ARRAY[6 + i * 8 - 4 * target_direction]; - uint8_t func_cv_3 = CV_FUNCTION_ARRAY[7 + i * 8 - 4 * target_direction]; + uint8_t func_cv_0 = CV_ARRAY[4 + i * 8 - 4 * target_direction]; + uint8_t func_cv_1 = CV_ARRAY[5 + i * 8 - 4 * target_direction]; + uint8_t func_cv_2 = CV_ARRAY[6 + i * 8 - 4 * target_direction]; + uint8_t func_cv_3 = CV_ARRAY[7 + i * 8 - 4 * target_direction]; uint32_t func_cv = (func_cv_0) + (func_cv_1 << 8) + (func_cv_2 << 16) + (func_cv_3 << 24); GPIO_to_be_set = (GPIO_to_be_set | func_cv) & filter_forbidden_GPIO; uint32_t mask = 1; @@ -143,30 +132,39 @@ bool is_long_address(uint8_t number_of_bytes, const uint8_t byte_array[]) { bool address_evaluation(uint8_t number_of_bytes,const uint8_t byte_array[]) { uint16_t read_address; - if (byte_array[number_of_bytes - 1] == 255) //Check for Idle Package + //Enters Programming Mode + if (program_mode_flag && byte_array[number_of_bytes - 1]<128 && byte_array[number_of_bytes - 1]>111){ + program_mode(); + } + program_mode_flag = false; + //Check for Idle Package + if (byte_array[number_of_bytes - 1] == 255) { -// printf("Idle-Package found!\n"); return false; } - if (byte_array[number_of_bytes-1] == 0) //Check for Broadcast Package + //Check for Broadcast Package + if (byte_array[number_of_bytes-1] == 0) { printf("Broadcast-Package found!\n"); return true; } - if (is_long_address(number_of_bytes, byte_array)) //Long Address Package + //Long Address Package + if (is_long_address(number_of_bytes, byte_array)) { //start of transmission -> address_byte_1 -> address_byte_0 -> ... -> end of transmission uint16_t address_byte_1 = (byte_array[number_of_bytes - 1]) - 192; //remove long address identifier bits uint16_t address_byte_0 = (byte_array[number_of_bytes - 2]); read_address = (address_byte_1 << 8) + address_byte_0; -// printf("long address: %u, was read. \n", read_address); - } else //Short Address Package + //printf("long address: %u, was read. \n", read_address); + } + //Short Address Package + else { //start of transmission -> address_byte_0 -> ... -> end of transmission read_address = (byte_array[number_of_bytes - 1]); -// printf("short address: %u, was read. \n",read_address); + //printf("short address: %u, was read. \n",read_address); } - return (CV_1 == read_address); //returns true if Address Matches + return (CV_ARRAY[0] == read_address); //returns true if Address Matches } void instruction_evaluation(uint8_t number_of_bytes,const uint8_t byte_array[]) { @@ -179,7 +177,12 @@ void instruction_evaluation(uint8_t number_of_bytes,const uint8_t byte_array[]) command_byte_start_index = number_of_bytes - 2; } command_byte_n = byte_array[command_byte_start_index]; - + //0000-0000 - Reset Package + if (command_byte_n == 0b00000000){ + target_speed_step = 1; + update_active_functions(0,0,37); + program_mode_flag = true; + } //0011-1111 (128 Speed Step Control) - 2 Byte length if (command_byte_n == 0b00111111) { @@ -284,7 +287,6 @@ void pid_control(){ busy_wait_us(10000); } - void init_pwm(uint gpio) { uint slice_num = pwm_gpio_to_slice_num(gpio); uint32_t wrap_counter = 5000; // 5000 Cycles @ 125MHz for 1 Period -> 25kHz @@ -294,22 +296,49 @@ void init_pwm(uint gpio) { pwm_set_enabled(slice_num, true); printf("PWM on GPIO %u was initialized.\n",gpio); } -void init_adc(){ + +void init_adc(uint gpio){ adc_init(); - adc_gpio_init(26); + adc_gpio_init(gpio); adc_select_input(0); - printf("ADC was initialized.\n"); + printf("ADC on GPIO %d was initialized.\n",gpio); } void core1_entry() { gpio_set_function(MOTOR_PWM_FORWARD, GPIO_FUNC_PWM); gpio_set_function(MOTOR_PWM_REVERSE, GPIO_FUNC_PWM); - init_adc(); + init_adc(V_EMF_ADC_PIN); init_pwm(MOTOR_PWM_FORWARD); init_pwm(MOTOR_PWM_REVERSE); printf("Core 1 was initialized.\n"); while (1) pid_control(); } + + +void print_buf(const uint8_t *buf, size_t len) { + for (size_t i = 0; i < len; ++i) { + printf("CV_%u: %02x",i+1, buf[i]); + if (i % 8 == 7) + printf("\n"); + else + printf(" "); + } +} + +void write_updated_cvs_to_flash(){ + multicore_reset_core1(); + uint32_t ints = save_and_disable_interrupts(); + printf("Erasing CV's...\n"); + flash_range_erase(FLASH_TARGET_OFFSET, FLASH_SECTOR_SIZE*2); + printf("Erasing Done.\n"); + printf("Programming CV's...\n"); + flash_range_program(FLASH_TARGET_OFFSET, CV_ARRAY, FLASH_PAGE_SIZE * 2); + printf("Programming Done. Read back CV's:\n"); + print_buf(CV_ARRAY_FLASH, FLASH_PAGE_SIZE * 2); + restore_interrupts(ints); + multicore_launch_core1(core1_entry); +} + int main() { sleep_ms(1000); stdio_init_all(); diff --git a/multicore.h b/multicore.h index b590419..2206428 100644 --- a/multicore.h +++ b/multicore.h @@ -8,5 +8,19 @@ (byte & 0x08 ? '1' : '0'), \ (byte & 0x04 ? '1' : '0'), \ (byte & 0x02 ? '1' : '0'), \ - (byte & 0x01 ? '1' : '0') + (byte & 0x01 ? '1' : '0') +#define SIZE_BYTE_ARRAY 5 +#define SIZE_ACTIVE_FUNCTIONS 69 +#define DCC_INPUT_PIN 17 +#define MOTOR_PWM_FORWARD 21 +#define MOTOR_PWM_REVERSE 22 +#define V_EMF_ADC_PIN 26 +#define N_MEASUREMENTS 50 +#define PACKAGE_3_BYTES 0b11111111110000000000000000000000000001 +#define PACKAGE_MASK_3_BYTES 0b11111111111000000001000000001000000001 +#define PACKAGE_4_BYTES 0b11111111110000000000000000000000000000000000001 +#define PACKAGE_MASK_4_BYTES 0b11111111111000000001000000001000000001000000001 +#define PACKAGE_5_BYTES 0b11111111110000000000000000000000000000000000000000000001 +#define PACKAGE_MASK_5_BYTES 0b11111111111000000001000000001000000001000000001000000001 +#define FLASH_TARGET_OFFSET (PICO_FLASH_SIZE_BYTES-FLASH_SECTOR_SIZE*2) void pid_control(); \ No newline at end of file