Merge pull request #53 from mxmxmx/de-buchlarize-global

[OC] bump to v.1.3.0

Author: mxmxmx

software/o_c_REV/APP_ASR.ino

@@ -513,17 +513,19 @@ public:
 
                 // _pitch can do other things now -- 
                 switch (get_turing_CV()) {
-  
-                    case 1:  // LEN, 1-32
+
+                    case 1: // mult
+                     _mult += ((_pitch + 63) >> 7);
+                    break;
+                    case 2:  // LEN, 1-32
                      _length += ((_pitch + 255) >> 9);
                      CONSTRAIN(_length, 1, 32);
                     break;
-                     case 2:  // P
+                    case 3:  // P
                      _probability += ((_pitch + 7) >> 4);
                      CONSTRAIN(_probability, 0, 255);
                     break;
-                    default: // mult
-                     _mult += ((_pitch + 63) >> 7);
+                    default:
                     break;
                 }
 
@@ -722,13 +724,6 @@ private:
   ASRSettings enabled_settings_[ASR_SETTING_LAST];
 };
 
-const char* const mult[NUM_INPUT_SCALING] = {
-  "0.05", "0.10", "0.15", "0.20", "0.25", "0.30", "0.35", "0.40", "0.45", "0.50", 
-  "0.55", "0.60", "0.65", "0.70", "0.75", "0.80", "0.85", "0.90", "0.95", "1.00", 
-  "1.05", "1.10", "1.15", "1.20", "1.25", "1.30", "1.35", "1.40", "1.45", "1.50",
-  "1.55", "1.60", "1.65", "1.70", "1.75", "1.80", "1.85", "1.90", "1.95", "2.00"
-};
-
 const char* const asr_input_sources[] = {
   "CV1", "TM", "ByteB", "IntSq"
 };
@@ -737,10 +732,6 @@ const char* const asr_cv4_destinations[] = {
   "oct", "root", "trns", "buf.l", "igain"
 };
 
-const char* const tm_CV_destinations[] = {
-  "rng", "len", "p"
-};
-
 const char* const bb_CV_destinations[] = {
   "igain", "eqn", "P0", "P1", "P2"
 };
@@ -756,14 +747,14 @@ SETTINGS_DECLARE(ASR, ASR_SETTING_LAST) {
   { 0, 0, 11, "root", OC::Strings::note_names_unpadded, settings::STORAGE_TYPE_U8 },
   { 65535, 1, 65535, "mask", NULL, settings::STORAGE_TYPE_U16 }, // mask
   { 0, 0, ASR_HOLD_BUF_SIZE - 1, "buf.index", NULL, settings::STORAGE_TYPE_U8 },
-  { MULT_ONE, 0, NUM_INPUT_SCALING - 1, "input gain", mult, settings::STORAGE_TYPE_U8 },
+  { MULT_ONE, 0, NUM_INPUT_SCALING - 1, "input gain", OC::Strings::mult, settings::STORAGE_TYPE_U8 },
   { 0, 0, OC::kNumDelayTimes - 1, "trigger delay", OC::Strings::trigger_delay_times, settings::STORAGE_TYPE_U8 },
   { 4, 4, ASR_HOLD_BUF_SIZE - 1, "hold (buflen)", NULL, settings::STORAGE_TYPE_U8 },
   { 0, 0, ASR_CHANNEL_SOURCE_LAST -1, "CV source", asr_input_sources, settings::STORAGE_TYPE_U4 },
   { 0, 0, ASR_DEST_LAST - 1, "CV4 dest. ->", asr_cv4_destinations, settings::STORAGE_TYPE_U4 },
   { 16, 1, 32, "> LFSR length", NULL, settings::STORAGE_TYPE_U8 },
   { 128, 0, 255, "> LFSR p", NULL, settings::STORAGE_TYPE_U8 },
-  { 0, 0, 2, "> LFSR CV1", tm_CV_destinations, settings::STORAGE_TYPE_U8 }, // ??
+  { 0, 0, 3, "> LFSR CV1", OC::Strings::TM_aux_cv_destinations, settings::STORAGE_TYPE_U8 }, // ??
   { 0, 0, 15, "> BB eqn", OC::Strings::bytebeat_equation_names, settings::STORAGE_TYPE_U8 },
   { 8, 1, 255, "> BB P0", NULL, settings::STORAGE_TYPE_U8 },
   { 12, 1, 255, "> BB P1", NULL, settings::STORAGE_TYPE_U8 },

software/o_c_REV/APP_AUTOMATONNETZ.ino

@@ -341,7 +341,11 @@ SETTINGS_DECLARE(AutomatonnetzState, GRID_SETTING_LAST) {
   {8, 0, 8*GRID_DIMENSION - 1, "dx", NULL, settings::STORAGE_TYPE_I8},
   {4, 0, 8*GRID_DIMENSION - 1, "dy", NULL, settings::STORAGE_TYPE_I8},
   {MODE_MAJOR, 0, MODE_LAST-1, "Mode", mode_names, settings::STORAGE_TYPE_U8},
+  #ifdef BUCHLA_4U
+  {0, 0, 7, "Oct", NULL, settings::STORAGE_TYPE_I8},
+  #else
   {0, -3, 3, "Oct", NULL, settings::STORAGE_TYPE_I8},
+  #endif
   { 0, 0, OC::kNumDelayTimes - 1, "TrDly", OC::Strings::trigger_delay_times, settings::STORAGE_TYPE_U8 },
   {OUTPUTA_MODE_ROOT, OUTPUTA_MODE_ROOT, OUTPUTA_MODE_LAST - 1, "OutA", outputa_mode_names, settings::STORAGE_TYPE_U4},
   {CLEAR_MODE_ZERO, CLEAR_MODE_ZERO, CLEAR_MODE_LAST - 1, "Clr", clear_mode_names, settings::STORAGE_TYPE_U4},

software/o_c_REV/APP_A_SEQ.ino

@@ -1282,7 +1282,8 @@ public:
       if (_playmode != PM_ARP) {
         _out = (display_mask_ >> clk_cnt_) & 1u;
         step_state_ = _out ? ON : OFF;  
-        _out = (_out && _change) ? true : false;   
+        _out = (_out && _change) ? true : false; 
+                Serial.println(step_state_);
       }
       else {
          step_state_ = ON;
@@ -1598,7 +1599,11 @@ public:
       switch (_mode) {
 
         case 0: // gate
-          _output = get_step_gate();
+          #ifdef BUCHLA_4U
+          _output = (get_step_gate() == ON) ? OC::DAC::get_octave_offset(dacChannel, OCTAVES - OC::DAC::kOctaveZero - 0x2) : OC::DAC::get_zero_offset(dacChannel);
+          #else
+          _output = (get_step_gate() == ON) ? OC::DAC::get_octave_offset(dacChannel, OCTAVES - OC::DAC::kOctaveZero - 0x1) : OC::DAC::get_zero_offset(dacChannel);
+          #endif
         break;
         case 1: // copy
           _output = OC::DAC::pitch_to_scaled_voltage_dac(dacChannel, get_step_pitch_aux(), 0, OC::DAC::get_voltage_scaling(dacChannel));

software/o_c_REV/APP_BBGEN.ino

@@ -181,7 +181,7 @@ public:
     gate_raised_ = gate_raised;
 
     // TODO Scale range or offset?
-    uint32_t value = OC::DAC::get_zero_offset(dac_channel) + bb_.ProcessSingleSample(gate_state);
+    uint32_t value = OC::DAC::get_zero_offset(dac_channel) + bb_.ProcessSingleSample(gate_state, OC::DAC::MAX_VALUE - OC::DAC::get_zero_offset(dac_channel));
     OC::DAC::set<dac_channel>(value);
   }
 

software/o_c_REV/APP_BYTEBEATGEN.ino

@@ -312,7 +312,11 @@ public:
 
     // TODO Scale range or offset?
     uint16_t b = bytebeat_.ProcessSingleSample(gate_state);
-    uint32_t value = OC::DAC::get_zero_offset(dac_channel) + (int16_t)b;
+    #ifdef BUCHLA_4U
+      uint32_t value = OC::DAC::get_zero_offset(dac_channel) + b;
+    #else
+      uint32_t value = OC::DAC::get_zero_offset(dac_channel) + (int16_t)b;
+    #endif
     OC::DAC::set<dac_channel>(value);