Stephan/irena-avr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: Stephan:df870da929a8a27e6f0af99e08d0ffec988db960
Branches Tags
Stephan:master
...
compare: Stephan:c11e2767c28a1ff1c593144ac23ace6f5f7c9e9f
Branches Tags
Stephan:master

2 commits
df870da929 ... c11e2767c2

Author SHA1 Message Date
stephan
c11e2767c2 avr/chaos: hvosc resonance witb base shield, 800V 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/arm/avr@9072 bc5caf13-1734-44f8-af43-603852e9ee25
 2024-07-19 05:10:23 +00:00
stephan
be19a700ac avr/chaos: use larger range for Ibias ADC, do not ramp at boot 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/arm/avr@9064 bc5caf13-1734-44f8-af43-603852e9ee25
 2024-07-16 13:57:58 +00:00
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
chaos/chaos.c
View file

@ -97,12 +97,12 @@ static inline void wdt_kick()
// 3: ±0.3125 Vref = ± 1.28V 3: 6: NTC, 0…5V // 3: ±0.3125 Vref = ± 1.28V 3: 6: NTC, 0…5V
// b: ±0.15625 Vref = ± 0.64V 4: 6: Vprim/11, 0…5V // b: ±0.15625 Vref = ± 0.64V 4: 6: Vprim/11, 0…5V
// 5: 0…2.5 Vref = 0…10.24V 5: 6: 5V/2, 0…5V // 5: 0…2.5 Vref = 0…10.24V 5: 6: 5V/2, 0…5V
// 6: 0.1,25 Vref = 0… 5.12V 6: 2: I_bias, ±2.56V // 6: 0.1,25 Vref = 0… 5.12V 6: 1: I_bias, ±5V
// 7: 0.625 Vref = 0… 2.56V 7: 5: Idrv, 0…10V // 7: 0.625 Vref = 0… 2.56V 7: 5: Idrv, 0…10V
// f: 0.3125 Vref = 0… 1.28V A: dac // f: 0.3125 Vref = 0… 1.28V A: dac
#ifndef ADC_GAIN #ifndef ADC_GAIN
# define ADC_GAINS 0x5266615bUL # define ADC_GAINS 0x5166615bUL
#endif #endif
#define MAGIC 0xc05c #define MAGIC 0xc05c
@ -160,7 +160,7 @@ const struct conf runconf[] = {
[0] = { // Default [0] = { // Default
.magic = MAGIC, .magic = MAGIC,
.version = VERSION, .version = VERSION,
.flags = FLAG_RAMP | FLAG_ADCCONF | FLAG_DACADC, .flags = FLAG_ADCCONF | FLAG_DACADC,
.flags2 = FLAG2_HVOSC | FLAG2_HVLED | FLAG2_INPDIS, .flags2 = FLAG2_HVOSC | FLAG2_HVLED | FLAG2_INPDIS,
.wdt_mode = 1, .wdt_mode = 1,
.wdt_timeout = 120, // 2 min .wdt_timeout = 120, // 2 min
@ -194,10 +194,10 @@ const struct conf runconf[] = {
.hvadc_n = 2, .hvadc_n = 2,
.hvadc_safe = 0, .hvadc_safe = 0,
.ddrc = 2, // OC1B HVOSC .ddrc = 2, // OC1B HVOSC
.hvosc_freq = 55, .hvosc_freq = 60,
.hvosc_dc = 14, .hvosc_dc = 18,
.dac_off = 1000, .dac_off = 1000,
.dac_nominal = 34832, // 700 V .dac_nominal = 46411, // 800 V
.inpdis = 0x3f, .inpdis = 0x3f,
}, },
[2] = { // SAFE [2] = { // SAFE