protofuse-firmware Changeset - d98fd1240e20

Changeset - d98fd1240e20

Parent rev.

Child rev.

[Not reviewed]

tip default

0 3 0

Nick Orlando (NEO) - 9 years ago 2016-11-03 22:59:01
nick.orlando67@gmail.com

fixed bug that caused all analogs to read same ADC value.

3 files changed with 12 insertions and 10 deletions:

src/adc.c

src/buttons.c

src/main.c

0 comments (0 inline, 0 general)

src/adc.c

➞

Show inline comments

@@ @@ -62,25 +62,25 @@ void adc_init(void) @@
 	/**Common config
 	*/
 	hadc1.Instance = ADC1;
 	hadc1.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
 	hadc1.Init.Resolution = ADC_RESOLUTION_12B;
 	hadc1.Init.ScanConvMode = ADC_SCAN_ENABLE;
 	hadc1.Init.ContinuousConvMode = ENABLE;
 	hadc1.Init.DiscontinuousConvMode = DISABLE;
 	hadc1.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
 	hadc1.Init.DataAlign = ADC_DATAALIGN_RIGHT;
-	hadc1.Init.NbrOfConversion = 1;
+	hadc1.Init.NbrOfConversion = 3;
 	hadc1.Init.DMAContinuousRequests = ENABLE;
 	hadc1.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
 	hadc1.Init.LowPowerAutoWait = DISABLE;
 	hadc1.Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
 	HAL_ADC_Init(&hadc1);
 	/* Peripheral DMA init*/
 	hdma_adc1.Instance = DMA1_Channel1;
 	hdma_adc1.Init.Direction = DMA_PERIPH_TO_MEMORY;
 	hdma_adc1.Init.PeriphInc = DMA_PINC_DISABLE;

src/buttons.c

➞

Show inline comments

@@ @@ -50,27 +50,29 @@ void freaking_debounce(void) @@
 //			ssd1306_drawstring(buffer, 1, 0);
+		}
 		if(sw_btn_avg > u_thresh)
+		{
 			sw_btn_state = PRESSED;
 //			snprintf(buffer, 256, "PRESSED    ");
 //			ssd1306_drawstring(buffer, 1, 0);
+		}
 		// do something when state has changed
 		if((sw_btn_state == PRESSED) && (sw_btn_old_state == NOT_PRESSED))
+		{
 			temp_counter++;
 			snprintf(buffer, 256, "%i", temp_counter);
 			ssd1306_drawstring(buffer, 1, 0);
 //			temp_counter++;
 //			snprintf(buffer, 256, "%i", temp_counter);
 //			ssd1306_drawstring(buffer, 1, 0);
 			HAL_GPIO_TogglePin(LED_RED);
 			HAL_GPIO_TogglePin(GATE_DRIVE);
+		}
 //		snprintf(buffer, 256, "sw-btn-avg: %.1f", sw_btn_avg);
 //		ssd1306_drawstring(buffer, 2, 0);
 		// save previous button states
 		sw_btn_old_state = sw_btn_state;
 		last_button_debounce_time = HAL_GetTick();
+	}
+}

src/main.c

➞

Show inline comments

@@ @@ -48,30 +48,30 @@ int main(void) @@
 	while (1)
+	{
 		// function that checks all the buttons
 		freaking_debounce();
 		// Grab and transmit data
 		if(HAL_GetTick() - last_screen_update_time > 100)
+		{
 			char buffer[256];
 			snprintf(buffer, 256, "Counter: %.1f", temp_counter);
 			ssd1306_drawstring(buffer, 0, 0);
 //			snprintf(buffer, 256, "VBATT CNTS: %u", get_vbat_counts());
 //			ssd1306_drawstring(buffer, 1, 0);
 //			snprintf(buffer, 256, "IADC CNTS: %u", get_viout_counts());
 //			ssd1306_drawstring(buffer, 2, 0);
 //			snprintf(buffer, 256, "GIADC CNTS: %u", get_vgiout_counts());
 //			ssd1306_drawstring(buffer, 3, 0);
 			snprintf(buffer, 256, "VBATT CNTS: %u", get_vbat_counts());
 			ssd1306_drawstring(buffer, 1, 0);
 			snprintf(buffer, 256, "IADC CNTS: %u", get_viout_counts());
 			ssd1306_drawstring(buffer, 2, 0);
 			snprintf(buffer, 256, "GIADC CNTS: %u", get_vgiout_counts());
 			ssd1306_drawstring(buffer, 3, 0);
 			temp_counter = temp_counter + 0.1;
 			last_screen_update_time = HAL_GetTick();
+		}
 		watchdog_feed();
+	}
+}

0 comments (0 inline, 0 general)