Skip to content

Commit

Permalink
update header files
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Puech committed Oct 26, 2015
1 parent d0a28ca commit 2baf250
Show file tree
Hide file tree
Showing 23 changed files with 163 additions and 28 deletions.
28 changes: 28 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
# Copyright 2015 Matthias Puech.
#
# Author: Matthias Puech ([email protected])
#
# 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
Expand Down
1 change: 1 addition & 0 deletions README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
XAOC Devices Batumi firmware
27 changes: 27 additions & 0 deletions batumi.cc
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
// Copyright 2015 Matthias Puech.
//
// Author: Matthias Puech ([email protected])
//
// 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 <stm32f10x_conf.h>

Expand Down
9 changes: 8 additions & 1 deletion bootloader/bootloader.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright 2015 Matthias Puech.
// Copyright 2013 Olivier Gillet.
//
// Author: Olivier Gillet ([email protected])
// Original Author: Olivier Gillet ([email protected])
// Modified by: Matthias Puech ([email protected])
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand All @@ -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 <stm32f10x_conf.h>
#include "stmlib/system/bootloader_utils.h"
Expand Down
6 changes: 3 additions & 3 deletions drivers/adc.cc
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -24,7 +24,7 @@
//
// -----------------------------------------------------------------------------
//
// Driver for ADC.
// Driver for the built-in ADC.

#include "drivers/adc.h"

Expand Down
6 changes: 3 additions & 3 deletions drivers/adc.h
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -24,7 +24,7 @@
//
// -----------------------------------------------------------------------------
//
// Driver for ADC.
// Driver for the built-in ADC.

#ifndef BATUMI_DRIVERS_ADC_H_
#define BATUMI_DRIVERS_ADC_H_
Expand Down
1 change: 1 addition & 0 deletions drivers/dac.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright 2015 Matthias Puech.
//
// Author: Matthias Puech ([email protected])
// Based on code by: Olivier Gillet ([email protected])
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 1 addition & 0 deletions drivers/dac.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright 2015 Matthias Puech.
//
// Author: Matthias Puech ([email protected])
// Based on code by: Olivier Gillet ([email protected])
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds.cc
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion drivers/switches.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright 2015 Matthias Puech.
// Copyright 2013 Olivier Gillet.
//
// Author: Olivier Gillet ([email protected])
// Original Author: Olivier Gillet ([email protected])
// Modified by: Matthias Puech ([email protected])
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 3 additions & 1 deletion drivers/switches.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright 2015 Matthias Puech.
// Copyright 2013 Olivier Gillet.
//
// Author: Olivier Gillet ([email protected])
// Original Author: Olivier Gillet ([email protected])
// Modified by: Matthias Puech ([email protected])
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 3 additions & 1 deletion drivers/system.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright 2015 Matthias Puech.
// Copyright 2013 Olivier Gillet.
//
// Author: Olivier Gillet ([email protected])
// Original Author: Olivier Gillet ([email protected])
// Modified by: Matthias Puech ([email protected])
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 3 additions & 1 deletion drivers/system.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright 2015 Matthias Puech.
// Copyright 2013 Olivier Gillet.
//
// Author: Olivier Gillet ([email protected])
// Original Author: Olivier Gillet ([email protected])
// Modified by: Matthias Puech ([email protected])
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
5 changes: 3 additions & 2 deletions lfo.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright 2013 Olivier Gillet.
// Copyright 2015 Matthias Puech
//
// Author: Olivier Gillet ([email protected])
// Author: Matthias Puech ([email protected])
// Based on code by: Olivier Gillet ([email protected])
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions lfo.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
29 changes: 28 additions & 1 deletion processor.cc
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
// Copyright 2015 Matthias Puech
//
// Author: Matthias Puech ([email protected])
//
// 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"

Expand All @@ -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;
Expand Down
28 changes: 28 additions & 0 deletions processor.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
// Copyright 2015 Matthias Puech
//
// Author: Matthias Puech ([email protected])
//
// 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_

Expand Down
2 changes: 2 additions & 0 deletions resources/lookup_tables.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/usr/bin/python2.5
#
# Copyright 2014 Olivier Gillet.
# Copyright 2015 Matthias Puech.
#
# Author: Olivier Gillet ([email protected])
# Modified by: Matthias Puech ([email protected])
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 4 additions & 2 deletions resources/resources.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/usr/bin/python2.5
#
# Copyright 2014 Olivier Gillet.
# Copyright 2015 Matthias Puech.
#
# Author: Olivier Gillet ([email protected])
# Modified by: Matthias Puech ([email protected])
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions resources/waveforms.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 4 additions & 2 deletions ui.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright 2013 Matthias Puech.
// Copyright 2015 Matthias Puech.
// Copyright 2013 Olivier Gillet.
//
// Author: Matthias Puech ([email protected])
// Original author: Olivier Gillet ([email protected])
// Modified by: Matthias Puech ([email protected])
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions ui.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2013 Matthias Puech.
// Copyright 2015 Matthias Puech.
//
// Author: Matthias Puech ([email protected])
//
Expand All @@ -24,7 +24,7 @@
//
// -----------------------------------------------------------------------------
//
// Settings
// User Interface

#ifndef BATUMI_UI_H_
#define BATUMI_UI_H_
Expand Down

0 comments on commit 2baf250

Please sign in to comment.