investigating the delay problem

tenbaht · tenbaht · commit 192e529bbc61 · 2016-12-19T22:16:18.000+01:00
diff --git a/STM8S_StdPeriph_Driver/src/stm8s.lib b/STM8S_StdPeriph_Driver/src/stm8s.lib
diff --git a/STM8S_StdPeriph_Driver/src/stm8s.lib b/STM8S_StdPeriph_Driver/src/stm8s.lib
@@ -0,0 +1 @@
+stm8s103.lib
diff --git a/sduino/wiring.c b/sduino/wiring.c
@@ -144,6 +144,14 @@ unsigned long micros()
 
 
 void delay(unsigned long ms)
+#if 1
+#warning "using the crappy version of delay()"
+{
+	uint32_t ziel = millis()+ms;
+
+	while(millis()<ziel);	
+}
+#else
 {
 	uint32_t start = micros();
 
@@ -155,7 +163,7 @@ void delay(unsigned long ms)
 		}
 	}
 }
-
+#endif
 /* Delay for the given number of microseconds.  Assumes a 1, 8, 12, 16, 20 or 24 MHz clock. */
 void delayMicroseconds(unsigned int us)
 {
diff --git a/sduino/wiring_analog.c b/sduino/wiring_analog.c
@@ -61,16 +61,23 @@ int analogRead(uint8_t pin)
 	if (pin>=NUM_ANALOG_INPUTS)
 		pin = digitalPinToAnalogChannelMap[pin-NUM_ANALOG_INPUTS];
 	if (pin>=NUM_ANALOG_INPUTS) return 0;	// illegal pin number
-
+//ADC1_ConversionConfig(ADC1_CONVERSIONMODE_SINGLE, pin, ADC1_ALIGN_RIGHT);
+ADC1_ConversionConfig(ADC1_CONVERSIONMODE_CONTINUOUS, pin, ADC1_ALIGN_RIGHT);
+ADC1_PrescalerConfig(ADC1_PRESSEL_FCPU_D18);
+ADC1_ExternalTriggerConfig(ADC1_EXTTRIG_TIM, DISABLE);
+ADC1_SchmittTriggerConfig(pin, DISABLE);
+/*
 	// select channel
 	ADC1->CSR = pin+2;	// arduino channel 0 is Ain2 on STM8S103
-	bitSet(ADC1->CSR, 3);	// right align
-
+	bitSet(ADC1->CR2, 3);	// right align
+*/
 	// start the conversion
-	bitSet(ADC1->CR1, 0);
+//	bitSet(ADC1->CR1, 0);
+	ADC1->CR1 |= ADC1_CR1_ADON;
 
 	// EOC is set when the conversion finishes
-	while (! ADC1->CSR & ADC1_IT_EOC);
+//	while (! (ADC1->CSR & ADC1_IT_EOC));
+delay(2);
 
 	// in right align mode we have to read DRL first
 	low  = ADC1->DRL;
diff --git a/test/adc1/adc1.c b/test/adc1/adc1.c
@@ -3,14 +3,14 @@
  */
 
 #include "Arduino.h"
-#include "HardwareSerial.h"
-#include "Print.h"
+#include "Serial.h"
 
 #include "stm8s_flash.h"
 
 void setup(void)
 {
-	HardwareSerial_begin(115200);
+	Serial_begin(115200);
+	Serial_println_s("ADC test");
 
 	// configure analog pins for input
 	pinMode(A0, INPUT);
@@ -27,7 +27,7 @@ void loop (void)
 
 	for (i=0; i<5; ++i) {
 		// use channel numbers for reading the inputs
-		Print_print_u(analogRead(i));
+		Serial_print_u(analogRead(i));
 		printStr("\t");
 	};
 	println();
diff --git a/test/timer2/timer2.c b/test/timer2/timer2.c
@@ -8,6 +8,23 @@
 #include "Print.h"
 
 
+uint32_t prev=0;
+
+
+void mydelay(unsigned long ms)
+{
+	uint32_t start = micros();
+
+	while (ms > 0) {
+//		yield();
+		while ( ms > 0 && (micros() - start) >= 1000) {
+			ms--;
+			start += 1000;
+		}
+	}
+}
+
+
 void setup(void)
 {
     HardwareSerial_begin(115200);
@@ -16,12 +33,18 @@ void setup(void)
 
 void loop (void)
 {
-	uint32_t i;
+	uint32_t now;
 
+	now = millis();
 	Print_print_s("millis()=");
-	Print_print_u(millis());
+	Print_print_u(now);
+	Print_print_s("\tdelta=");
+	Print_print_u(now-prev);
+	Print_print_s("\tmicros()=");
+	Print_print_u(micros());
 	Print_print_s("\tTIM4_CNTR=");
 	Print_println_u(TIM4->CNTR);
 
-	delay(1000);
+	prev = now;
+	mydelay(1000);
 }

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,14 @@ unsigned long micros()`
`144`	`144`
`145`	`145`
`146`	`146`	`void delay(unsigned long ms)`
	`147`	`+#if 1`
	`148`	`+#warning "using the crappy version of delay()"`
	`149`	`+{`
	`150`	`+ uint32_t ziel = millis()+ms;`
	`151`	`+`
	`152`	`+ while(millis()<ziel);`
	`153`	`+}`
	`154`	`+#else`
`147`	`155`	`{`
`148`	`156`	`uint32_t start = micros();`
`149`	`157`
`@@ -155,7 +163,7 @@ void delay(unsigned long ms)`
`155`	`163`	`}`
`156`	`164`	`}`
`157`	`165`	`}`
`158`		`-`
	`166`	`+#endif`
`159`	`167`	`/* Delay for the given number of microseconds. Assumes a 1, 8, 12, 16, 20 or 24 MHz clock. */`
`160`	`168`	`void delayMicroseconds(unsigned int us)`
`161`	`169`	`{`