diff --git a/config.cvs.nerdqaxeplus.example b/config.cvs.nerdqaxeplus.example index 863d1841..ce5fdda0 100644 --- a/config.cvs.nerdqaxeplus.example +++ b/config.cvs.nerdqaxeplus.example @@ -8,7 +8,7 @@ stratumport,data,u16,21496 stratumuser,data,string,bc1q29hp4fqtks2wzpmfwtpac64fnr8ujw2nvnra04.nerdqaxe stratumpass,data,string,x asicfrequency,data,u16,490 -asicvoltage,data,u16,1200 +asicvoltage,data,u16,1250 flipscreen,data,u16,0 invertfanpol,data,u16,0 autofanspeed,data,u16,0 diff --git a/main/boards/nerdqaxeplus.cpp b/main/boards/nerdqaxeplus.cpp index b0665644..1b847a1e 100644 --- a/main/boards/nerdqaxeplus.cpp +++ b/main/boards/nerdqaxeplus.cpp @@ -27,7 +27,7 @@ NerdQaxePlus::NerdQaxePlus() : Board() { m_asicCount = 4; m_asicJobIntervalMs = 1200; m_asicFrequency = 490.0; - m_asicVoltage = 1.20; + m_asicVoltage = 1.25; // default voltage m_initVoltage = 1.25; m_fanInvertPolarity = false; m_fanPerc = 100; diff --git a/main/boards/nerdqaxeplus2.cpp b/main/boards/nerdqaxeplus2.cpp index 7018b77a..b36b6d2d 100644 --- a/main/boards/nerdqaxeplus2.cpp +++ b/main/boards/nerdqaxeplus2.cpp @@ -12,8 +12,8 @@ NerdQaxePlus2::NerdQaxePlus2() : NerdQaxePlus() { m_ifault = (float) (m_imax - 5); m_asicJobIntervalMs = 500; - m_asicFrequency = 525.0; - m_asicVoltage = 1.20; + m_asicFrequency = 600.0; + m_asicVoltage = 1.15; // default voltage m_initVoltage = 1.20; m_maxPin = 100.0; diff --git a/main/http_server/axe-os/src/app/components/edit/edit.component.ts b/main/http_server/axe-os/src/app/components/edit/edit.component.ts index 21bc4001..66bdc423 100644 --- a/main/http_server/axe-os/src/app/components/edit/edit.component.ts +++ b/main/http_server/axe-os/src/app/components/edit/edit.component.ts @@ -61,23 +61,31 @@ export class EditComponent implements OnInit { public BM1368CoreVoltage = [ { name: '1100', value: 1100 }, { name: '1150', value: 1150 }, - { name: '1166', value: 1166 }, - { name: '1200 (default)', value: 1200 }, - { name: '1250', value: 1250 }, + { name: '1200', value: 1200 }, + { name: '1250 (default)', value: 1250 }, { name: '1300', value: 1300 }, + { name: '1350', value: 1350 }, ]; public BM1370DropdownFrequency = [ - { name: '525 (eco)', value: 525 }, + { name: '500', value: 500 }, + { name: '525', value: 525 }, + { name: '550', value: 550 }, + { name: '575', value: 575 }, + { name: '590', value: 590 }, { name: '600 (default)', value: 600 }, ]; public BM1370CoreVoltage = [ - { name: '1100', value: 1100 }, - { name: '1150', value: 1150 }, - { name: '1200 (default)', value: 1200 }, - { name: '1250', value: 1250 }, - { name: '1300', value: 1300 }, + { name: '1120', value: 1120 }, + { name: '1130', value: 1130 }, + { name: '1140', value: 1140 }, + { name: '1150 (default)', value: 1150 }, + { name: '1160', value: 1160 }, + { name: '1170', value: 1170 }, + { name: '1180', value: 1180 }, + { name: '1190', value: 1190 }, + { name: '1200', value: 1200 }, ]; constructor(