diff options
| author | Selene ToyKeeper | 2021-11-06 00:58:59 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2021-11-06 00:58:59 -0600 |
| commit | 046a76deda6c3e586162dacd28b18371629ab990 (patch) | |
| tree | 649814ac426c1543d2d8d52df1c2bf6c8a9a3583 /spaghetti-monster/fsm-ramping.h | |
| parent | merged gchart's recent changes (diff) | |
| parent | fixed KR4-tintramp build (switch wasn't working) and added it to MODELS (diff) | |
| download | anduril-046a76deda6c3e586162dacd28b18371629ab990.tar.gz anduril-046a76deda6c3e586162dacd28b18371629ab990.tar.bz2 anduril-046a76deda6c3e586162dacd28b18371629ab990.zip | |
merged recent anduril2 branch updates
Diffstat (limited to 'spaghetti-monster/fsm-ramping.h')
| -rw-r--r-- | spaghetti-monster/fsm-ramping.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/spaghetti-monster/fsm-ramping.h b/spaghetti-monster/fsm-ramping.h index c1f6064..de090c2 100644 --- a/spaghetti-monster/fsm-ramping.h +++ b/spaghetti-monster/fsm-ramping.h @@ -48,26 +48,26 @@ void update_tint(); // auto-detect the data type for PWM tables #ifndef PWM_BITS -#define PWM_BITS 8 -#define PWM_TOP 255 + #define PWM_BITS 8 + #define PWM_TOP 255 #endif #if PWM_BITS <= 8 -#define PWM_DATATYPE uint8_t -#define PWM_DATATYPE2 uint16_t -#define PWM_TOP 255 -#define PWM_GET(x,y) pgm_read_byte(x+y) + #define PWM_DATATYPE uint8_t + #define PWM_DATATYPE2 uint16_t + #define PWM_TOP 255 + #define PWM_GET(x,y) pgm_read_byte(x+y) #else -#define PWM_DATATYPE uint16_t -#ifndef PWM_DATATYPE2 -#define PWM_DATATYPE2 uint32_t -#endif -#ifndef PWM_TOP -#define PWM_TOP 1023 // 10 bits by default -#endif -// pointer plus 2*y bytes -//#define PWM_GET(x,y) pgm_read_word(x+(2*y)) -// nope, the compiler was already doing the math correctly -#define PWM_GET(x,y) pgm_read_word(x+y) + #define PWM_DATATYPE uint16_t + #ifndef PWM_DATATYPE2 + #define PWM_DATATYPE2 uint32_t + #endif + #ifndef PWM_TOP + #define PWM_TOP 1023 // 10 bits by default + #endif + // pointer plus 2*y bytes + //#define PWM_GET(x,y) pgm_read_word(x+(2*y)) + // nope, the compiler was already doing the math correctly + #define PWM_GET(x,y) pgm_read_word(x+y) #endif // use UI-defined ramp tables if they exist |