mhu/reflow-oven-control-sw
2
0
Fork 0
Code Issues 4 Pull Requests Releases 4 Wiki Activity

Compare commits

base: mhu:827f5c2066e79cf5c68aba06da52ef5b63dc19ea
Branches Tags
mhu:dev
mhu:temp-profile-checker
mhu:master
mhu:jenkins
mhu:error-mem-viewer
mhu:v0.5-1
mhu:v0.5
mhu:v0.4
mhu:v0.3
mhu:v0.2-test
mhu:v0.1-hardware-test
..
compare: mhu:a6fa35b1eabe050930cd08499d288651e01241ba
Branches Tags
mhu:temp-profile-checker
mhu:dev
mhu:master
mhu:jenkins
mhu:error-mem-viewer
mhu:v0.5-1
mhu:v0.5
mhu:v0.4
mhu:v0.3
mhu:v0.2-test
mhu:v0.1-hardware-test

No commits in common. "827f5c2066e79cf5c68aba06da52ef5b63dc19ea" and "a6fa35b1eabe050930cd08499d288651e01241ba" have entirely different histories.
827f5c2066 ... a6fa35b1ea

5 changed files with 5 additions and 24998 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,4 +4,3 @@
*.hex *.hex
*.map *.map
*.autosave

6735
measurement-data/1000OhmSamplingFixedStableCircuitDay2.csv
View File

File diff suppressed because it is too large Load Diff

18252
measurement-data/1000OhmSamplingFixedStableCircuitDay3.csv
View File

File diff suppressed because it is too large Load Diff

13
measurement-data/Analog_Measurement_Analysis.ipynb
View File

@ -346,12 +346,7 @@
"# Read in data\n", "# Read in data\n",
"kilo_ohm_sampling1 = pd.read_csv(r'1000OhmSamplingFixedStableCircuit.csv')\n", "kilo_ohm_sampling1 = pd.read_csv(r'1000OhmSamplingFixedStableCircuit.csv')\n",
"kilo_ohm_sampling1_ht = pd.read_csv(r'1000OhmSamplingFixedStableCircuitHT.csv')\n", "kilo_ohm_sampling1_ht = pd.read_csv(r'1000OhmSamplingFixedStableCircuitHT.csv')\n",
"kilo_ohm_sampling2 = pd.read_csv(r'1000OhmSamplingFixedStableCircuitDay2.csv')\n", "plot_data_tuples = [(kilo_ohm_sampling1, 'Day 1 Sampling -- Stable circuit -- RT'), (kilo_ohm_sampling1_ht, 'Day 1 Sampling -- Stable circuit -- HT')]\n"
"plot_data_tuples = [(kilo_ohm_sampling1, 'Day 1 Sampling -- Stable circuit -- RT'),\n",
" (kilo_ohm_sampling1_ht, 'Day 1 Sampling -- Stable circuit -- HT'),\n",
" (kilo_ohm_sampling2, 'Day 2 Sampling -- Stable circuit'),\n",
" (pd.read_csv(r'1000OhmSamplingFixedStableCircuitDay3.csv'), 'Day 3 Sampling -- Stable Circuit (improved)')\n",
" ]\n"
] ]
}, },
{ {
@ -373,8 +368,8 @@
" calculate_temp_for_df(df, resistance_col_name='pt1000_value')\n", " calculate_temp_for_df(df, resistance_col_name='pt1000_value')\n",
"\n", "\n",
"for (df,title),ax in zip(plot_data_tuples, axes):\n", "for (df,title),ax in zip(plot_data_tuples, axes):\n",
" plot_histogram(ax[0], df['pt1000_value'], 21, title, 'PT1000 Resistance')\n", " plot_histogram(ax[0], df['pt1000_value'], 5, title, 'PT1000 Resistance')\n",
" plot_histogram(ax[1], df['temp_calculated'], 21, title, 'Calculated Temperature in °C')\n", " plot_histogram(ax[1], df['temp_calculated'], 5, title, 'Calculated Temperature in °C')\n",
"\n", "\n",
"plt.tight_layout()\n", "plt.tight_layout()\n",
"plt.show()" "plt.show()"
@ -386,7 +381,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"calc_temp(1000.)-calc_temp(1000.4)" "calc_temp(1100)"
] ]
} }
], ],

2
stm-firmware/adc-meas.c
View File

@ -263,7 +263,7 @@ static inline __attribute__((optimize("O3"))) float adc_pt1000_dma_avg_pre_filte
sum = sum - (uint32_t)max_val - (uint32_t)min_val; sum = sum - (uint32_t)max_val - (uint32_t)min_val;
/* Divide to get average and return */ /* Divide to get average and return */
return (float)(sum / (ADC_PT1000_DMA_AVG_SAMPLES-2)); return (float)sum / (ADC_PT1000_DMA_AVG_SAMPLES-2);
} }
void ADC_IRQHandler(void) void ADC_IRQHandler(void)