ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:r0ket/r0ket

This commit is contained in:
Stefan `Sec` Zehl 2011-08-03 23:16:41 +02:00
parent fe500650e9 94926a1958
commit aeec12c3eb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/applications/final/flame.c
View File

@ -94,7 +94,7 @@ void tick_flame(void) { // every 10ms
} }
if (flameMode == FLAME_UP) { if (flameMode == FLAME_UP) {
if (flameI2Cpwm + flameSpeedUp > flameI2Cpwm ) { if (0xFF - flameI2Cpwm >= flameSpeedUp ) {
flameI2Cpwm += flameSpeedUp; flameI2Cpwm += flameSpeedUp;
} else { } else {
flameI2Cpwm = 0xFF; flameI2Cpwm = 0xFF;
@ -113,7 +113,7 @@ void tick_flame(void) { // every 10ms
} }
if (flameMode == FLAME_DOWN) { if (flameMode == FLAME_DOWN) {
if (flameI2Cpwm - flameSpeedDown < flameI2Cpwm ) { if (flameSpeedDown <= flameI2Cpwm) {
flameI2Cpwm -= flameSpeedDown; flameI2Cpwm -= flameSpeedDown;
} else { } else {
flameI2Cpwm = 0x00; flameI2Cpwm = 0x00;

4
firmware/applications/flame.c
View File

@ -84,7 +84,7 @@ void tick_flame(void) { // every 10ms
} }
if (flameMode == FLAME_UP) { if (flameMode == FLAME_UP) {
if (flameI2Cpwm + flameSpeedUp > flameI2Cpwm ) { if (0xFF - flameI2Cpwm >= flameSpeedUp) {
flameI2Cpwm += flameSpeedUp; flameI2Cpwm += flameSpeedUp;
} else { } else {
flameI2Cpwm = 0xFF; flameI2Cpwm = 0xFF;
@ -103,7 +103,7 @@ void tick_flame(void) { // every 10ms
} }
if (flameMode == FLAME_DOWN) { if (flameMode == FLAME_DOWN) {
if (flameI2Cpwm - flameSpeedDown < flameI2Cpwm ) { if (flameSpeedDown <= flameI2Cpwm) {
flameI2Cpwm -= flameSpeedDown; flameI2Cpwm -= flameSpeedDown;
} else { } else {
flameI2Cpwm = 0x00; flameI2Cpwm = 0x00;