diff --git a/Makefile b/Makefile index 2883b57..90a6b54 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,31 @@ +# Copyright 2015 Matthias Puech. +# +# Author: Matthias Puech (matthias.puech@gmail.com) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# 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. +# +# See http://creativecommons.org/licenses/MIT/ for more information. +# +# ----------------------------------------------------------------------------- +# +# Makefile driver. + # System specifications F_CRYSTAL = 8000000L F_CPU = 72000000L diff --git a/README b/README new file mode 100644 index 0000000..bd77f85 --- /dev/null +++ b/README @@ -0,0 +1 @@ +XAOC Devices Batumi firmware diff --git a/batumi.cc b/batumi.cc index 6970094..27d8d58 100644 --- a/batumi.cc +++ b/batumi.cc @@ -1,3 +1,30 @@ +// Copyright 2015 Matthias Puech. +// +// Author: Matthias Puech (matthias.puech@gmail.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// 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. +// +// See http://creativecommons.org/licenses/MIT/ for more information. +// +// ----------------------------------------------------------------------------- +// +// Batumi, main file #include diff --git a/bootloader/bootloader.cc b/bootloader/bootloader.cc index 284edb9..5bd7891 100755 --- a/bootloader/bootloader.cc +++ b/bootloader/bootloader.cc @@ -1,6 +1,8 @@ +// Copyright 2015 Matthias Puech. // Copyright 2013 Olivier Gillet. // -// Author: Olivier Gillet (ol.gillet@gmail.com) +// Original Author: Olivier Gillet (ol.gillet@gmail.com) +// Modified by: Matthias Puech (matthias.puech@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -21,6 +23,11 @@ // THE SOFTWARE. // // See http://creativecommons.org/licenses/MIT/ for more information. +// +// ---------------------------------------------------------------------------- +// +// Dummy bootloader, only jumps to real code start address +// #include #include "stmlib/system/bootloader_utils.h" diff --git a/drivers/adc.cc b/drivers/adc.cc index 2b96940..48b5590 100755 --- a/drivers/adc.cc +++ b/drivers/adc.cc @@ -1,6 +1,6 @@ -// Copyright 2013 Olivier Gillet. +// Copyright 2015 Matthias Puech. // -// Author: Olivier Gillet (ol.gillet@gmail.com) +// Author: Matthias Puech (matthias.puech@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -24,7 +24,7 @@ // // ----------------------------------------------------------------------------- // -// Driver for ADC. +// Driver for the built-in ADC. #include "drivers/adc.h" diff --git a/drivers/adc.h b/drivers/adc.h index f6fa848..04a7552 100755 --- a/drivers/adc.h +++ b/drivers/adc.h @@ -1,6 +1,6 @@ -// Copyright 2013 Olivier Gillet. +// Copyright 2015 Matthias Puech. // -// Author: Olivier Gillet (ol.gillet@gmail.com) +// Author: Matthias Puech (matthias.puech@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -24,7 +24,7 @@ // // ----------------------------------------------------------------------------- // -// Driver for ADC. +// Driver for the built-in ADC. #ifndef BATUMI_DRIVERS_ADC_H_ #define BATUMI_DRIVERS_ADC_H_ diff --git a/drivers/dac.cc b/drivers/dac.cc index 3672583..783f732 100644 --- a/drivers/dac.cc +++ b/drivers/dac.cc @@ -1,6 +1,7 @@ // Copyright 2015 Matthias Puech. // // Author: Matthias Puech (matthias.puech@gmail.com) +// Based on code by: Olivier Gillet (ol.gillet@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/drivers/dac.h b/drivers/dac.h index 5fbbcd7..df0289b 100644 --- a/drivers/dac.h +++ b/drivers/dac.h @@ -1,6 +1,7 @@ // Copyright 2015 Matthias Puech. // // Author: Matthias Puech (matthias.puech@gmail.com) +// Based on code by: Olivier Gillet (ol.gillet@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/drivers/leds.cc b/drivers/leds.cc index ca59826..f851c1e 100755 --- a/drivers/leds.cc +++ b/drivers/leds.cc @@ -1,6 +1,6 @@ -// Copyright 2013 Olivier Gillet. +// Copyright 2015 Matthias Puech. // -// Author: Olivier Gillet (ol.gillet@gmail.com) +// Author: Matthias Puech (matthias.puech@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/drivers/leds.h b/drivers/leds.h index f025290..1866fa3 100755 --- a/drivers/leds.h +++ b/drivers/leds.h @@ -1,6 +1,6 @@ -// Copyright 2013 Olivier Gillet. +// Copyright 2015 Matthias Puech. // -// Author: Olivier Gillet (ol.gillet@gmail.com) +// Author: Matthias Puech (matthias.puech@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/drivers/switches.cc b/drivers/switches.cc index 1fd7224..23625f3 100755 --- a/drivers/switches.cc +++ b/drivers/switches.cc @@ -1,6 +1,8 @@ +// Copyright 2015 Matthias Puech. // Copyright 2013 Olivier Gillet. // -// Author: Olivier Gillet (ol.gillet@gmail.com) +// Original Author: Olivier Gillet (ol.gillet@gmail.com) +// Modified by: Matthias Puech (matthias.puech@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/drivers/switches.h b/drivers/switches.h index f3e6d8a..0850ac8 100755 --- a/drivers/switches.h +++ b/drivers/switches.h @@ -1,6 +1,8 @@ +// Copyright 2015 Matthias Puech. // Copyright 2013 Olivier Gillet. // -// Author: Olivier Gillet (ol.gillet@gmail.com) +// Original Author: Olivier Gillet (ol.gillet@gmail.com) +// Modified by: Matthias Puech (matthias.puech@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/drivers/system.cc b/drivers/system.cc index 104ecab..ee536f8 100755 --- a/drivers/system.cc +++ b/drivers/system.cc @@ -1,6 +1,8 @@ +// Copyright 2015 Matthias Puech. // Copyright 2013 Olivier Gillet. // -// Author: Olivier Gillet (ol.gillet@gmail.com) +// Original Author: Olivier Gillet (ol.gillet@gmail.com) +// Modified by: Matthias Puech (matthias.puech@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/drivers/system.h b/drivers/system.h index 853f1f1..21e92ee 100755 --- a/drivers/system.h +++ b/drivers/system.h @@ -1,6 +1,8 @@ +// Copyright 2015 Matthias Puech. // Copyright 2013 Olivier Gillet. // -// Author: Olivier Gillet (ol.gillet@gmail.com) +// Original Author: Olivier Gillet (ol.gillet@gmail.com) +// Modified by: Matthias Puech (matthias.puech@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/lfo.cc b/lfo.cc index 02d1869..8ac9adb 100644 --- a/lfo.cc +++ b/lfo.cc @@ -1,6 +1,7 @@ -// Copyright 2013 Olivier Gillet. +// Copyright 2015 Matthias Puech // -// Author: Olivier Gillet (ol.gillet@gmail.com) +// Author: Matthias Puech (matthias.puech@gmail.com) +// Based on code by: Olivier Gillet (ol.gillet@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/lfo.h b/lfo.h index d66ee74..b66a3fb 100644 --- a/lfo.h +++ b/lfo.h @@ -1,6 +1,6 @@ -// Copyright 2013 Olivier Gillet. +// Copyright 2015 Matthias Puech // -// Author: Olivier Gillet (ol.gillet@gmail.com) +// Author: Matthias Puech (matthias.puech@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/processor.cc b/processor.cc index 284e21c..1cfff38 100644 --- a/processor.cc +++ b/processor.cc @@ -1,3 +1,31 @@ +// Copyright 2015 Matthias Puech +// +// Author: Matthias Puech (matthias.puech@gmail.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// 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. +// +// See http://creativecommons.org/licenses/MIT/ for more information. +// +// ----------------------------------------------------------------------------- +// +// Processor. Orchestrates the four LFOs. + #include "drivers/adc.h" #include "drivers/dac.h" @@ -13,7 +41,6 @@ using namespace stmlib; const int16_t kUnsyncPotThreshold = INT16_MAX / 20; const int16_t kResetThresholdLow = 10000; const int16_t kResetThresholdHigh = 20000; -const int16_t kHoldThreshold = -10000; void Processor::Init(Ui *ui, Adc *adc, Dac *dac) { ui_ = ui; diff --git a/processor.h b/processor.h index f332b44..6db2514 100644 --- a/processor.h +++ b/processor.h @@ -1,3 +1,31 @@ +// Copyright 2015 Matthias Puech +// +// Author: Matthias Puech (matthias.puech@gmail.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// 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. +// +// See http://creativecommons.org/licenses/MIT/ for more information. +// +// ----------------------------------------------------------------------------- +// +// Processor. Orchestrates the four LFOs. + #ifndef BATUMI_MODULATIONS_PROCESSOR_H_ #define BATUMI_MODULATIONS_PROCESSOR_H_ diff --git a/resources/lookup_tables.py b/resources/lookup_tables.py index a04fb8f..6c39a24 100755 --- a/resources/lookup_tables.py +++ b/resources/lookup_tables.py @@ -1,8 +1,10 @@ #!/usr/bin/python2.5 # # Copyright 2014 Olivier Gillet. +# Copyright 2015 Matthias Puech. # # Author: Olivier Gillet (ol.gillet@gmail.com) +# Modified by: Matthias Puech (matthias.puech@gmail.com) # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/resources/resources.py b/resources/resources.py index 0536a3a..a88592b 100755 --- a/resources/resources.py +++ b/resources/resources.py @@ -1,8 +1,10 @@ #!/usr/bin/python2.5 # # Copyright 2014 Olivier Gillet. +# Copyright 2015 Matthias Puech. # # Author: Olivier Gillet (ol.gillet@gmail.com) +# Modified by: Matthias Puech (matthias.puech@gmail.com) # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -28,9 +30,9 @@ # # Master resources file. -header = """// Copyright 2013 Olivier Gillet. +header = """// Copyright 2015 Matthias Puech. // -// Author: Olivier Gillet (ol.gillet@gmail.com) +// Author: Matthias Puech (matthias.puech@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/resources/waveforms.py b/resources/waveforms.py index e57cf01..c54d963 100755 --- a/resources/waveforms.py +++ b/resources/waveforms.py @@ -1,8 +1,8 @@ #!/usr/bin/python2.5 # -# Copyright 2014 Olivier Gillet. +# Copyright 2015 Matthias Puech. # -# Author: Olivier Gillet (ol.gillet@gmail.com) +# Author: Matthias Puech (matthias.puech@gmail.com) # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/ui.cc b/ui.cc index ba9adef..0b652ea 100644 --- a/ui.cc +++ b/ui.cc @@ -1,6 +1,8 @@ -// Copyright 2013 Matthias Puech. +// Copyright 2015 Matthias Puech. +// Copyright 2013 Olivier Gillet. // -// Author: Matthias Puech (matthias.puech@gmail.com) +// Original author: Olivier Gillet (ol.gillet@gmail.com) +// Modified by: Matthias Puech (matthias.puech@gmail.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/ui.h b/ui.h index 3fe5987..3e8e5c8 100644 --- a/ui.h +++ b/ui.h @@ -1,4 +1,4 @@ -// Copyright 2013 Matthias Puech. +// Copyright 2015 Matthias Puech. // // Author: Matthias Puech (matthias.puech@gmail.com) // @@ -24,7 +24,7 @@ // // ----------------------------------------------------------------------------- // -// Settings +// User Interface #ifndef BATUMI_UI_H_ #define BATUMI_UI_H_