diff --git a/lambda-test/Makefile b/lambda-test/Makefile index 4aa6694..143f553 100644 --- a/lambda-test/Makefile +++ b/lambda-test/Makefile @@ -30,9 +30,12 @@ ########## (Can override. See bottom of file.) ########## ##########------------------------------------------------------########## -PROGRAMMER_TYPE = avrisp +# PROGRAMMER_TYPE = avrisp +# PROGRAMMER_TYPE = avrispmkII +PROGRAMMER_TYPE = jtag2isp # extra arguments to avrdude: baud rate, chip type, -F flag, etc. -PROGRAMMER_ARGS = -b 19200 -P /dev/ttyACM3 +# PROGRAMMER_ARGS = -b 19200 -P /dev/ttyACM3 +PROGRAMMER_ARGS = ##########------------------------------------------------------########## ########## Makefile Magic! ########## diff --git a/lambda/.cproject b/lambda/.cproject index 64b02fc..72859bb 100644 --- a/lambda/.cproject +++ b/lambda/.cproject @@ -15,22 +15,22 @@ - diff --git a/lambda/DEBUG b/lambda/DEBUG index 618224c..cf575b5 100644 --- a/lambda/DEBUG +++ b/lambda/DEBUG @@ -1,8 +1,30 @@ -Compile: avr-gcc -Wall -g2 -gstabs -O0 -std=gnu99 -funsigned-char -funsigned-bitfields -mmcu=atmega328p -DF_CPU=1000000UL -Create hex: avr-objcopy -R .eeprom -O ihex lambda.elf lambda.hex -Upload hex: avrdude -pm328p -cjtag2isp -B10 -Uflash:w:lambda.hex:a -Start AVaRICE: avarice -2 -w -B10 -j usb :4242 -Start avr-gdb: avr-gdb lambda.elf -Connect to remote: target remote localhost:4242 -Set breakpoint: break lambda.c:74 -Continue: continue \ No newline at end of file +Compile: +avr-gcc -Wall -g2 -gstabs -O0 -std=gnu99 -funsigned-char -funsigned-bitfields -mmcu=atmega328p -DF_CPU=1000000UL + +Create hex: +avr-objcopy -R .eeprom -O ihex lambda.elf lambda.hex + +Debug info: +avr-objdump -g lambda.elf > debug.txt + +Upload hex: +avrdude -pm328p -cjtag2isp -B10 -Uflash:w:lambda.hex:a + +Start AVaRICE: +avarice -2 -w -B10 -j usb :4242 + +Start avr-gdb: +avr-gdb lambda.elf + +Connect to remote: +target remote localhost:4242 + +Set breakpoint: +break lambda.c:74 + +Continue: +continue + +Show variables, eval code: +p time +p getTime() \ No newline at end of file diff --git a/lambda/Makefile b/lambda/Makefile index fc4cf81..d6d963b 100644 --- a/lambda/Makefile +++ b/lambda/Makefile @@ -26,11 +26,11 @@ ##########------------------------------------------------------########## # PROGRAMMER_TYPE = avrisp -PROGRAMMER_TYPE = avrispmkII -# PROGRAMMER_TYPE = jtag2isp +# PROGRAMMER_TYPE = avrispmkII +PROGRAMMER_TYPE = jtag2isp # extra arguments to avrdude: baud rate, chip type, -F flag, etc. # PROGRAMMER_ARGS = -b 19200 -P /dev/ttyACM3 -PROGRAMMER_ARGS = -b 19200 +PROGRAMMER_ARGS = ##########------------------------------------------------------########## ########## Makefile Magic! ########## diff --git a/lambda/airgate.c b/lambda/airgate.c index 2672b67..fd172be 100644 --- a/lambda/airgate.c +++ b/lambda/airgate.c @@ -107,6 +107,10 @@ } uint8_t getAirgateInPercent(void) { + if (getAirgate() == 0) { + return 0; + } + return 100 / (AIRGATE_OPEN / getAirgate()); } diff --git a/lambda/scheduler.h b/lambda/scheduler.h index 30c772c..ec1fe8b 100644 --- a/lambda/scheduler.h +++ b/lambda/scheduler.h @@ -29,7 +29,7 @@ typedef struct { void (*func)(void); uint16_t delay; - uint16_t time; + uint32_t time; bool done; } Task;