Merge pull request #760 from schollz/notinflash

feat: improve cpu usage in zeptocore by 10%

Author: schollz

lib/bitcrush.h

@@ -1,7 +1,7 @@
 #ifndef LIB_BITCRUSH_H_
 #define LIB_BITCRUSH_H_
 
-void Bitcrush_process(int16_t *values, uint16_t num_values, uint8_t sample_rate,
+void __not_in_flash_func(Bitcrush_process)(int16_t *values, uint16_t num_values, uint8_t sample_rate,
                       uint8_t bitrate) {
   sample_rate = linlin(sample_rate, 0, 255, 1, 8);
   bitrate = linlin(bitrate, 0, 255, 0, 12);

lib/comb.h

@@ -52,7 +52,7 @@ Comb *Comb_malloc() {
   return self;
 }
 
-void Comb_process(Comb *self, int32_t *samples, uint16_t num_samples) {
+void __not_in_flash_func(Comb_process)(Comb *self, int32_t *samples, uint16_t num_samples) {
   for (int ii = 0; ii < num_samples; ii++) {
     if (!self->on) {
       self->ringbuffer[0][self->index] = samples[ii * 2 + 0];

lib/delay.h

@@ -65,7 +65,7 @@ void Delay_setFeedbackf(Delay *self, float feedback) {
   Delay_setFeedback(self, (uint8_t)(feedback * 8.0f));
 }
 
-void Delay_process(Delay *self, int32_t *samples, uint16_t num_samples,
+void __not_in_flash_func(Delay_process)(Delay *self, int32_t *samples, uint16_t num_samples,
                    uint8_t channel) {
   for (int ii = 0; ii < num_samples; ii++) {
     while (self->ringbuffer_index > self->duration) {

lib/envelope2.h

@@ -31,7 +31,7 @@ Envelope2 *Envelope2_create(uint32_t mSampleRate, float start, float stop,
   return envelope2;
 }
 
-float Envelope2_update(Envelope2 *envelope2) {
+float __not_in_flash_func(Envelope2_update)(Envelope2 *envelope2) {
   if (envelope2->t < envelope2->duration_samples) {
     envelope2->t++;
     envelope2->curr = cos(M_PI * (envelope2->t) / envelope2->duration_samples);

lib/fixedpoint.h

@@ -33,7 +33,7 @@
 #define Q16_16_FRACTIONAL_BITS (1 << Q16_16_Q_BITS)
 
 /* Converts a Q16.16 fixed-point value to an int16. */
-int16_t q16_16_fp_to_int16(int32_t fixedValue) {
+int16_t __not_in_flash_func(q16_16_fp_to_int16)(int32_t fixedValue) {
   /* Shift the fixed-point value right by the number of Q-bits to obtain the
      integral part of the value. */
   return (int16_t)(fixedValue >> Q16_16_Q_BITS);
@@ -71,7 +71,7 @@ int32_t q16_16_int32_to_fp(int32_t value) {
 }
 
 /* Multiplies two Q16.16 fixed-point values. */
-int32_t q16_16_multiply(int32_t a, int32_t b) {
+int32_t __not_in_flash_func(q16_16_multiply)(int32_t a, int32_t b) {
   return (int32_t)((((int64_t)a) * b) >> Q16_16_Q_BITS);
 }
 
@@ -80,7 +80,7 @@ int32_t q16_16_divide(int32_t a, int32_t b) {
   return (int32_t)(((int64_t)a << Q16_16_Q_BITS) / b);
 }
 
-int32_t q16_16_sin(int32_t fixedValue) {
+int32_t __not_in_flash_func(q16_16_sin)(int32_t fixedValue) {
   uint8_t negative = 0;
   while (fixedValue < Q16_16_0) {
     fixedValue += Q16_16_PI;
@@ -112,7 +112,7 @@ int32_t q16_16_sin01(int32_t fixedValue) {
   return q16_16_multiply(Q16_16_0_5, sin5) + Q16_16_0_5;
 }
 
-int32_t q16_16_cos(int32_t fixedValue) {
+int32_t __not_in_flash_func(q16_16_cos)(int32_t fixedValue) {
   return q16_16_multiply(Q16_16_MINUS_1,
                          q16_16_sin(fixedValue - Q16_16_PI_OVER_2));
 }

main.c

@@ -10,7 +10,7 @@ uint64_t repeating_timer_callback_playback_counter = 0;
 int32_t phase_sample_old = 0;
 // timer
 
-bool timer_step() {
+bool __not_in_flash_func(timer_step)() {
   if (!fil_is_open) {
     return true;
   }
@@ -614,7 +614,7 @@ bool timer_step() {
   return true;
 }
 
-bool repeating_timer_callback(struct repeating_timer *t) {
+bool __not_in_flash_func(repeating_timer_callback)(struct repeating_timer *t) {
   return timer_step();
 }
 
@@ -651,9 +651,13 @@ int main() {
 #ifdef DO_OVERCLOCK
 #ifdef INCLUDE_BOARDCORE
   set_sys_clock_khz(150000, true);
+#else
+#ifdef INCLUDE_ZEPTOCORE
+  set_sys_clock_khz(225000, true);
 #else
   set_sys_clock_khz(200000, true);
 #endif
+#endif
 #else
   set_sys_clock_khz(125000, true);
 #endif