2017-09-27 07:30:23 +02:00
|
|
|
/**
|
|
|
|
|
* Marlin 3D Printer Firmware
|
|
|
|
|
*
|
2020-02-03 15:00:57 +01:00
|
|
|
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
2017-09-27 07:30:23 +02:00
|
|
|
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
|
|
|
|
|
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
|
|
|
|
|
* Copyright (c) 2017 Victor Perez
|
|
|
|
|
*
|
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* HAL for stm32duino.com based on Libmaple and compatible (STM32F1)
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifdef __STM32F1__
|
|
|
|
|
|
2019-03-08 09:21:32 +01:00
|
|
|
#include "../../inc/MarlinConfig.h"
|
2019-10-15 21:18:46 +02:00
|
|
|
#include "HAL.h"
|
2017-09-27 07:30:23 +02:00
|
|
|
|
2019-06-21 08:20:17 +02:00
|
|
|
#include <STM32ADC.h>
|
|
|
|
|
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
2018-04-26 07:21:16 +02:00
|
|
|
// Types
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
2017-09-27 07:30:23 +02:00
|
|
|
|
2018-04-26 07:21:16 +02:00
|
|
|
#define __I
|
2018-12-21 00:23:27 +01:00
|
|
|
#define __IO volatile
|
2019-06-17 10:16:23 +02:00
|
|
|
typedef struct {
|
2018-04-26 07:21:16 +02:00
|
|
|
__I uint32_t CPUID; /*!< Offset: 0x000 (R/ ) CPUID Base Register */
|
|
|
|
|
__IO uint32_t ICSR; /*!< Offset: 0x004 (R/W) Interrupt Control and State Register */
|
|
|
|
|
__IO uint32_t VTOR; /*!< Offset: 0x008 (R/W) Vector Table Offset Register */
|
|
|
|
|
__IO uint32_t AIRCR; /*!< Offset: 0x00C (R/W) Application Interrupt and Reset Control Register */
|
|
|
|
|
__IO uint32_t SCR; /*!< Offset: 0x010 (R/W) System Control Register */
|
|
|
|
|
__IO uint32_t CCR; /*!< Offset: 0x014 (R/W) Configuration Control Register */
|
|
|
|
|
__IO uint8_t SHP[12]; /*!< Offset: 0x018 (R/W) System Handlers Priority Registers (4-7, 8-11, 12-15) */
|
|
|
|
|
__IO uint32_t SHCSR; /*!< Offset: 0x024 (R/W) System Handler Control and State Register */
|
|
|
|
|
__IO uint32_t CFSR; /*!< Offset: 0x028 (R/W) Configurable Fault Status Register */
|
|
|
|
|
__IO uint32_t HFSR; /*!< Offset: 0x02C (R/W) HardFault Status Register */
|
|
|
|
|
__IO uint32_t DFSR; /*!< Offset: 0x030 (R/W) Debug Fault Status Register */
|
|
|
|
|
__IO uint32_t MMFAR; /*!< Offset: 0x034 (R/W) MemManage Fault Address Register */
|
|
|
|
|
__IO uint32_t BFAR; /*!< Offset: 0x038 (R/W) BusFault Address Register */
|
|
|
|
|
__IO uint32_t AFSR; /*!< Offset: 0x03C (R/W) Auxiliary Fault Status Register */
|
|
|
|
|
__I uint32_t PFR[2]; /*!< Offset: 0x040 (R/ ) Processor Feature Register */
|
|
|
|
|
__I uint32_t DFR; /*!< Offset: 0x048 (R/ ) Debug Feature Register */
|
|
|
|
|
__I uint32_t ADR; /*!< Offset: 0x04C (R/ ) Auxiliary Feature Register */
|
|
|
|
|
__I uint32_t MMFR[4]; /*!< Offset: 0x050 (R/ ) Memory Model Feature Register */
|
|
|
|
|
__I uint32_t ISAR[5]; /*!< Offset: 0x060 (R/ ) Instruction Set Attributes Register */
|
|
|
|
|
uint32_t RESERVED0[5];
|
|
|
|
|
__IO uint32_t CPACR; /*!< Offset: 0x088 (R/W) Coprocessor Access Control Register */
|
|
|
|
|
} SCB_Type;
|
|
|
|
|
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
2018-04-26 07:21:16 +02:00
|
|
|
// Local defines
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
|
|
|
|
|
2018-04-26 07:21:16 +02:00
|
|
|
#define SCS_BASE (0xE000E000UL) /*!< System Control Space Base Address */
|
|
|
|
|
#define SCB_BASE (SCS_BASE + 0x0D00UL) /*!< System Control Block Base Address */
|
|
|
|
|
|
|
|
|
|
#define SCB ((SCB_Type *) SCB_BASE ) /*!< SCB configuration struct */
|
|
|
|
|
|
|
|
|
|
/* SCB Application Interrupt and Reset Control Register Definitions */
|
|
|
|
|
#define SCB_AIRCR_VECTKEY_Pos 16 /*!< SCB AIRCR: VECTKEY Position */
|
|
|
|
|
#define SCB_AIRCR_VECTKEY_Msk (0xFFFFUL << SCB_AIRCR_VECTKEY_Pos) /*!< SCB AIRCR: VECTKEY Mask */
|
|
|
|
|
|
|
|
|
|
#define SCB_AIRCR_PRIGROUP_Pos 8 /*!< SCB AIRCR: PRIGROUP Position */
|
|
|
|
|
#define SCB_AIRCR_PRIGROUP_Msk (7UL << SCB_AIRCR_PRIGROUP_Pos) /*!< SCB AIRCR: PRIGROUP Mask */
|
2017-09-27 07:30:23 +02:00
|
|
|
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
2017-09-27 07:30:23 +02:00
|
|
|
// Public Variables
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
|
|
|
|
|
2019-09-13 00:59:31 +02:00
|
|
|
#if (defined(SERIAL_USB) && !defined(USE_USB_COMPOSITE))
|
2019-03-08 09:21:32 +01:00
|
|
|
USBSerial SerialUSB;
|
|
|
|
|
#endif
|
2017-09-27 07:30:23 +02:00
|
|
|
|
|
|
|
|
uint16_t HAL_adc_result;
|
|
|
|
|
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
2017-09-27 07:30:23 +02:00
|
|
|
// Private Variables
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
STM32ADC adc(ADC1);
|
|
|
|
|
|
2019-08-24 08:33:16 +02:00
|
|
|
const uint8_t adc_pins[] = {
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_0
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
TEMP_0_PIN,
|
|
|
|
|
#endif
|
2019-03-07 08:00:44 +01:00
|
|
|
#if HAS_HEATED_BED
|
|
|
|
|
TEMP_BED_PIN,
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_HEATED_CHAMBER
|
|
|
|
|
TEMP_CHAMBER_PIN,
|
|
|
|
|
#endif
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_1
|
2018-12-21 00:23:27 +01:00
|
|
|
TEMP_1_PIN,
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
#endif
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_2
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
TEMP_2_PIN,
|
|
|
|
|
#endif
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_3
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
TEMP_3_PIN,
|
|
|
|
|
#endif
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_4
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
TEMP_4_PIN,
|
|
|
|
|
#endif
|
2019-03-07 08:00:44 +01:00
|
|
|
#if HAS_TEMP_ADC_5
|
|
|
|
|
TEMP_5_PIN,
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
#endif
|
2020-01-25 09:13:39 +01:00
|
|
|
#if HAS_TEMP_ADC_6
|
|
|
|
|
TEMP_6_PIN,
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_TEMP_ADC_7
|
|
|
|
|
TEMP_7_PIN,
|
|
|
|
|
#endif
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
|
|
|
|
FILWIDTH_PIN,
|
|
|
|
|
#endif
|
2019-11-20 07:06:26 +01:00
|
|
|
#if ENABLED(ADC_KEYPAD)
|
|
|
|
|
ADC_KEYPAD_PIN,
|
|
|
|
|
#endif
|
2019-09-08 07:55:34 +02:00
|
|
|
#if HAS_JOY_ADC_X
|
|
|
|
|
JOY_X_PIN,
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_JOY_ADC_Y
|
|
|
|
|
JOY_Y_PIN,
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_JOY_ADC_Z
|
|
|
|
|
JOY_Z_PIN,
|
|
|
|
|
#endif
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
};
|
|
|
|
|
|
2018-03-07 05:35:22 +01:00
|
|
|
enum TEMP_PINS : char {
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_0
|
2017-12-20 23:16:36 +01:00
|
|
|
TEMP_0,
|
|
|
|
|
#endif
|
2019-03-07 08:00:44 +01:00
|
|
|
#if HAS_HEATED_BED
|
|
|
|
|
TEMP_BED,
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_HEATED_CHAMBER
|
|
|
|
|
TEMP_CHAMBER,
|
|
|
|
|
#endif
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_1
|
2017-12-20 23:16:36 +01:00
|
|
|
TEMP_1,
|
|
|
|
|
#endif
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_2
|
2017-12-20 23:16:36 +01:00
|
|
|
TEMP_2,
|
|
|
|
|
#endif
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_3
|
2017-12-20 23:16:36 +01:00
|
|
|
TEMP_3,
|
|
|
|
|
#endif
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_4
|
2017-12-20 23:16:36 +01:00
|
|
|
TEMP_4,
|
|
|
|
|
#endif
|
2019-03-07 08:00:44 +01:00
|
|
|
#if HAS_TEMP_ADC_5
|
|
|
|
|
TEMP_5,
|
2017-12-20 23:16:36 +01:00
|
|
|
#endif
|
2020-01-25 09:13:39 +01:00
|
|
|
#if HAS_TEMP_ADC_6
|
|
|
|
|
TEMP_6,
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_TEMP_ADC_7
|
|
|
|
|
TEMP_7,
|
|
|
|
|
#endif
|
2017-12-20 23:16:36 +01:00
|
|
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
|
|
|
|
FILWIDTH,
|
|
|
|
|
#endif
|
2019-11-20 07:06:26 +01:00
|
|
|
#if ENABLED(ADC_KEYPAD)
|
|
|
|
|
ADC_KEY,
|
|
|
|
|
#endif
|
2019-09-08 07:55:34 +02:00
|
|
|
#if HAS_JOY_ADC_X
|
|
|
|
|
JOY_X,
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_JOY_ADC_Y
|
|
|
|
|
JOY_Y,
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_JOY_ADC_Z
|
|
|
|
|
JOY_Z,
|
|
|
|
|
#endif
|
2019-06-17 10:16:23 +02:00
|
|
|
ADC_PIN_COUNT
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
uint16_t HAL_adc_results[ADC_PIN_COUNT];
|
|
|
|
|
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
2017-09-27 07:30:23 +02:00
|
|
|
// Private functions
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
2018-04-26 07:21:16 +02:00
|
|
|
static void NVIC_SetPriorityGrouping(uint32_t PriorityGroup) {
|
|
|
|
|
uint32_t reg_value;
|
|
|
|
|
uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07); /* only values 0..7 are used */
|
|
|
|
|
|
|
|
|
|
reg_value = SCB->AIRCR; /* read old register configuration */
|
|
|
|
|
reg_value &= ~(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk); /* clear bits to change */
|
|
|
|
|
reg_value = (reg_value |
|
|
|
|
|
((uint32_t)0x5FA << SCB_AIRCR_VECTKEY_Pos) |
|
|
|
|
|
(PriorityGroupTmp << 8)); /* Insert write key and priorty group */
|
|
|
|
|
SCB->AIRCR = reg_value;
|
|
|
|
|
}
|
2017-09-27 07:30:23 +02:00
|
|
|
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
2017-09-27 07:30:23 +02:00
|
|
|
// Public functions
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
2017-09-27 07:30:23 +02:00
|
|
|
|
2018-12-21 00:23:27 +01:00
|
|
|
//
|
|
|
|
|
// Leave PA11/PA12 intact if USBSerial is not used
|
|
|
|
|
//
|
|
|
|
|
#if SERIAL_USB
|
|
|
|
|
namespace wirish { namespace priv {
|
|
|
|
|
#if SERIAL_PORT > 0
|
|
|
|
|
#if SERIAL_PORT2
|
|
|
|
|
#if SERIAL_PORT2 > 0
|
2019-09-17 03:31:08 +02:00
|
|
|
void board_setup_usb() {}
|
2018-12-21 00:23:27 +01:00
|
|
|
#endif
|
|
|
|
|
#else
|
2019-09-17 03:31:08 +02:00
|
|
|
void board_setup_usb() {}
|
2018-12-21 00:23:27 +01:00
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
} }
|
|
|
|
|
#endif
|
|
|
|
|
|
2019-09-17 03:31:08 +02:00
|
|
|
void HAL_init() {
|
2018-04-26 07:21:16 +02:00
|
|
|
NVIC_SetPriorityGrouping(0x3);
|
2019-06-17 10:16:23 +02:00
|
|
|
#if PIN_EXISTS(LED)
|
|
|
|
|
OUT_WRITE(LED_PIN, LOW);
|
|
|
|
|
#endif
|
2019-09-08 09:27:23 +02:00
|
|
|
#ifdef USE_USB_COMPOSITE
|
|
|
|
|
MSC_SD_init();
|
|
|
|
|
#endif
|
2019-07-21 03:35:41 +02:00
|
|
|
#if PIN_EXISTS(USB_CONNECT)
|
|
|
|
|
OUT_WRITE(USB_CONNECT_PIN, !USB_CONNECT_INVERTING); // USB clear connection
|
|
|
|
|
delay(1000); // Give OS time to notice
|
|
|
|
|
OUT_WRITE(USB_CONNECT_PIN, USB_CONNECT_INVERTING);
|
|
|
|
|
#endif
|
2018-04-26 07:21:16 +02:00
|
|
|
}
|
|
|
|
|
|
2019-09-08 09:27:23 +02:00
|
|
|
// HAL idle task
|
2019-09-17 03:31:08 +02:00
|
|
|
void HAL_idletask() {
|
2019-09-08 09:27:23 +02:00
|
|
|
#ifdef USE_USB_COMPOSITE
|
|
|
|
|
#if ENABLED(SHARED_SD_CARD)
|
|
|
|
|
// If Marlin is using the SD card we need to lock it to prevent access from
|
|
|
|
|
// a PC via USB.
|
|
|
|
|
// Other HALs use IS_SD_PRINTING() and IS_SD_FILE_OPEN() to check for access but
|
|
|
|
|
// this will not reliably detect delete operations. To be safe we will lock
|
2019-10-03 01:51:25 +02:00
|
|
|
// the disk if Marlin has it mounted. Unfortunately there is currently no way
|
2019-09-08 09:27:23 +02:00
|
|
|
// to unmount the disk from the LCD menu.
|
|
|
|
|
// if (IS_SD_PRINTING() || IS_SD_FILE_OPEN())
|
|
|
|
|
/* copy from lpc1768 framework, should be fixed later for process SHARED_SD_CARD*/
|
|
|
|
|
#endif
|
|
|
|
|
// process USB mass storage device class loop
|
|
|
|
|
MarlinMSC.loop();
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2019-09-17 03:31:08 +02:00
|
|
|
void HAL_clear_reset_source() { }
|
2017-09-27 07:30:23 +02:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* TODO: Check this and change or remove.
|
|
|
|
|
* currently returns 1 that's equal to poweron reset.
|
|
|
|
|
*/
|
2019-09-17 03:31:08 +02:00
|
|
|
uint8_t HAL_get_reset_source() { return 1; }
|
2017-09-27 07:30:23 +02:00
|
|
|
|
|
|
|
|
void _delay_ms(const int delay_ms) { delay(delay_ms); }
|
|
|
|
|
|
|
|
|
|
extern "C" {
|
|
|
|
|
extern unsigned int _ebss; // end of bss section
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* TODO: Change this to correct it for libmaple
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
// return free memory between end of heap (or end bss) and whatever is current
|
|
|
|
|
|
|
|
|
|
/*
|
2019-11-13 05:16:54 +01:00
|
|
|
#include <wirish/syscalls.c>
|
2017-09-27 07:30:23 +02:00
|
|
|
//extern caddr_t _sbrk(int incr);
|
|
|
|
|
#ifndef CONFIG_HEAP_END
|
|
|
|
|
extern char _lm_heap_end;
|
|
|
|
|
#define CONFIG_HEAP_END ((caddr_t)&_lm_heap_end)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
extern "C" {
|
|
|
|
|
static int freeMemory() {
|
|
|
|
|
char top = 't';
|
|
|
|
|
return &top - reinterpret_cast<char*>(sbrk(0));
|
|
|
|
|
}
|
|
|
|
|
int freeMemory() {
|
|
|
|
|
int free_memory;
|
|
|
|
|
int heap_end = (int)_sbrk(0);
|
|
|
|
|
free_memory = ((int)&free_memory) - ((int)heap_end);
|
|
|
|
|
return free_memory;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
*/
|
|
|
|
|
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
2017-09-27 07:30:23 +02:00
|
|
|
// ADC
|
2019-07-10 05:30:06 +02:00
|
|
|
// ------------------------
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
// Init the AD in continuous capture mode
|
2019-09-17 03:31:08 +02:00
|
|
|
void HAL_adc_init() {
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
// configure the ADC
|
|
|
|
|
adc.calibrate();
|
2019-07-20 08:54:02 +02:00
|
|
|
#if F_CPU > 72000000
|
|
|
|
|
adc.setSampleRate(ADC_SMPR_71_5); // 71.5 ADC cycles
|
|
|
|
|
#else
|
|
|
|
|
adc.setSampleRate(ADC_SMPR_41_5); // 41.5 ADC cycles
|
|
|
|
|
#endif
|
2019-08-24 08:33:16 +02:00
|
|
|
adc.setPins((uint8_t *)adc_pins, ADC_PIN_COUNT);
|
2019-05-09 18:45:55 +02:00
|
|
|
adc.setDMA(HAL_adc_results, (uint16_t)ADC_PIN_COUNT, (uint32_t)(DMA_MINC_MODE | DMA_CIRC_MODE), nullptr);
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
adc.setScanMode();
|
|
|
|
|
adc.setContinuous();
|
|
|
|
|
adc.startConversion();
|
|
|
|
|
}
|
2017-09-27 07:30:23 +02:00
|
|
|
|
|
|
|
|
void HAL_adc_start_conversion(const uint8_t adc_pin) {
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
TEMP_PINS pin_index;
|
|
|
|
|
switch (adc_pin) {
|
2019-05-09 07:33:38 +02:00
|
|
|
default: return;
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_0
|
2017-12-20 23:16:36 +01:00
|
|
|
case TEMP_0_PIN: pin_index = TEMP_0; break;
|
|
|
|
|
#endif
|
2019-03-07 08:00:44 +01:00
|
|
|
#if HAS_HEATED_BED
|
|
|
|
|
case TEMP_BED_PIN: pin_index = TEMP_BED; break;
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_HEATED_CHAMBER
|
|
|
|
|
case TEMP_CHAMBER_PIN: pin_index = TEMP_CHAMBER; break;
|
|
|
|
|
#endif
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_1
|
2017-12-20 23:16:36 +01:00
|
|
|
case TEMP_1_PIN: pin_index = TEMP_1; break;
|
|
|
|
|
#endif
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_2
|
2017-12-20 23:16:36 +01:00
|
|
|
case TEMP_2_PIN: pin_index = TEMP_2; break;
|
|
|
|
|
#endif
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_3
|
2017-12-20 23:16:36 +01:00
|
|
|
case TEMP_3_PIN: pin_index = TEMP_3; break;
|
|
|
|
|
#endif
|
2018-05-02 02:33:41 +02:00
|
|
|
#if HAS_TEMP_ADC_4
|
2017-12-20 23:16:36 +01:00
|
|
|
case TEMP_4_PIN: pin_index = TEMP_4; break;
|
|
|
|
|
#endif
|
2019-03-07 08:00:44 +01:00
|
|
|
#if HAS_TEMP_ADC_5
|
|
|
|
|
case TEMP_5_PIN: pin_index = TEMP_5; break;
|
2017-12-20 23:16:36 +01:00
|
|
|
#endif
|
2020-01-25 09:13:39 +01:00
|
|
|
#if HAS_TEMP_ADC_6
|
|
|
|
|
case TEMP_6_PIN: pin_index = TEMP_6; break;
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_TEMP_ADC_7
|
|
|
|
|
case TEMP_7_PIN: pin_index = TEMP_7; break;
|
|
|
|
|
#endif
|
2019-09-08 07:55:34 +02:00
|
|
|
#if HAS_JOY_ADC_X
|
|
|
|
|
case JOY_X_PIN: pin_index = JOY_X; break;
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_JOY_ADC_Y
|
|
|
|
|
case JOY_Y_PIN: pin_index = JOY_Y; break;
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_JOY_ADC_Z
|
|
|
|
|
case JOY_Z_PIN: pin_index = JOY_Z; break;
|
|
|
|
|
#endif
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
|
|
|
|
case FILWIDTH_PIN: pin_index = FILWIDTH; break;
|
|
|
|
|
#endif
|
2019-11-20 07:06:26 +01:00
|
|
|
#if ENABLED(ADC_KEYPAD)
|
|
|
|
|
case ADC_KEYPAD_PIN: pin_index = ADC_KEY; break;
|
|
|
|
|
#endif
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 06:12:45 +01:00
|
|
|
}
|
|
|
|
|
HAL_adc_result = (HAL_adc_results[(int)pin_index] >> 2) & 0x3FF; // shift to get 10 bits only.
|
2017-09-27 07:30:23 +02:00
|
|
|
}
|
|
|
|
|
|
2019-09-17 03:31:08 +02:00
|
|
|
uint16_t HAL_adc_get_result() { return HAL_adc_result; }
|
2017-09-27 07:30:23 +02:00
|
|
|
|
2019-06-21 08:20:17 +02:00
|
|
|
uint16_t analogRead(pin_t pin) {
|
|
|
|
|
const bool is_analog = _GET_MODE(pin) == GPIO_INPUT_ANALOG;
|
|
|
|
|
return is_analog ? analogRead(uint8_t(pin)) : 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Wrapper to maple unprotected analogWrite
|
|
|
|
|
void analogWrite(pin_t pin, int pwm_val8) {
|
2019-07-06 04:13:32 +02:00
|
|
|
if (PWM_PIN(pin))
|
2019-06-21 08:20:17 +02:00
|
|
|
analogWrite(uint8_t(pin), pwm_val8);
|
|
|
|
|
}
|
|
|
|
|
|
2019-09-11 19:12:58 +02:00
|
|
|
void flashFirmware(int16_t value) { nvic_sys_reset(); }
|
|
|
|
|
|
2017-09-27 07:30:23 +02:00
|
|
|
#endif // __STM32F1__
|