@@ -488,28 +488,30 @@ class GGWave {
488
488
protocols.data [i].name = nullptr ;
489
489
protocols.data [i].enabled = false ;
490
490
}
491
- #ifndef ARDUINO
492
- #define PSTR (str ) (str)
491
+
492
+ #if defined(ARDUINO_AVR_UNO)
493
+ // For Arduino Uno, we put the strings in PROGMEM to save as much RAM as possible:
494
+ #define GGWAVE_PSTR PSTR
495
+ #else
496
+ #define GGWAVE_PSTR (str ) (str)
493
497
#endif
494
498
495
499
#ifndef GGWAVE_CONFIG_FEW_PROTOCOLS
496
- protocols.data [GGWAVE_PROTOCOL_AUDIBLE_NORMAL] = { PSTR (" Normal" ), 40 , 9 , 3 , 1 , true , };
497
- protocols.data [GGWAVE_PROTOCOL_AUDIBLE_FAST] = { PSTR (" Fast" ), 40 , 6 , 3 , 1 , true , };
498
- protocols.data [GGWAVE_PROTOCOL_AUDIBLE_FASTEST] = { PSTR (" Fastest" ), 40 , 3 , 3 , 1 , true , };
499
- protocols.data [GGWAVE_PROTOCOL_ULTRASOUND_NORMAL] = { PSTR (" [U] Normal" ), 320 , 9 , 3 , 1 , true , };
500
- protocols.data [GGWAVE_PROTOCOL_ULTRASOUND_FAST] = { PSTR (" [U] Fast" ), 320 , 6 , 3 , 1 , true , };
501
- protocols.data [GGWAVE_PROTOCOL_ULTRASOUND_FASTEST] = { PSTR (" [U] Fastest" ), 320 , 3 , 3 , 1 , true , };
502
- #endif
503
- protocols.data [GGWAVE_PROTOCOL_DT_NORMAL] = { PSTR (" [DT] Normal" ), 24 , 9 , 1 , 1 , true , };
504
- protocols.data [GGWAVE_PROTOCOL_DT_FAST] = { PSTR (" [DT] Fast" ), 24 , 6 , 1 , 1 , true , };
505
- protocols.data [GGWAVE_PROTOCOL_DT_FASTEST] = { PSTR (" [DT] Fastest" ), 24 , 3 , 1 , 1 , true , };
506
- protocols.data [GGWAVE_PROTOCOL_MT_NORMAL] = { PSTR (" [MT] Normal" ), 24 , 9 , 1 , 2 , true , };
507
- protocols.data [GGWAVE_PROTOCOL_MT_FAST] = { PSTR (" [MT] Fast" ), 24 , 6 , 1 , 2 , true , };
508
- protocols.data [GGWAVE_PROTOCOL_MT_FASTEST] = { PSTR (" [MT] Fastest" ), 24 , 3 , 1 , 2 , true , };
509
-
510
- #ifndef ARDUINO
511
- #undef PSTR
500
+ protocols.data [GGWAVE_PROTOCOL_AUDIBLE_NORMAL] = { GGWAVE_PSTR (" Normal" ), 40 , 9 , 3 , 1 , true , };
501
+ protocols.data [GGWAVE_PROTOCOL_AUDIBLE_FAST] = { GGWAVE_PSTR (" Fast" ), 40 , 6 , 3 , 1 , true , };
502
+ protocols.data [GGWAVE_PROTOCOL_AUDIBLE_FASTEST] = { GGWAVE_PSTR (" Fastest" ), 40 , 3 , 3 , 1 , true , };
503
+ protocols.data [GGWAVE_PROTOCOL_ULTRASOUND_NORMAL] = { GGWAVE_PSTR (" [U] Normal" ), 320 , 9 , 3 , 1 , true , };
504
+ protocols.data [GGWAVE_PROTOCOL_ULTRASOUND_FAST] = { GGWAVE_PSTR (" [U] Fast" ), 320 , 6 , 3 , 1 , true , };
505
+ protocols.data [GGWAVE_PROTOCOL_ULTRASOUND_FASTEST] = { GGWAVE_PSTR (" [U] Fastest" ), 320 , 3 , 3 , 1 , true , };
512
506
#endif
507
+ protocols.data [GGWAVE_PROTOCOL_DT_NORMAL] = { GGWAVE_PSTR (" [DT] Normal" ), 24 , 9 , 1 , 1 , true , };
508
+ protocols.data [GGWAVE_PROTOCOL_DT_FAST] = { GGWAVE_PSTR (" [DT] Fast" ), 24 , 6 , 1 , 1 , true , };
509
+ protocols.data [GGWAVE_PROTOCOL_DT_FASTEST] = { GGWAVE_PSTR (" [DT] Fastest" ), 24 , 3 , 1 , 1 , true , };
510
+ protocols.data [GGWAVE_PROTOCOL_MT_NORMAL] = { GGWAVE_PSTR (" [MT] Normal" ), 24 , 9 , 1 , 2 , true , };
511
+ protocols.data [GGWAVE_PROTOCOL_MT_FAST] = { GGWAVE_PSTR (" [MT] Fast" ), 24 , 6 , 1 , 2 , true , };
512
+ protocols.data [GGWAVE_PROTOCOL_MT_FASTEST] = { GGWAVE_PSTR (" [MT] Fastest" ), 24 , 3 , 1 , 2 , true , };
513
+
514
+ #undef GGWAVE_PSTR
513
515
initialized = true ;
514
516
}
515
517
0 commit comments