Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Voxelab Aquila Support, additional HC32 details, ProUI fixes. #26470

Merged
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
4ca1134
Fix menu.h _draw, fstr -> ftpl
classicrocker883 Nov 25, 2023
6c8de12
Merge branch 'MarlinFirmware:bugfix-2.1.x' into bugfix-2.1.x-Nov4
classicrocker883 Nov 25, 2023
ef90bb1
Merge branch 'MarlinFirmware:bugfix-2.1.x' into bugfix-2.1.x-Nov4
classicrocker883 Nov 27, 2023
66f25b7
take care of warnings
classicrocker883 Nov 27, 2023
cd8268f
Add Voxelab Aquila support
classicrocker883 Nov 27, 2023
effab6d
DWIN displays work better w/ ENCODER_WAIT_MS 10
classicrocker883 Nov 27, 2023
1803f5c
initial cleanup
thinkyhead Nov 28, 2023
666297e
Closer match to STM32F1
thinkyhead Nov 29, 2023
159e58b
consolidate
thinkyhead Nov 29, 2023
aefe761
Perhaps (?)
thinkyhead Nov 29, 2023
7ec2b92
headers besides HAL.h get Cond_post
thinkyhead Nov 29, 2023
2bd2507
cleanup
thinkyhead Nov 29, 2023
935d44f
translate
thinkyhead Nov 29, 2023
4d51fa5
one less
thinkyhead Nov 29, 2023
a81adbc
Update pins_AQUILA_101.h
classicrocker883 Nov 29, 2023
5147554
fix adc
thinkyhead Nov 29, 2023
c177b38
redundant
thinkyhead Nov 29, 2023
3a147f5
Already runs custom_board.py
thinkyhead Nov 29, 2023
9bebe51
allow 512k build, but warn
thinkyhead Nov 29, 2023
a772f10
just wrap ADC init
thinkyhead Nov 30, 2023
389e48f
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Dec 1, 2023
bf5978b
SAMD51 ADCs
thinkyhead Dec 1, 2023
72e3ea9
Update hc32.ini
classicrocker883 Dec 1, 2023
9db7a30
Update boards.h
classicrocker883 Dec 1, 2023
eca7118
fix drawInt to "long value"
classicrocker883 Dec 1, 2023
fc51c28
fix error for BTT_SKR_MINI_E3_V3_0_1
classicrocker883 Dec 2, 2023
3e75d64
keep old names
thinkyhead Dec 2, 2023
e5fbca7
shorter
thinkyhead Dec 2, 2023
2e2bc47
revert Conditionals_adv.h
classicrocker883 Dec 2, 2023
9eca3eb
Merge branch 'bugfix-2.1.x-Nov4' of https://github.com/classicrocker8…
classicrocker883 Dec 2, 2023
90f35ee
✅ Temporary CI Tests for 2.1.x
thinkyhead Dec 1, 2023
f52cc53
🧑‍💻 More num-to-string digits / precisions (#26343)
ellensp Dec 1, 2023
40f5bbc
[cron] Bump distribution date (2023-12-02)
thinkyhead Dec 2, 2023
8801769
Merge remote-tracking branch 'upstream/bugfix-2.1.x' into pr/26470
thinkyhead Dec 2, 2023
c28fd79
fix for STM32F401RC_btt
classicrocker883 Dec 2, 2023
b8f0782
Merge branch 'bugfix-2.1.x-Nov4' of https://github.com/classicrocker8…
classicrocker883 Dec 2, 2023
37bbe74
Merge branch 'bugfix-2.1.x' into pr/26470
thinkyhead Dec 2, 2023
a6d4696
developer note
thinkyhead Dec 2, 2023
d3c72d2
or, rather…
thinkyhead Dec 2, 2023
ceed393
just in case
thinkyhead Dec 2, 2023
5467d74
32 bit pin type
thinkyhead Dec 2, 2023
7a52a05
Update adc.h
classicrocker883 Dec 3, 2023
c049e45
Merge branch 'bugfix-2.1.x' into pr/26470
thinkyhead Dec 5, 2023
708dd91
Try FORCE_INLINE
thinkyhead Dec 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
one less
  • Loading branch information
thinkyhead committed Nov 29, 2023
commit 4d51fa5edd3f370c5f61dd928ed106ebbc9cd6bc
30 changes: 0 additions & 30 deletions Marlin/src/HAL/STM32F1/HAL_N32.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -333,31 +333,6 @@ uint16_t ADC_GetDat(ADC_Module* NS_ADCx) {
return (uint16_t)NS_ADCx->DAT;
}

////////////////////////////////////////////////////////////////////////////////

typedef struct {
__IO uint32_t CR; /* Completely compatible */
__IO uint32_t CFGR; /* Not compatible: ADC frequency is not set here */
__IO uint32_t CIR; /* Completely compatible */

__IO uint32_t APB2RSTR; /* Completely compatible */
__IO uint32_t APB1RSTR; /* Completely compatible */

__IO uint32_t AHBENR; /* Not compatible: ADC clock enables settings here */
__IO uint32_t APB2ENR; /* Not compatible: ADC clock enables to be here */
__IO uint32_t APB1ENR; /* compatible */
__IO uint32_t BDCR; /* compatible */
__IO uint32_t CSR; /* compatible */


__IO uint32_t AHBRSTR; /* Not compatible, ADC reset here settings */
__IO uint32_t CFGR2; /* Not compatible, ADC clock settings here */
__IO uint32_t CFGR3; /* Not compatible, add a new register */

} RCC_TypeDef;

#define RCC ((RCC_TypeDef *) ADC_RCC_BASE)

/**================================================================
* Initialize ADC clock
================================================================*/
Expand Down Expand Up @@ -554,8 +529,6 @@ void DMA_DeInit(DMA_ChannelType* DMAyChx) {
DMA2->INTCLR |= DMA2_CH8_INT_MASK;
}

#define CCR_CLEAR_Mask ((uint32_t)0xFFFF800F)

void DMA_Init(DMA_ChannelType* DMAyChx, DMA_InitType* DMA_InitParam) {
uint32_t tmpregister = 0;

Expand Down Expand Up @@ -604,9 +577,6 @@ void DMA_EnableChannel(DMA_ChannelType* DMAyChx, uint32_t Cmd) {
}
}

#define USE_ADC NS_ADC2
#define USE_DMA_CH DMA1_CH8

/**================================================================
* Initialize the DMA of ADC
================================================================*/
Expand Down