Fix erroneous include path for stmlib_utils_random.h

software/platformio.ini

@@ -10,8 +10,11 @@
 
 [env:teensy31]
 platform = teensy
+platform_packages = toolchain-gccarmnoneeabi@1.40804
 board = teensy31
 framework = arduino
-upload_protocol = teensy-gui
+upload_protocol = teensy-cli
 board_build.f_cpu = 120000000L
-build_flags = -D USB_MIDI
+build_flags = -D USB_MIDI_SERIAL -std=gnu++11 -O2
+build_unflags = -std=gnu++14
+

software/src/APP_Backup.ino → software/src/APP_Backup.h

@@ -18,6 +18,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <Arduino.h>
+#include <EEPROM.h>
+#include <stdint.h>
+#include <stdint.h>
+#include "OC_config.h"
+#include "OC_apps.h"
+#include "OC_ui.h"
+#include "src/drivers/display.h"
 #include "HSMIDI.h"
 
 class Backup: public SystemExclusiveHandler {

software/src/APP_ENIGMA.ino → software/src/APP_ENIGMA.h

@@ -18,8 +18,17 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <Arduino.h>
+#include <EEPROM.h>
+#include <stdint.h>
+#include <stdint.h>
+#include "OC_config.h"
+#include "OC_apps.h"
+#include "OC_ui.h"
+#include "src/drivers/display.h"
 #include "OC_strings.h"
 #include "HSApplication.h"
+
 #include "HSMIDI.h"
 #include "enigma/TuringMachine.h"
 #include "enigma/TuringMachineState.h"

software/src/APP_HEMISPHERE.ino → software/src/APP_HEMISPHERE.h

@@ -18,12 +18,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#ifndef _HEM_APP_HEMISPHERE_H_
+#define _HEM_APP_HEMISPHERE_H_
+
 #include "OC_DAC.h"
 #include "OC_digital_inputs.h"
 #include "OC_visualfx.h"
+#include "OC_apps.h"
+#include "OC_ui.h"
+
+#include "HEM_ClockSetup.h"
 #include "OC_patterns.h"
 #include "src/drivers/FreqMeasure/OC_FreqMeasure.h"
-namespace menu = OC::menu;
 
 #include "hemisphere_config.h"
 #include "HemisphereApplet.h"
@@ -400,3 +406,5 @@ void HEMISPHERE_handleButtonEvent(const UI::Event &event) {
 void HEMISPHERE_handleEncoderEvent(const UI::Event &event) {
     manager.DelegateEncoderMovement(event);
 }
+
+#endif

software/src/APP_MIDI.ino → software/src/APP_MIDI.h

@@ -22,6 +22,15 @@
 
 // See https://www.pjrc.com/teensy/td_midi.html
 
+#include <Arduino.h>
+#include <EEPROM.h>
+#include <stdint.h>
+#include "OC_config.h"
+#include "OC_apps.h"
+#include "OC_menus.h"
+#include "OC_ui.h"
+#include "src/drivers/display.h"
+#include "util/util_settings.h"
 #include "HSApplication.h"
 #include "HSMIDI.h"
 
@@ -192,7 +201,7 @@ struct CaptainMIDILog {
 class CaptainMIDI : public SystemExclusiveHandler, public HSApplication,
     public settings::SettingsBase<CaptainMIDI, MIDI_SETTING_LAST> {
 public:
-    menu::ScreenCursor<menu::kScreenLines> cursor;
+    OC::menu::ScreenCursor<OC::menu::kScreenLines> cursor;
 
     void Start() {
         screen = 0;
@@ -417,8 +426,8 @@ class CaptainMIDI : public SystemExclusiveHandler, public HSApplication,
         gfxPrint(get_setup_number() + 1);
 
         // Iterate through the current range of settings
-        menu::SettingsList<menu::kScreenLines, 0, menu::kDefaultValueX - 1> settings_list(cursor);
-        menu::SettingsListItem list_item;
+        OC::menu::SettingsList<OC::menu::kScreenLines, 0, OC::menu::kDefaultValueX - 1> settings_list(cursor);
+        OC::menu::SettingsListItem list_item;
         while (settings_list.available())
         {
             bool suppress = 0; // Don't show the setting if it's not relevant

software/src/APP_NeuralNetwork.ino → software/src/APP_NeuralNetwork.h

@@ -18,8 +18,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <Arduino.h>
+#include <EEPROM.h>
+#include <stdint.h>
+#include <stdint.h>
+#include "OC_config.h"
+#include "OC_apps.h"
+#include "OC_menus.h"
+#include "OC_ui.h"
+#include "src/drivers/display.h"
+#include "util/util_settings.h"
 #include "HSApplication.h"
 #include "HSMIDI.h"
+#include <stdint.h>
 #include "neuralnet/LogicGate.h"
 
 // 9 sets of 24 bytes allocated for storage

software/src/APP_PONGGAME.ino → software/src/APP_PONGGAME.h

@@ -20,6 +20,10 @@
 //
 // CV-controllable Pong game
 
+#include <Arduino.h>
+#include "OC_config.h"
+#include "OC_apps.h"
+#include "OC_ui.h"
 #include "OC_DAC.h"
 #include "OC_ADC.h"
 #include "OC_digital_inputs.h"

software/src/APP_SCALEEDITOR.ino → software/src/APP_SCALEEDITOR.h

@@ -18,6 +18,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <Arduino.h>
+#include "OC_apps.h"
+#include "OC_ui.h"
 #include "braids_quantizer.h"
 #include "braids_quantizer_scales.h"
 #include "OC_scales.h"

software/src/APP_SETTINGS.ino → software/src/APP_SETTINGS.h

@@ -18,6 +18,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <Arduino.h>
+#include <EEPROM.h>
+#include "OC_apps.h"
+#include "OC_version.h"
+#include "OC_ui.h"
 #include "HSApplication.h"
 
 // Bitmap representation of QR code for access to http://www.beigemaze.com/hs, which

software/src/APP_THEDARKESTTIMELINE.ino → software/src/APP_THEDARKESTTIMELINE.h

@@ -22,6 +22,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <Arduino.h>
+#include <EEPROM.h>
+#include <stdint.h>
+#include "OC_core.h"
+#include "OC_config.h"
+#include "OC_apps.h"
+#include "OC_patterns.h"
+#include "OC_strings.h"
+#include "OC_menus.h"
+#include "OC_ui.h"
+#include "src/drivers/display.h"
+
+#include "HemisphereApplet.h"
 #include "util/util_settings.h"
 #include "OC_DAC.h"
 #include "braids_quantizer.h"

software/src/APP_WAVEFORMEDITOR.ino → software/src/APP_WAVEFORMEDITOR.h

@@ -18,6 +18,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <Arduino.h>
+#include "OC_apps.h"
+#include "OC_strings.h"
+#include "OC_ui.h"
+#include "UI/ui_events.h"
+
 #include "HSApplication.h"
 #include "HSMIDI.h"
 #include "vector_osc/HSVectorOscillator.h"

software/src/HEM_ADEG.ino → software/src/HEM_ADEG.h

@@ -18,9 +18,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#ifndef _HEM_ADEG_H_
+#define _HEM_ADEG_H_
+
 #define HEM_ADEG_MAX_VALUE 255
 #define HEM_ADEG_MAX_TICKS 33333
 
+#include <Arduino.h>
+#include "OC_core.h"
+#include "HemisphereApplet.h"
+
 class ADEG : public HemisphereApplet {
 public:
 
@@ -185,3 +192,5 @@ void ADEG_OnEncoderMove(bool hemisphere, int direction) {ADEG_instance[hemispher
 void ADEG_ToggleHelpScreen(bool hemisphere) {ADEG_instance[hemisphere].HelpScreen();}
 uint32_t ADEG_OnDataRequest(bool hemisphere) {return ADEG_instance[hemisphere].OnDataRequest();}
 void ADEG_OnDataReceive(bool hemisphere, uint32_t data) {ADEG_instance[hemisphere].OnDataReceive(data);}
+
+#endif

software/src/HEM_ADSREG.ino → software/src/HEM_ADSREG.h

@@ -18,6 +18,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#ifndef _HEM_ADSREG_H_
+#define _HEM_ADSREG_H_
+
+#include <Arduino.h>
+#include "OC_core.h"
+#include "HemisphereApplet.h"
+
 #define HEM_EG_ATTACK 0
 #define HEM_EG_DECAY 1
 #define HEM_EG_SUSTAIN 2
@@ -303,3 +310,5 @@ uint32_t ADSREG_OnDataRequest(bool hemisphere) {
 void ADSREG_OnDataReceive(bool hemisphere, uint32_t data) {
     ADSREG_instance[hemisphere].OnDataReceive(data);
 }
+
+#endif

software/src/HEM_ASR.ino → software/src/HEM_ASR.h

@@ -20,6 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#ifndef _HEM_ASR_H_
+#define _HEM_ASR_H_
+
+#include <Arduino.h>
+#include "OC_core.h"
+#include "OC_scales.h"
+#include "HemisphereApplet.h"
 #include "HSRingBufferManager.h" // Singleton Ring Buffer manager
 
 class ASR : public HemisphereApplet {
@@ -157,3 +164,5 @@ void ASR_OnEncoderMove(bool hemisphere, int direction) {ASR_instance[hemisphere]
 void ASR_ToggleHelpScreen(bool hemisphere) {ASR_instance[hemisphere].HelpScreen();}
 uint32_t ASR_OnDataRequest(bool hemisphere) {return ASR_instance[hemisphere].OnDataRequest();}
 void ASR_OnDataReceive(bool hemisphere, uint32_t data) {ASR_instance[hemisphere].OnDataReceive(data);}
+
+#endif

software/src/HEM_AnnularFusion.ino → software/src/HEM_AnnularFusion.h

@@ -20,7 +20,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#ifndef _HEM_AF_STEP_COORD_H_
+#define _HEM_AF_STEP_COORD_H_
+
+#include <Arduino.h>
+#include "OC_core.h"
+#include "HemisphereApplet.h"
 #include "bjorklund.h"
+
 #define AF_DISPLAY_TIMEOUT 330000
 
 struct AFStepCoord {
@@ -283,3 +290,5 @@ uint32_t AnnularFusion_OnDataRequest(bool hemisphere) {
 void AnnularFusion_OnDataReceive(bool hemisphere, uint32_t data) {
     AnnularFusion_instance[hemisphere].OnDataReceive(data);
 }
+
+#endif

software/src/HEM_AttenuateOffset.ino → software/src/HEM_AttenuateOffset.h

@@ -18,6 +18,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#ifndef _HEM_ATTOFF_H_
+#define _HEM_ATTOFF_H_
+
+#include <Arduino.h>
+#include "OC_core.h"
+#include "HemisphereApplet.h"
+
 #define ATTENOFF_INCREMENTS 128
 
 class AttenuateOffset : public HemisphereApplet {
@@ -131,3 +138,5 @@ void AttenuateOffset_OnEncoderMove(bool hemisphere, int direction) {AttenuateOff
 void AttenuateOffset_ToggleHelpScreen(bool hemisphere) {AttenuateOffset_instance[hemisphere].HelpScreen();}
 uint32_t AttenuateOffset_OnDataRequest(bool hemisphere) {return AttenuateOffset_instance[hemisphere].OnDataRequest();}
 void AttenuateOffset_OnDataReceive(bool hemisphere, uint32_t data) {AttenuateOffset_instance[hemisphere].OnDataReceive(data);}
+
+#endif

software/src/HEM_Binary.ino → software/src/HEM_Binary.h

@@ -18,6 +18,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#ifndef _HEM_BIN_H_
+#define _HEM_BIN_H_
+
+#include <Arduino.h>
+#include "OC_core.h"
+#include "HemisphereApplet.h"
 #include "SegmentDisplay.h"
 
 class Binary : public HemisphereApplet {
@@ -139,3 +145,5 @@ uint32_t Binary_OnDataRequest(bool hemisphere) {
 void Binary_OnDataReceive(bool hemisphere, uint32_t data) {
     Binary_instance[hemisphere].OnDataReceive(data);
 }
+
+#endif

software/src/HEM_BootsNCat.ino → software/src/HEM_BootsNCat.h

@@ -17,7 +17,12 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
+#ifndef _HEM_BOOTSNCAT_H_
+#define _HEM_BOOTSNCAT_H_
 
+#include <Arduino.h>
+#include "OC_core.h"
+#include "HemisphereApplet.h"
 #include "vector_osc/HSVectorOscillator.h"
 #include "vector_osc/WaveformManager.h"
 
@@ -221,3 +226,5 @@ void BootsNCat_OnEncoderMove(bool hemisphere, int direction) {BootsNCat_instance
 void BootsNCat_ToggleHelpScreen(bool hemisphere) {BootsNCat_instance[hemisphere].HelpScreen();}
 uint32_t BootsNCat_OnDataRequest(bool hemisphere) {return BootsNCat_instance[hemisphere].OnDataRequest();}
 void BootsNCat_OnDataReceive(bool hemisphere, uint32_t data) {BootsNCat_instance[hemisphere].OnDataReceive(data);}
+
+#endif

software/src/HEM_Brancher.ino → software/src/HEM_Brancher.h

@@ -18,6 +18,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#ifndef _HEM_BRANCHER_H_
+#define _HEM_BRANCHER_H_
+
+#include <Arduino.h>
+#include "OC_core.h"
+#include "HemisphereApplet.h"
+
 class Brancher : public HemisphereApplet {
 public:
 
@@ -138,3 +145,5 @@ uint32_t Brancher_OnDataRequest(bool hemisphere) {
 void Brancher_OnDataReceive(bool hemisphere, uint32_t data) {
     Brancher_instance[hemisphere].OnDataReceive(data);
 }
+
+#endif

software/src/HEM_Burst.ino → software/src/HEM_Burst.h

@@ -18,6 +18,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <Arduino.h>
+#include "OC_core.h"
+#include "HemisphereApplet.h"
+
 #define HEM_BURST_NUMBER_MAX 12
 #define HEM_BURST_SPACING_MAX 500
 #define HEM_BURST_SPACING_MIN 8

software/src/HEM_CVRecV2.ino → software/src/HEM_CVRecV2.h

@@ -18,6 +18,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <Arduino.h>
+#include "OC_core.h"
+#include "HemisphereApplet.h"
 #include "SegmentDisplay.h"
 #define CVREC_MAX_STEP 384
 

software/src/HEM_Calculate.ino → software/src/HEM_Calculate.h

@@ -18,6 +18,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <Arduino.h>
+#include "OC_core.h"
+#include "HemisphereApplet.h"
+
 // Arithmetic functions and typedef to function pointer
 #define HEMISPHERE_NUMBER_OF_CALC 7
 int hem_MIN(int v1, int v2) {return (v1 < v2) ? v1 : v2;}