Project: Teacup Firmware
Posted by Triffid_Hunter
|
Re: Project: Teacup Firmware October 07, 2012 06:25AM |
Quote
I do not see where heater_pwm is set to 30
I meant code line 30, like line 30 of the text file representing the code.Quote
Maybe one could disable the PWM output by clearing the heater_pwm pointer to zero somehow.
Zeroing heater_pwm doesn't help, as currently everything PWMable is set to do PWM in mendel.c, line 163ff. A good first step would probably to move this initialisation code into heater_init(), ideally in a way which sets up the PWM pins in use, only and allows different initialisation for different pins.
Would definitions like
/***************************************************************************\ ... * Set "strategy" to ... * * - BANG_BANG to disable PWM and use bang bang instead * * - 76Hz to use low frequency PWM (requires a PWM-able pin) * * - 78kHz to use high frequency PWM (requires a PWM-able pin) * * * \***************************************************************************/ // name port strategy DEFINE_HEATER(extruder, PB3, 76Hz) DEFINE_HEATER(bed, PB4, BANG_BANG) DEFINE_HEATER(fan, PB5, 78kHz)be too complex for newbies? Ideally, making different strategies for different heaters possible.
| Generation 7 Electronics | Teacup Firmware | RepRap DIY |
|
Re: Project: Teacup Firmware November 10, 2012 05:51PM |
Here's another one for heater.c to slow down the amega32U4 10bit timer and let DEBUG report on other PWMs:
v21837:Teacup_Firmware drf$ git diff heater.c
diff --git a/heater.c b/heater.c
index 51ed374..62998e0 100644
--- a/heater.c
+++ b/heater.c
@@ -132,7 +132,10 @@ void heater_init() {
TCCR4A = MASK(PWM4A) | MASK(PWM4
; // enable A and B
TCCR4C = MASK(PWM4D); // and D
TCCR4D = MASK(WGM40); // Phase correct
- TCCR4B = MASK(CS40); // no prescaler
+ TCCR4B = MASK(CS40); // no prescaler 16MhZ
+ #ifndef FAST_PWM
+ TCCR4B = MASK(CS40) | MASK(CS42) | MASK(CS43); // 16mhz / 4096 /256
+ #endif
TC4H = 0; // clear high bits
OCR4C = 0xff; // 8 bit max count at top before reset
#else
@@ -425,7 +428,7 @@ void heater_set(heater_t index, uint8_t value) {
*(heaters[index].heater_pwm) = value;
#ifdef DEBUG
if (DEBUG_PID && (debug_flags & DEBUG_PID))
- sersendf_P(PSTR("PWM{%u = %u}\n"), index, OCR0A);
+ sersendf_P(PSTR("PWM{%u = %u}\n"), index, *heaters[index].heater_pwm);
#endif
}
else {
|
Re: Project: Teacup Firmware November 14, 2012 11:53AM |
Darn. I misread/mispatched the flags. The above patch makes Timer4 slow PWM be 15 Hz. It you want it to match the others' frequencies, then swap CS41 for CS42:
Also here's a bit more for createThermistorTable.py for creating more cut-and-pastable table chunks:
And a third patch to automatically compute and use the dependencies for header files in the Makefile. (I got tired of make clean && make while fiddling with ThermistorTable.h)
Edited 1 time(s). Last edit at 11/14/2012 03:26PM by DaveX.
$ git diff -w upstream Gen7 heater.c
diff --git a/heater.c b/heater.c
index df03488..7c5b162 100644
--- a/heater.c
+++ b/heater.c
@@ -138,9 +138,9 @@ void heater_init() {
TCCR4A = MASK(PWM4A) | MASK(PWM4 ; // enable A and B
TCCR4C = MASK(PWM4D); // and D
TCCR4D = MASK(WGM40); // Phase correct
- TCCR4B = MASK(CS40); // no prescaler
+ TCCR4B = MASK(CS40); // no prescaler 16MHz/256
#ifndef FAST_PWM
- TCCR4B = MASK(CS40) | MASK(CS42) | MASK(CS43); // 16mhz / 4096 /256
+ TCCR4B = MASK(CS40) | MASK(CS41) | MASK(CS43); // 16MHz / 1024 /256
#endif
TC4H = 0; // clear high bits
OCR4C = 0xff; // 8 bit max count at top before reset
Also here's a bit more for createThermistorTable.py for creating more cut-and-pastable table chunks:
$ git diff -w upstream Gen7 createTemperatureLookup.py
diff --git a/createTemperatureLookup.py b/createTemperatureLookup.py
index e0b9f27..c9906a5 100755
--- a/createTemperatureLookup.py
+++ b/createTemperatureLookup.py
@@ -32,6 +32,7 @@ Options:
--min-adc=... the minimum ADC reading to use.
--vadc=... ADC reference voltage (high leg of R2) same as Vcc
--vcc=... Voltage divider supply (high leg of R2) Unused
+ --table Format data as one of an array of tables
It is suggested to generate more values than you need, and delete some of the ones in the ranges
that aren't interesting. This will improve accuracy in the temperature ranges that are important to you.
@@ -91,9 +92,11 @@ def main(argv):
vadc=5.0
vcc=5.0
mult=4
+ table=False
try:
- opts, args = getopt.getopt(argv, "h", ["help", "r0=", "t0=", "beta=", "r1=", "r2=", "max-adc=", "min-adc=", "num-temps=", "vcc=","vadc=","mult
+ opts, args = getopt.getopt(argv, "h", ["help", "r0=", "t0=", "beta=", "r1=", "r2=", "max-adc=", "min-adc=",
+ "num-temps=", "vcc=","vadc=","multiplier=","table"])
except getopt.GetoptError:
usage()
sys.exit(2)
@@ -124,6 +127,8 @@ def main(argv):
vcc = float(arg)
elif opt == "--multiplier":
mult = float(arg)
+ elif opt == "--table":
+ table = True
if r1:
max_adc = int(1023. * r1 / (r1 + r2))
else:
@@ -158,8 +163,8 @@ def main(argv):
print "// Since you'll have to do some testing to determine the correct temperature for your application anyway, you"
print "// may decide that the effort isn't worth it. Who cares if it's reporting the \"right\" temperature as long as it's"
print "// keeping the temperature steady enough to print, right?"
- print "// Temp*%s table from [github.com]" %mult
- print "// ./createTemperatureLookup.py --r0=%s --t0=%s --r1=%s --r2=%s --beta=%s --max-adc=%s --min_adc=%s --multiplier=%s --vadc=%s" % (
+ print "// Temp*%s table from [github.com]" %mult
+ print "// ./createTemperatureLookup.py --r0=%s --t0=%s --r1=%s --r2=%s --beta=%s --max-adc=%s --min-adc=%s --multiplier=%s --vadc=%s" % (
r0, t0, r1, r2, beta, max_adc, min_adc, mult, vadc)
print "// r0: %s" % (r0)
print "// t0: %s" % (t0)
@@ -169,10 +174,15 @@ def main(argv):
print "// min adc: %s at %s V" % (min_adc, min_adc*t.vadc/1024)
print "// max adc: %s at %s V" % (max_adc, max_adc*t.vadc/1024)
print "// ADC counts from {min} to {max} by {x}".format(min=min_adc, max=max_adc, x=increment)
+ if table == True:
+ print "// #define NUMTABLES 1 // These three lines open the temptable[NUMTABLES]... array"
+ print "// #define NUMTEMPS %s // ... " % (len(adcs))
+ print "// uint16_t temptable[NUMTABLES][NUMTEMPS][2] PROGMEM = { // ..."
+ print "{ //" + " Table 0 chunk for B={b}, R0={r0}, R1={r1}, R2={r2}, Vref={v}".format(par="{",b=beta,r0=r0,r1=r1,r2=r2,v=vadc)
+ else:
print "#define NUMTEMPS %s" % (len(adcs))
- print "// {ADC, temp*%s }, // temp Rtherm Vtherm resolution power" % (mult)
print "uint16_t temptable[NUMTEMPS][2] PROGMEM = {"
-
+ print "// {ADC, temp*%s }, // temp Rtherm Vtherm resolution power" % (mult)
counter = 0
for adc in adcs:
counter = counter +1
@@ -183,7 +193,11 @@ def main(argv):
resolution = ( t.temp(adc-1)-t.temp(adc) if adc>1 else t.temp(adc) -t.temp(adc+1))
sep = (',' if counter != len(adcs) else ' ')
print " {%4s, %6s}%s // %7.2f C, %7.0f Ohm, %0.3f V, %0.2f C/count, %0.2fmW" % (adc, int(t.temp(adc)*mult), sep,degC, resistance,vTherm,res
+ if table == False:
print "};"
+ else:
+ print '}, // remove comma for last table chunk'
+ print "// }; // Closure for the temptable[NUMTABLES] array"
def usage():
print __doc__
And a third patch to automatically compute and use the dependencies for header files in the Makefile. (I got tired of make clean && make while fiddling with ThermistorTable.h)
$ git diff -w upstream/Gen7 Makefile
diff --git a/Makefile b/Makefile
index f797024..189c710 100644
--- a/Makefile
+++ b/Makefile
@@ -150,7 +151,7 @@ program: $(PROGRAM).hex config.h
stty 115200 raw ignbrk -hup -echo ixoff < $(PROGPORT)
clean: clean-subdirs
- rm -rf *.o *.elf *.lst *.map *.sym *.lss *.eep *.srec *.bin *.hex *.al *.i *.s *~
+ rm -rf *.o *.elf *.lst *.map *.sym *.lss *.eep *.srec *.bin *.hex *.al *.i *.s *~ .depend
clean-subdirs:
@for dir in $(SUBDIRS); do \
@@ -180,6 +181,16 @@ functionsbysize: $(OBJ)
@echo " CC $@"
@$(CC) -c $(CFLAGS) -Wa,-adhlns=$(<:.c=.al) -o $@ $(subst .o,.c,$@)
+
+depend: .depend
+
+.depend: $(SOURCES)
+ rm -f ./.depend
+ $(CC) $(CFLAGS) -MM $^ > ./.depend;
+
+# pull in dependency info for SOURCES files
+-include .depend
+
%.elf: $(OBJ)
@echo " LINK $@"
@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
Edited 1 time(s). Last edit at 11/14/2012 03:26PM by DaveX.
|
Re: Project: Teacup Firmware November 19, 2012 04:28PM |
Thanks Dave, all three and a half patches applied.
| Generation 7 Electronics | Teacup Firmware | RepRap DIY |
Sorry, only registered users may post in this forum.