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.

Sign up for GitHub

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

atmega32: Add ATmega32 and ATmega324p support. Implement simpler-api branch #138

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

atmega32: Add ATmega32 and ATmega324p support. Implement simpler-api branch #138

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6f0ba2b
ATmega32: Refactor 328p-based files into separate files, add in basic…
jamesrwaugh Jan 30, 2023
5ec4459
Wip: Getting ATmega32 values in for USART, tests failing
jamesrwaugh Feb 2, 2023
8d13edd
ATmega32: More work on separating out USART to compose off of 328p
jamesrwaugh Feb 4, 2023
783b77a
ATmega32: merge work from simpler-api to split up chip config, standa…
jamesrwaugh Feb 7, 2023
922c6be
Correct interrupt vectors for many 324p parts
jamesrwaugh Feb 13, 2023
b374c38
Atmega32: Add in more 324-speciic mappings fr GPIO and SPI. 20MHZ clo…
jamesrwaugh Feb 14, 2023
8a893e0
ATmega32: Add Uart tests, fix bugs from tests, thanks tests.
jamesrwaugh Feb 14, 2023
1bb309f
Add another 32 USART test
jamesrwaugh Feb 14, 2023
522eb06
Clean up a bit
jamesrwaugh Feb 17, 2023
748add2
Merge review: type for createAvr, options, and fix 2560 export
jamesrwaugh Feb 25, 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
Clean up a bit
  • Loading branch information
@jamesrwaugh
jamesrwaugh committed Feb 17, 2023
commit 522eb062af10503b14a45e3a02a388feff23f7e7
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"build:demo": "vite build demo",
"prepare": "husky install && npm run build",
"start": "vite demo",
"start2": "vite clidemo",
"lint": "eslint src/**/*.ts demo/**/*.ts",
"test": "npm run lint && jest",
"test:watch": "jest --watch",
Expand Down
6 changes: 3 additions & 3 deletions src/peripherals/adc.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { CPU } from '../cpu/cpu';
import { asmProgram, TestProgramRunner } from '../utils/test-utils';
import { AVRADC, ADCMuxInputType } from './adc';
import { atmega328AdcConfig } from './adc_atmega328p';
import { adcConfig } from './adc_atmega328p';

const R16 = 16;
const R17 = 17;
Expand Down Expand Up @@ -49,7 +49,7 @@ describe('ADC', () => {
break
`);
const cpu = new CPU(program);
const adc = new AVRADC(cpu, atmega328AdcConfig);
const adc = new AVRADC(cpu, adcConfig);
const runner = new TestProgramRunner(cpu);

const adcReadSpy = jest.spyOn(adc, 'onADCRead');
Expand Down Expand Up @@ -110,7 +110,7 @@ describe('ADC', () => {
break
`);
const cpu = new CPU(program);
const adc = new AVRADC(cpu, atmega328AdcConfig);
const adc = new AVRADC(cpu, adcConfig);
const runner = new TestProgramRunner(cpu, () => {
/* do nothing on break */
});
Expand Down