Dependencies:   mbed-dsp mbed

Fork of DSP_200kHz by Mazzeo Research Group

Committer:
baxterja
Date:
Tue Jun 20 16:49:19 2017 +0000
Revision:
79:5f24cfd685d8
Parent:
78:10b2916b8f5c
Child:
80:7a4856c596fc
Working Code that prints out probe number when it receives serial data.

Who changed what in which revision?

UserRevisionLine numberNew contents of line
donatien 0:bb128f0e952f 1 #include "mbed.h"
timmey9 22:523e316cbe70 2
timmey9 52:5a40cc58c4c2 3 // Sampling
bmazzeo 53:83a90a47c1fd 4 #include "DMA_sampling/adc.h"
bmazzeo 54:1697dc574b96 5 #include "DMA_sampling/dac.h"
bmazzeo 55:2526b3317bc8 6 #include "DMA_sampling/pdb.h"
baxterja 73:b059b5bdc664 7 #include "Jareds_DSP/filters_jared.h"
baxterja 75:8bb94685c80b 8 #include "Jareds_DSP/demodulate.h"
bmazzeo 67:ec0c58490ce6 9 // DSP
bmazzeo 67:ec0c58490ce6 10 #include "dsp.h"
baxterja 76:704fc58ffcd0 11 #include "print_data.h"
bmazzeo 67:ec0c58490ce6 12
baxterja 72:0b554f5026b9 13 #define PRINT_BUFFER_LENGTH 10000
baxterja 73:b059b5bdc664 14 #define GATHER_STATISTICS 1
bmazzeo 67:ec0c58490ce6 15
baxterja 74:ebc9f09fda11 16
timmey9 22:523e316cbe70 17 // for debug purposes
baxterja 79:5f24cfd685d8 18 DigitalOut led1(LED1);
baxterja 79:5f24cfd685d8 19 DigitalOut led2(LED2);
timmey9 18:b17ddeeb1c09 20 Serial pc(USBTX, USBRX);
timmey9 18:b17ddeeb1c09 21 DigitalOut led_red(LED_RED);
timmey9 18:b17ddeeb1c09 22 DigitalOut led_green(LED_GREEN);
timmey9 18:b17ddeeb1c09 23 DigitalOut led_blue(LED_BLUE);
bmazzeo 58:4bee89daccff 24 DigitalOut status_0(D0);
bmazzeo 58:4bee89daccff 25 DigitalOut status_1(D1);
baxterja 77:1ee17a9e9f8b 26 DigitalOut status_3(D3);
baxterja 73:b059b5bdc664 27 DigitalIn sw2(SW2);//Button 2
baxterja 73:b059b5bdc664 28 DigitalIn sw3(SW3);//Button 3
timmey9 51:43143a3fc2d7 29
timmey9 52:5a40cc58c4c2 30 // defined in dma.cpp
timmey9 45:d591d138cdeb 31 extern int len;
baxterja 73:b059b5bdc664 32 extern uint16_t static_input_array0[];//ADC 0(swaps between a0 and a1. Used to measure current)
baxterja 73:b059b5bdc664 33 extern uint16_t static_input_array1[];//ADC 1(measures the voltage between the probe and ground)
baxterja 73:b059b5bdc664 34 extern uint16_t static_output_array0[];//DAC outputs whatever wave form we want.
baxterja 73:b059b5bdc664 35 extern uint16_t sampling_status;//used to determine when adc's are done reading.
bmazzeo 57:7b8c49e1c1f6 36
baxterja 73:b059b5bdc664 37 #define INPUT_ARRAY_SIZE 32
baxterja 73:b059b5bdc664 38 #define DECIMATION_FACTOR 8
baxterja 73:b059b5bdc664 39 #define DEMODULATED_SIGNAL_LENGTH 64
baxterja 73:b059b5bdc664 40
baxterja 73:b059b5bdc664 41 float *input_50k[8];
baxterja 73:b059b5bdc664 42
baxterja 79:5f24cfd685d8 43 int probe_number = -1;
baxterja 79:5f24cfd685d8 44 bool recording = false;
baxterja 73:b059b5bdc664 45
baxterja 73:b059b5bdc664 46
baxterja 73:b059b5bdc664 47
baxterja 69:014d4bbd4e03 48 #define pre_compute_length 500
baxterja 73:b059b5bdc664 49 #define demodulation_length 125
baxterja 69:014d4bbd4e03 50 #define CarrierFrequency 200
baxterja 69:014d4bbd4e03 51 #define SAMPLEFREQUENCY 100000
baxterja 73:b059b5bdc664 52 //float i_mod_pre[demodulation_length+(INPUT_ARRAY_SIZE/DECIMATION_FACTOR)];
baxterja 73:b059b5bdc664 53 //float q_mod_pre[demodulation_length+(INPUT_ARRAY_SIZE/DECIMATION_FACTOR)];
baxterja 73:b059b5bdc664 54 uint16_t out_val_pre[pre_compute_length]; //used to write values to the dac
baxterja 69:014d4bbd4e03 55 float twopi = 3.14159265359 * 2;
baxterja 69:014d4bbd4e03 56
baxterja 69:014d4bbd4e03 57
baxterja 69:014d4bbd4e03 58 void pre_compute_tables() {
baxterja 69:014d4bbd4e03 59 // This function will precompute the cos and sin tables used in the rest of the program
baxterja 69:014d4bbd4e03 60 for(int precompute_counter = 0; precompute_counter < pre_compute_length; precompute_counter++){
baxterja 78:10b2916b8f5c 61 out_val_pre[precompute_counter] = (int) ((cos(twopi * CarrierFrequency /SAMPLEFREQUENCY * precompute_counter)+cos(twopi * 1000 /SAMPLEFREQUENCY * precompute_counter+3.14159265359)) * 1023.0 + 2048.0);//12 bit cos wave
baxterja 69:014d4bbd4e03 62 }
baxterja 73:b059b5bdc664 63
baxterja 73:b059b5bdc664 64 //float decimated_frequency = 6250;
baxterja 73:b059b5bdc664 65 //for(int precompute_counter = 0; precompute_counter < demodulation_length+(INPUT_ARRAY_SIZE/DECIMATION_FACTOR); precompute_counter++){
baxterja 73:b059b5bdc664 66 // i_mod_pre[precompute_counter] = (cos(twopi * CarrierFrequency / decimated_frequency * precompute_counter));
baxterja 73:b059b5bdc664 67 // q_mod_pre[precompute_counter] = (-sin(twopi * CarrierFrequency / decimated_frequency * precompute_counter));
baxterja 73:b059b5bdc664 68
baxterja 69:014d4bbd4e03 69 }
baxterja 69:014d4bbd4e03 70
baxterja 79:5f24cfd685d8 71 void callback() {
baxterja 79:5f24cfd685d8 72 // Note: you need to actually read from the serial to clear the RX interrupt
baxterja 79:5f24cfd685d8 73 printf("%c\n", pc.getc());
baxterja 79:5f24cfd685d8 74 led2 = !led2;
baxterja 79:5f24cfd685d8 75 }
emilmont 7:65188f4a8c25 76 int main() {
baxterja 79:5f24cfd685d8 77
timmey9 22:523e316cbe70 78 led_blue = 1;
timmey9 35:df40c4566826 79 led_green = 1;
timmey9 18:b17ddeeb1c09 80 led_red = 1;
timmey9 34:44cc9b76a507 81
baxterja 79:5f24cfd685d8 82 pre_compute_tables();
baxterja 79:5f24cfd685d8 83 precompute_tables();
baxterja 79:5f24cfd685d8 84 //turn off all LEDs
baxterja 73:b059b5bdc664 85
baxterja 79:5f24cfd685d8 86
baxterja 79:5f24cfd685d8 87
baxterja 79:5f24cfd685d8 88
baxterja 73:b059b5bdc664 89
baxterja 73:b059b5bdc664 90 pc.baud(230400);
baxterja 79:5f24cfd685d8 91
baxterja 79:5f24cfd685d8 92 //pc.printf("High: %x Mid: %x Low: %x",SIM->UIDH,SIM->UIDML,SIM->UIDL);
baxterja 79:5f24cfd685d8 93 if(SIM->UIDH == 0x12ffff && SIM->UIDML == 0x4e453103 && SIM->UIDL == 0x60010030) probe_number = 1;
baxterja 79:5f24cfd685d8 94 if(SIM->UIDH == 0x19ffff && SIM->UIDML == 0x4d441504 && SIM->UIDL == 0x90110031) probe_number = 2;
baxterja 79:5f24cfd685d8 95 if(SIM->UIDH == 0x10ffff && SIM->UIDML == 0x4e453105 && SIM->UIDL == 0x100b0031) probe_number = 3;
baxterja 79:5f24cfd685d8 96 if(SIM->UIDH == 0x14ffff && SIM->UIDML == 0x4e453154 && SIM->UIDL == 0x5009002b) probe_number = 4;
baxterja 79:5f24cfd685d8 97 if(SIM->UIDH == 0x2effff && SIM->UIDML == 0x4e453154 && SIM->UIDL == 0x1004001e) probe_number = 5;
baxterja 79:5f24cfd685d8 98
baxterja 79:5f24cfd685d8 99 /*
baxterja 79:5f24cfd685d8 100 while(!pc.readable())
baxterja 79:5f24cfd685d8 101 {
baxterja 79:5f24cfd685d8 102 continue;
baxterja 79:5f24cfd685d8 103 }
baxterja 79:5f24cfd685d8 104 pc.printf("%d",probe_number);
baxterja 79:5f24cfd685d8 105 */
baxterja 79:5f24cfd685d8 106 int DAC_COUNTER = 0;
baxterja 79:5f24cfd685d8 107 //SIM_UIDH == 0x20ffff && SIM_UIDML == 0x4e453103 && SIM_UIDL == 0x60010028)
baxterja 79:5f24cfd685d8 108 //printf("High: %x Mid: %x Low: %x",SIM->UIDH,SIM->UIDML,SIM->UIDL);
baxterja 78:10b2916b8f5c 109
baxterja 78:10b2916b8f5c 110 //Fs = 100000, FPass = 1500, FStop = 4500, -40db
baxterja 78:10b2916b8f5c 111 float Coeffs_100k[64] = {0.00368762746013400, -0.00390835182721185, -0.00352466159836192, -0.00378044968164769, -0.00434746630849834, -0.00502920744118478, -0.00570543677799210, -0.00628464650365093, -0.00668691824262464, -0.00683917139561193, -0.00667505410229485, -0.00613341508706847, -0.00516232410283893, -0.00371868951723358, -0.00177417571286934, 0.000685809876396031, 0.00365648516386919, 0.00711658039739992, 0.0110234409358280, 0.0153179248880130, 0.0199204447074274, 0.0247385052308702, 0.0296636617979935, 0.0345813441342327, 0.0393672306749833, 0.0438989152744108, 0.0480511039644129, 0.0517108728403463, 0.0547710075854812, 0.0571509837193129, 0.0587848911618005, 0.0596038010741317, 0.0596038010741317, 0.0587848911618005, 0.0571509837193129, 0.0547710075854812, 0.0517108728403463, 0.0480511039644129, 0.0438989152744108, 0.0393672306749833, 0.0345813441342327, 0.0296636617979935, 0.0247385052308702, 0.0199204447074274, 0.0153179248880130, 0.0110234409358280, 0.00711658039739992, 0.00365648516386919, 0.000685809876396031, -0.00177417571286934, -0.00371868951723358, -0.00516232410283893, -0.00613341508706847, -0.00667505410229485, -0.00683917139561193, -0.00668691824262464, -0.00628464650365093, -0.00570543677799210, -0.00502920744118478, -0.00434746630849834, -0.00378044968164769, -0.00352466159836192, -0.00390835182721185, 0.00368762746013400};
baxterja 78:10b2916b8f5c 112 //FS = 12500, Fpass = 100 Fstop 595 -50 db, picks on 1KHz signal
baxterja 78:10b2916b8f5c 113 float Coeffs_12500[64] = {-0.00222124676855946, -0.00163176345559825, -0.00214372257722720, -0.00268653504526241, -0.00323192624665395, -0.00374368158669702, -0.00417907979321931, -0.00449328006488225, -0.00463658803501384, -0.00455550760053878, -0.00419848205106894, -0.00352024663122325, -0.00247317556122392, -0.00102679426345247, 0.000845020041268567, 0.00315252023354445, 0.00589238992243332, 0.00904676286706929, 0.0125796442526745, 0.0164391331165775, 0.0205582919104753, 0.0248562683452381, 0.0292399202971496, 0.0336089813533200, 0.0378556202824368, 0.0418719268554270, 0.0455508704073759, 0.0487915537931733, 0.0515035460002020, 0.0536094934833149, 0.0550483048257919, 0.0557785148825623, 0.0557785148825623, 0.0550483048257919, 0.0536094934833149, 0.0515035460002020, 0.0487915537931733, 0.0455508704073759, 0.0418719268554270, 0.0378556202824368, 0.0336089813533200, 0.0292399202971496, 0.0248562683452381, 0.0205582919104753, 0.0164391331165775, 0.0125796442526745, 0.00904676286706929, 0.00589238992243332, 0.00315252023354445, 0.000845020041268567, -0.00102679426345247, -0.00247317556122392, -0.00352024663122325, -0.00419848205106894, -0.00455550760053878, -0.00463658803501384, -0.00449328006488225, -0.00417907979321931, -0.00374368158669702, -0.00323192624665395, -0.00268653504526241, -0.00214372257722720, -0.00163176345559825, -0.00222124676855946};
baxterja 78:10b2916b8f5c 114 //Fs = 1562.5 Fpass = 100, FStop = 195.6, null at 200 Hz
baxterja 78:10b2916b8f5c 115 float Coeffs_1563[32] = {-0.00296990567211633, 0.00784631357544163, 0.00955642274001412, 0.0105078670942049, 0.00746432577935901, -0.000715888274492355, -0.0127656342089486, -0.0248578255670040, -0.0313597093257934, -0.0264804428976321, -0.00639056527392095, 0.0289495639622991, 0.0749846381319702, 0.123239880157668, 0.163403327438059, 0.186215627611441, 0.186215627611441, 0.163403327438059, 0.123239880157668, 0.0749846381319702, 0.0289495639622991, -0.00639056527392095, -0.0264804428976321, -0.0313597093257934, -0.0248578255670040, -0.0127656342089486, -0.000715888274492355, 0.00746432577935901, 0.0105078670942049, 0.00955642274001412, 0.00784631357544163, -0.00296990567211633};
baxterja 78:10b2916b8f5c 116 //Fs = 781.25, Fpass = 60, Fstop = 120, -50 Db
baxterja 78:10b2916b8f5c 117 float Coeffs_782[32] = {-0.00423132648651131, -0.00413085595827858, -0.00212955364173648, 0.00345345707266939, 0.0105870277845968, 0.0147191914630408, 0.0108878516242339, -0.00283458314983071, -0.0224398052018669, -0.0377493805765767, -0.0358474685211045, -0.00721456868509791, 0.0483564412276129, 0.119338204671425, 0.185468453617916, 0.225354002914126, 0.225354002914126, 0.185468453617916, 0.119338204671425, 0.0483564412276129, -0.00721456868509791, -0.0358474685211045, -0.0377493805765767, -0.0224398052018669, -0.00283458314983071, 0.0108878516242339, 0.0147191914630408, 0.0105870277845968, 0.00345345707266939, -0.00212955364173648, -0.00413085595827858, -0.00423132648651131};
baxterja 76:704fc58ffcd0 118
baxterja 73:b059b5bdc664 119 float Coeffs[20] = {0.0328368433284673, 0.0237706090075265, 0.0309894695180997, 0.0385253568846695, 0.0459996974310349, 0.0530165318016261, 0.0591943866845610, 0.0641755708098907, 0.0676960677594849, 0.0694621149975389, 0.0694621149975389, 0.0676960677594849, 0.0641755708098907, 0.0591943866845610, 0.0530165318016261, 0.0459996974310349, 0.0385253568846695, 0.0309894695180997, 0.0237706090075265, 0.0328368433284673};
baxterja 73:b059b5bdc664 120 float Coeffs2[20] = {-0.00506451294187997, -0.00824932319607346, -0.00986370066237912, -0.00518913235010027, 0.00950858650162284, 0.0357083149022659, 0.0711557142019980, 0.109659494661247, 0.142586101123340, 0.161603335553589, 0.161603335553589, 0.142586101123340, 0.109659494661247, 0.0711557142019980, 0.0357083149022659, 0.00950858650162284, -0.00518913235010027, -0.00986370066237912, -0.00824932319607346, -0.00506451294187997};
baxterja 73:b059b5bdc664 121
baxterja 73:b059b5bdc664 122 for(int i = 0; i < 8; i++)
baxterja 77:1ee17a9e9f8b 123 input_50k[i] = new float[64];//each array represents the input of the adcs
baxterja 78:10b2916b8f5c 124
baxterja 78:10b2916b8f5c 125
baxterja 78:10b2916b8f5c 126 filters f4 = filters(4, 8, NULL, 8, 32, Coeffs_782,DEMOD_No_Demod);
baxterja 78:10b2916b8f5c 127 filters f3 = filters(4, 2, &f4, 4, 32, Coeffs_1563,DEMOD_No_Demod);
baxterja 78:10b2916b8f5c 128 filters f2 = filters(4, 8, &f3, 8, 64, Coeffs_12500,DEMOD_No_Demod);
baxterja 78:10b2916b8f5c 129 filters f1 = filters(2, 8, &f2, 64, 64, Coeffs_100k,DEMOD_200HZ);
baxterja 73:b059b5bdc664 130
baxterja 78:10b2916b8f5c 131 filters f4_b = filters(4, 8, NULL, 8, 32, Coeffs_782,DEMOD_No_Demod);
baxterja 78:10b2916b8f5c 132 filters f3_b = filters(4, 2, &f4_b, 4, 32, Coeffs_1563,DEMOD_No_Demod);
baxterja 78:10b2916b8f5c 133 filters f2_b = filters(4, 8, &f3_b, 8, 64, Coeffs_12500,DEMOD_No_Demod);
baxterja 78:10b2916b8f5c 134 filters f1_b = filters(2, 8, &f2_b, 64, 64, Coeffs_100k,DEMOD_1000HZ);
baxterja 73:b059b5bdc664 135
baxterja 78:10b2916b8f5c 136 //filters f_pre = filters(2, 2, &f1, 64, 64, Coeffs_50k,false);
baxterja 69:014d4bbd4e03 137
baxterja 73:b059b5bdc664 138 //float output_print_buffer[PRINT_BUFFER_LENGTH];//used to store the adc0 values(current measurment)
baxterja 73:b059b5bdc664 139 //float output_print_buffer2[PRINT_BUFFER_LENGTH];//used to store the adc0 values(voltage measurment)
baxterja 70:8cd7a8a2c153 140 int print_buffer_count = 0;
baxterja 70:8cd7a8a2c153 141
bmazzeo 66:72c5c24e532c 142 pdb_init(); // Initalize PDB
bmazzeo 66:72c5c24e532c 143 dac_init(); // initializes DAC
timmey9 45:d591d138cdeb 144 adc_init(); // always initialize adc before dma
bmazzeo 53:83a90a47c1fd 145 pc.printf("ADC Initialized\r\n");
baxterja 74:ebc9f09fda11 146 dma_init2(); // initializes DMAs
bmazzeo 55:2526b3317bc8 147 dma_reset(); // This clears any DMA triggers that may have gotten things into a different state
bmazzeo 67:ec0c58490ce6 148 pc.printf("Buffer Size: %i\r\n", len);
bmazzeo 54:1697dc574b96 149
timmey9 46:a015ebf4663b 150 led_green = 1;
baxterja 79:5f24cfd685d8 151 pc.printf("High: %x Mid: %x Low: %x",SIM->UIDH,SIM->UIDML,SIM->UIDL);
timmey9 40:bd6d8c35e822 152 pc.printf("\r\n\r\n\r\n");
timmey9 37:8bdc71f3e874 153
bmazzeo 64:bb4a4bd57681 154 pdb_start();
baxterja 70:8cd7a8a2c153 155 //while(print_buffer_count<PRINT_BUFFER_LENGTH)
baxterja 73:b059b5bdc664 156 while(!GATHER_STATISTICS||print_buffer_count<PRINT_BUFFER_LENGTH)
baxterja 73:b059b5bdc664 157 {
baxterja 79:5f24cfd685d8 158 if(pc.readable())//if the python code has sent any characters recently
baxterja 79:5f24cfd685d8 159 {
baxterja 79:5f24cfd685d8 160 while(pc.readable()){pc.getc();}
baxterja 79:5f24cfd685d8 161 pc.printf("p%d",probe_number);
baxterja 79:5f24cfd685d8 162 }
baxterja 79:5f24cfd685d8 163
baxterja 73:b059b5bdc664 164 while(sampling_status == 0)//wait until the ADCs read a new value
baxterja 73:b059b5bdc664 165 {
baxterja 73:b059b5bdc664 166 status_0 = 1;
baxterja 77:1ee17a9e9f8b 167 print_filter_data(&pc);
baxterja 75:8bb94685c80b 168 //Thread::wait(.0001);
baxterja 73:b059b5bdc664 169 }
baxterja 73:b059b5bdc664 170 sampling_status = 0;//sets sampling status to 0. DMA sets it to one once ADCs sample
baxterja 73:b059b5bdc664 171 status_0 = 0;//Tied to D0. use an O-scope to measure how much free time there is to play with.
baxterja 73:b059b5bdc664 172 status_1 = 1;//Tied to D1. use an O-scope to measure how much time the processing takes
baxterja 73:b059b5bdc664 173
baxterja 77:1ee17a9e9f8b 174 for(int i = 0; i < len; i++)
bmazzeo 61:a56cca07d4a6 175 {
baxterja 73:b059b5bdc664 176 static_output_array0[i] = out_val_pre[DAC_COUNTER];//DAC output
baxterja 73:b059b5bdc664 177 DAC_COUNTER++;//Counter to kepp track of where we are in our precomputed table
baxterja 73:b059b5bdc664 178 if (DAC_COUNTER>=pre_compute_length) {DAC_COUNTER = 0;}//wrap around the counter
baxterja 77:1ee17a9e9f8b 179 //static_output_array0[i+1] = out_val_pre[DAC_COUNTER];//DAC output
baxterja 77:1ee17a9e9f8b 180 //DAC_COUNTER++;//Counter to kepp track of where we are in our precomputed table
baxterja 77:1ee17a9e9f8b 181 //if (DAC_COUNTER>=pre_compute_length) {DAC_COUNTER = 0;}//wrap around the counter
baxterja 73:b059b5bdc664 182
baxterja 77:1ee17a9e9f8b 183 input_50k[1][i]=float(static_input_array1[i]);
baxterja 77:1ee17a9e9f8b 184 // input_50k[3][i/2]=static_input_array1[i+1];
baxterja 77:1ee17a9e9f8b 185 input_50k[0][i]=float(static_input_array0[i]);
baxterja 77:1ee17a9e9f8b 186 //input_50k[2][i/2]=static_input_array0[i+1];
baxterja 73:b059b5bdc664 187
baxterja 73:b059b5bdc664 188
baxterja 73:b059b5bdc664 189
baxterja 73:b059b5bdc664 190 }//End of for loop going throught the buffer of adc samples
baxterja 77:1ee17a9e9f8b 191 //input_50k[0] = static_input_array0;
baxterja 77:1ee17a9e9f8b 192 //input_50k[1] = static_input_array1;
baxterja 78:10b2916b8f5c 193 f1.input(input_50k,64,DEMOD_200HZ);
baxterja 78:10b2916b8f5c 194 f1_b.input(input_50k,64,DEMOD_1000HZ);
baxterja 77:1ee17a9e9f8b 195 //status_3 = 1;
baxterja 77:1ee17a9e9f8b 196 //pc.printf("Y");
baxterja 77:1ee17a9e9f8b 197 //status_3 = 0;
baxterja 73:b059b5bdc664 198
baxterja 70:8cd7a8a2c153 199
baxterja 73:b059b5bdc664 200 status_1 = 0;//turn off D1 used in deterimining how long processing is taking
baxterja 73:b059b5bdc664 201 //filter_input_array[i] = (float) (((int)static_input_array0[i]) - 0x8000);
baxterja 73:b059b5bdc664 202 //arm_fir_f32(&S, filter_input_array, filter_output_array, len);
baxterja 73:b059b5bdc664 203
baxterja 73:b059b5bdc664 204 }//end of while loop
baxterja 73:b059b5bdc664 205
baxterja 73:b059b5bdc664 206 //for(int i = 0; i<PRINT_BUFFER_LENGTH; i++)//print all the adc values measured
baxterja 73:b059b5bdc664 207 //{
baxterja 73:b059b5bdc664 208 // printf("%.1f %.1f\n\r",output_print_buffer[i],output_print_buffer2[i]);
baxterja 73:b059b5bdc664 209 //}
baxterja 73:b059b5bdc664 210
baxterja 70:8cd7a8a2c153 211
bmazzeo 61:a56cca07d4a6 212 }
bmazzeo 63:7903a33e2fd4 213