.gitignore

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

measurement-data/Analog_Measurement_Analysis.ipynb

@@ -346,12 +346,7 @@
     "# Read in data\n",
     "kilo_ohm_sampling1 = pd.read_csv(r'1000OhmSamplingFixedStableCircuit.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'),\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"
+    "plot_data_tuples = [(kilo_ohm_sampling1, 'Day 1 Sampling -- Stable circuit -- RT'), (kilo_ohm_sampling1_ht, 'Day 1 Sampling -- Stable circuit -- HT')]\n"
    ]
   },
   {
@@ -373,8 +368,8 @@
     "    calculate_temp_for_df(df, resistance_col_name='pt1000_value')\n",
     "\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[1], df['temp_calculated'], 21, title, 'Calculated Temperature in °C')\n",
+    "    plot_histogram(ax[0], df['pt1000_value'], 5, title, 'PT1000 Resistance')\n",
+    "    plot_histogram(ax[1], df['temp_calculated'], 5, title, 'Calculated Temperature in °C')\n",
     "\n",
     "plt.tight_layout()\n",
     "plt.show()"
@@ -386,7 +381,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "calc_temp(1000.)-calc_temp(1000.4)"
+    "calc_temp(1100)"
    ]
   }
  ],

stm-firmware/adc-meas.c

@@ -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;
 
 	/* 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)