AVR

Author: pschatzmann

src/AudioBasic/Int24.h

@@ -42,8 +42,7 @@ class int24_t  {
 
   /// Standard Conversion to Int
   int toInt() const {
-    int newInt = (((0xFF & value[0]) << 16) | ((0xFF & value[1]) << 8) |
-                  (0xFF & value[2]));
+    int newInt = (((0xFF & value[0]) << 16) | ((0xFF & value[1]) << 8) | (0xFF & value[2]));
     if ((newInt & 0x00800000) > 0) {
       newInt |= 0xFF000000;
     } else {

src/AudioConfig.h

@@ -296,9 +296,24 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 //----------------
 #ifdef __AVR__
 #define USE_PWM
-
+#define assert(T)
+#define rintf(F) static_cast<int>(F)
 #define PIN_PWM_START 6
 #define PIN_CS CS
+
+#undef PWM_BUFFER_SIZE
+#define PWM_BUFFER_SIZE 125
+
+#undef DEFAULT_BUFFER_SIZE
+#define DEFAULT_BUFFER_SIZE 125
+
+// logging is using too much memory
+#undef LOG_PRINTF_BUFFER_SIZE 
+#define LOG_PRINTF_BUFFER_SIZE 80
+
+#undef USE_AUDIO_LOGGING
+#define USE_AUDIO_LOGGING false
+
 #endif
 
 //----------------

src/AudioPWM/PWMAudioAVR.h

@@ -33,7 +33,7 @@ class PWMAudioStreamAVR : public PWMAudioStreamBase {
 
         // Ends the output
         virtual void end(){
-             LOGD(LOG_METHOD);
+            LOGD(LOG_METHOD);
             noInterrupts(); 
             // stop timer callback
             TCCR1B = 0;
@@ -136,7 +136,7 @@ void defaultPWMAudioOutputCallback(){
 /// timer callback: write the next frame to the pins
 ISR(TIMER1_COMPA_vect){
     defaultPWMAudioOutputCallback();
-    TimerAlarmRepeating::tickerCallback();
+    TimerAlarmRepeatingAVR::tickerCallback();
 
 }
 

src/AudioTimer/AudioTimerAVR.h

@@ -6,8 +6,8 @@
 namespace audio_tools {
 
 typedef void (* repeating_timer_callback_t )(void* obj);
-class TimerAlarmRepeating;
-TimerAlarmRepeating *timerAlarmRepeatingRef = nullptr;
+class TimerAlarmRepeatingAVR;
+TimerAlarmRepeatingAVR *timerAlarmRepeatingRef = nullptr;
 
 
 /**
@@ -20,6 +20,10 @@ TimerAlarmRepeating *timerAlarmRepeatingRef = nullptr;
 class TimerAlarmRepeatingAVR : public TimerAlarmRepeatingDef {
     public:
 
+        TimerAlarmRepeatingAVR(TimerFunction function=DirectTimerCallback, int id=0) : TimerAlarmRepeatingDef(){
+            timerAlarmRepeatingRef = this;
+        }
+
         TimerAlarmRepeatingAVR(){
             timerAlarmRepeatingRef = this;
         }
@@ -95,5 +99,6 @@ class TimerAlarmRepeatingAVR : public TimerAlarmRepeatingDef {
 
 typedef  TimerAlarmRepeatingAVR TimerAlarmRepeating;
 
+} // namespace
 
 #endif

src/AudioTools/AudioLogger.h

@@ -129,12 +129,12 @@ class AudioLogger {
 
 }    
 
-#define LOG_OUT(level, ...) snprintf(audio_tools::AudioLogger::instance().prefix(__FILE__,__LINE__, level).str(),LOG_PRINTF_BUFFER_SIZE,__VA_ARGS__); audio_tools::AudioLogger::instance().println();
+#define LOG_OUT(level, ...) snprintf(AudioLogger::instance().prefix(__FILE__,__LINE__, level).str(),LOG_PRINTF_BUFFER_SIZE,__VA_ARGS__); AudioLogger::instance().println();
 
-#define LOGD(...) if (audio_tools::AudioLogger::instance().level()<=audio_tools::AudioLogger::Debug) { LOG_OUT(audio_tools::AudioLogger::Debug, __VA_ARGS__);}
-#define LOGI(...) if (audio_tools::AudioLogger::instance().level()<=audio_tools::AudioLogger::Info) { LOG_OUT(audio_tools::AudioLogger::Info, __VA_ARGS__);}
-#define LOGW(...) if (audio_tools::AudioLogger::instance().level()<=audio_tools::AudioLogger::Warning) { LOG_OUT(audio_tools::AudioLogger::Warning, __VA_ARGS__);}
-#define LOGE(...) if (audio_tools::AudioLogger::instance().level()<=audio_tools::AudioLogger::Error) { LOG_OUT(audio_tools::AudioLogger::Error, __VA_ARGS__);}
+#define LOGD(...) if (AudioLogger::instance().level()<=AudioLogger::Debug) { LOG_OUT(AudioLogger::Debug, __VA_ARGS__);}
+#define LOGI(...) if (AudioLogger::instance().level()<=AudioLogger::Info) { LOG_OUT(AudioLogger::Info, __VA_ARGS__);}
+#define LOGW(...) if (AudioLogger::instance().level()<=AudioLogger::Warning) { LOG_OUT(AudioLogger::Warning, __VA_ARGS__);}
+#define LOGE(...) if (AudioLogger::instance().level()<=AudioLogger::Error) { LOG_OUT(AudioLogger::Error, __VA_ARGS__);}
 
 #else
 

src/AudioTools/AudioStreams.h

@@ -69,7 +69,7 @@ class AudioStreamX : public AudioStream {
   virtual int read() override { return not_supported(-1); }
   virtual int peek() override { return not_supported(-1); }
   virtual void flush() FLUSH_OVERRIDE {}
-  virtual void setAudioInfo(audio_tools::AudioBaseInfo) override {}
+  virtual void setAudioInfo(AudioBaseInfo) override {}
 };
 
 /**