| リビジョン | 18 (tree) |
|---|---|
| 日時 | 2018-06-23 17:24:49 |
| 作者 |  kenkenmkiisr |
ANALOGコマンド修正
trunk/io.c (diff)| @@ -160,7 +160,7 @@ | ||
| 160 | 160 | */ |
| 161 | 161 | AD1CON1=0x00E0; |
| 162 | 162 | AD1CON2=0x0000; |
| 163 | - AD1CON3=0x0000; | |
| 163 | + AD1CON3=0x1f00; //clock derived from PBCLK,31TAD | |
| 164 | 164 | // pos must be between 0 and 15 or 16 and 18 |
| 165 | 165 | if (0<=pos && pos<=15) { |
| 166 | 166 | // RB0-RB15: AN0-AN15 |
| @@ -171,10 +171,10 @@ | ||
| 171 | 171 | // Enable analog |
| 172 | 172 | ANSELBSET=1<<pos; |
| 173 | 173 | // Select input pin |
| 174 | - AD1CHS=pos; | |
| 174 | + AD1CHS=pos<<16; | |
| 175 | 175 | } else if (16<=pos && pos<=18) { |
| 176 | 176 | // RE5,6,7:AN22,23,27 |
| 177 | - pos-pos-16+5; | |
| 177 | + pos=pos-16+5; | |
| 178 | 178 | // Disable pulldown |
| 179 | 179 | CNPUECLR=1<<pos; |
| 180 | 180 | // Enable input |
| @@ -187,7 +187,7 @@ | ||
| 187 | 187 | } else { |
| 188 | 188 | pos=pos-7+27; |
| 189 | 189 | } |
| 190 | - AD1CHS=pos; | |
| 190 | + AD1CHS=pos<<16; | |
| 191 | 191 | } else { |
| 192 | 192 | return 0; |
| 193 | 193 | } |
